better errors

This commit is contained in:
2024-04-14 00:11:39 +02:00
parent db3f1ec61c
commit b24b34cb44
3 changed files with 78 additions and 67 deletions
+4 -4
View File
@@ -121,7 +121,7 @@ fn get_second_char(value: &str) -> String {
sv2.next().unwrap().to_string() sv2.next().unwrap().to_string()
} }
pub fn lex(mut code: &str, use_whitespace: bool) -> Vec<Token> { pub fn lex(mut code: &str, use_whitespace: bool) -> Result<Vec<Token>, (LexerState, Vec<Token>)> {
let mut state = LexerState { line: 1, column: 1 }; let mut state = LexerState { line: 1, column: 1 };
let mut tokens: Vec<Token> = Vec::new(); let mut tokens: Vec<Token> = Vec::new();
let mut bracket_vec: Vec<char> = Vec::new(); let mut bracket_vec: Vec<char> = Vec::new();
@@ -292,9 +292,9 @@ pub fn lex(mut code: &str, use_whitespace: bool) -> Vec<Token> {
} }
} }
if !is_match { if !is_match {
println!("Error: syntax ->{code}"); return Err((state, tokens));
break; // break;
} }
} }
tokens Ok(tokens)
} }
+2 -1
View File
@@ -5,7 +5,8 @@ use std::fs;
fn main() { fn main() {
let contents = fs::read_to_string("code.ws").expect("cannot read for some reason"); let code_file = "code.ws";
let contents = fs::read_to_string(code_file).expect("cannot read for some reason");
let result = transpiler::transpile(contents, 0); let result = transpiler::transpile(contents, 0);
println!("{result}") println!("{result}")
} }
+11 -1
View File
@@ -3,11 +3,14 @@ use crate::parser::{Parser, AstType};
pub fn transpile(input: String, indent: u32) -> String { pub fn transpile(input: String, indent: u32) -> String {
let mut result = String::new(); let mut result = String::new();
let tokens = lex(input.as_str(), false); let lexer_out = lex(input.as_str(), false);
match lexer_out {
Ok(tokens) => {
println!("\n\n\n\n"); println!("\n\n\n\n");
let mut full_ast = Parser::new(tokens.clone()); let mut full_ast = Parser::new(tokens.clone());
while full_ast.tokens.len() > full_ast.index as usize { while full_ast.tokens.len() > full_ast.index as usize {
let ast = full_ast.next(); let ast = full_ast.next();
println!("{ast}");
if ast.ast_type == AstType::FunctionDeceleration { if ast.ast_type == AstType::FunctionDeceleration {
result += format!("fn {}{} -> {} {}", ast.tokens[1].value, ast.tokens[2].value, ast.tokens[0].value, transpile(ast.tokens[3].value.clone(), indent+1)).as_str(); result += format!("fn {}{} -> {} {}", ast.tokens[1].value, ast.tokens[2].value, ast.tokens[0].value, transpile(ast.tokens[3].value.clone(), indent+1)).as_str();
} else if ast.ast_type == AstType::VoidFunctionDeceleration { } else if ast.ast_type == AstType::VoidFunctionDeceleration {
@@ -72,4 +75,11 @@ pub fn transpile(input: String, indent: u32) -> String {
} else { } else {
return result return result
} }
},
Err((state, _tokens)) => {
println!("Invalid character at code.ws:{}:{}", state.line, state.column);
return "".to_string();
}
}
} }