extern/kalker
1
0
Fork 0
mirror of https://github.com/PaddiM8/kalker.git synced 2025-02-14 15:39:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Made some of the error messages in the interpreter more specific.

Browse Source
This commit is contained in:
PaddiM8 2020-05-30 16:59:58 +02:00
parent 2b90620d83
commit 01aa30c2c1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/interpreter.rs
View File

@ -122,14 +122,14 @@ fn eval_var_expr(context: &mut Context, identifier: &str) -> Result<f64, String>
let var_decl = context.symbol_table.get(identifier).cloned(); let var_decl = context.symbol_table.get(identifier).cloned();
match var_decl { match var_decl {
Some(Stmt::VarDecl(_, expr)) => eval_expr(context, &expr), Some(Stmt::VarDecl(_, expr)) => eval_expr(context, &expr),
_ => Err(String::from("Undefined variable.")), _ => Err(format!("Undefined variable: '{}'.", identifier)),
} }
} }
fn eval_literal_expr(_: &mut Context, value: &str) -> Result<f64, String> { fn eval_literal_expr(_: &mut Context, value: &str) -> Result<f64, String> {
match value.parse() { match value.parse() {
Ok(parsed_value) => Ok(parsed_value), Ok(parsed_value) => Ok(parsed_value),
Err(_) => Err(String::from("Invalid number literal.")), Err(_) => Err(format!("Invalid number literal: '{}'.", value)),
} }
} }
@ -167,7 +167,12 @@ fn eval_fn_call_expr(
match stmt_definition { match stmt_definition {
Some(Stmt::FnDecl(_, arguments, fn_body)) => { Some(Stmt::FnDecl(_, arguments, fn_body)) => {
if arguments.len() != expressions.len() { if arguments.len() != expressions.len() {
return Err(String::from("Incorrect amount of arguments.")); return Err(format!(
"Expected {} arguments in function '{}' but found {}.",
arguments.len(),
identifier,
expressions.len()
));
} }
// Initialise the arguments as their own variables. // Initialise the arguments as their own variables.
@ -180,6 +185,6 @@ fn eval_fn_call_expr(
return eval_expr(context, &*fn_body); return eval_expr(context, &*fn_body);
} }
_ => Err(String::from("Undefined function.")), _ => Err(format!("Undefined function: '{}'.", identifier)),
} }
} }