wyst-lang/wyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

int change and smart spacing

Browse Source
This commit is contained in:
selimaj-dev
2024-05-11 14:58:38 +02:00
parent 86bf9778ee
commit ff84b62d3b
2 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lexer.rs
+19 -6
View File
@@ -323,12 +323,25 @@ pub fn lex(mut code: &str, use_whitespace: bool, state: LexerState) -> Result<Ve
is_match = true;
code = code.strip_prefix(&caps[0]).unwrap_or(code);
if (!use_whitespace && s.token_type!=TokenType::Whitespace) || use_whitespace {
tokens.push(Token {
token_type: s.token_type,
value: caps[0].to_string(),
line: state.line,
column: state.column
});
let cap = caps[0].to_string();
match cap.as_str() {
"int" => {
tokens.push(Token {
token_type: s.token_type,
value: "i32".to_string(),
line: state.line,
column: state.column
});
}
_ => {
tokens.push(Token {
token_type: s.token_type,
value: cap,
line: state.line,
column: state.column
});
}
}
}
state.column += caps[0].len();
} else {
src/transpiler.rs
+18 -7
View File
@@ -1,11 +1,11 @@
use crate::lexer::{lex, LexerState, TokenType};
use crate::parser::{Parser, AstType};
use crate::parser::{Ast, AstType, Parser};
pub fn transpile(input: String, indent: u32, state: LexerState) -> String {
let mut result = String::new();
if indent == 0 {
result += "type int = i32;\n";
// result += "type int = i32;\n";
} else {
result += " ".repeat((indent as usize) * 2).as_str();
}
@@ -15,7 +15,7 @@ pub fn transpile(input: String, indent: u32, state: LexerState) -> String {
match lexer_out {
Ok(tokens) => {
let mut full_ast = Parser::new(tokens.clone());
let mut last_ast = Ast {ast_type: AstType::Other, tokens: vec![]};
while full_ast.tokens.len() > full_ast.index as usize {
let ast = full_ast.next();
println!("{ast}");
@@ -58,7 +58,8 @@ pub fn transpile(input: String, indent: u32, state: LexerState) -> String {
)
.as_str();
} else if ast.ast_type == AstType::VariableDeceleration {
result += format!("let {}: {}", ast.tokens[1].value, ast.tokens[0].value).as_str();
result += format!("let mut {}: {}", ast.tokens[1].value, ast.tokens[0].value).as_str();
// result += format!("let {}: {}", ast.tokens[1].value, ast.tokens[0].value).as_str();
} else if ast.ast_type == AstType::MutVariableDeceleration {
result += format!("let mut {}: {}", ast.tokens[1].value, ast.tokens[0].value).as_str();
} else if ast.tokens.len() == 1 && ast.tokens[0].token_type == TokenType::Round {
@@ -99,10 +100,22 @@ pub fn transpile(input: String, indent: u32, state: LexerState) -> String {
result += ";\n";
result += " ".repeat((indent as usize) * 2).as_str();
} else {
if last_ast.tokens.len() > 0 && (
ast.tokens[0].token_type == TokenType::Identifier ||
ast.tokens[0].token_type == TokenType::Keyword ||
ast.tokens[0].token_type == TokenType::Number
) {
let ltkn = last_ast.tokens[last_ast.tokens.len()-1].token_type;
if ltkn == TokenType::Identifier ||
ltkn == TokenType::Keyword ||
ltkn == TokenType::Number {
result += " ";
}
}
result += ast.tokens[0].value.as_str();
result += " ";
}
}
last_ast = ast;
}
result = result.trim_end().to_string();
@@ -131,8 +144,6 @@ pub fn transpile_round(input: String, state: LexerState) -> String {
while full_ast.tokens.len() > full_ast.index as usize {
let ast = full_ast.next();
println!("{ast}");
if ast.ast_type == AstType::VariableDeceleration {
result += format!("{}: {}", ast.tokens[1].value, ast.tokens[0].value).as_str();
} else if ast.ast_type == AstType::MutVariableDeceleration {