Fix some bugs involving nameless reporting of errors

Author: polybuildr

src/ast_walk_interpreter.rs

@@ -448,7 +448,7 @@ impl AstWalkInterpreter {
         }
 
         let call_sign = func.get_call_sign();
-        check_args_compat(&arg_vals, &call_sign, fn_call_expr)?;
+        check_args_compat(&arg_vals, &call_sign, expr, fn_call_expr)?;
 
         let call_func_result = call_func(&func, &arg_vals);
         match call_func_result {
@@ -505,13 +505,14 @@ pub fn call_func(func: &Function, arg_vals: &[Value]) -> Result<Option<Value>, R
 
 fn check_args_compat(arg_vals: &[Value],
                      call_sign: &CallSign,
-                     expr: &ExprNode)
+                     expr: &ExprNode,
+                     full_expr: &ExprNode)
                      -> Result<(), RuntimeErrorWithPosition> {
     if !call_sign.variadic && call_sign.num_params != arg_vals.len() {
         if let Expr::Identifier(ref id) = expr.data {
-            return Err((RuntimeError::ArgumentLength(Some(id.clone())), expr.pos));
+            return Err((RuntimeError::ArgumentLength(Some(id.clone())), full_expr.pos));
         }
-        return Err((RuntimeError::ArgumentLength(None), expr.pos));
+        return Err((RuntimeError::ArgumentLength(None), full_expr.pos));
     }
     Ok(())
 }

src/typechecker.rs

@@ -611,22 +611,17 @@ impl TypeChecker {
                 return Some(Type::Any);
             }
             v => {
-                if let Expr::Identifier(ref id) = expr.data {
-                    self.issues
-                        .push((RuntimeError::CallToNonFunction(Some(id.clone()), v).into(),
-                               expr.pos));
-                } else {
-                    self.issues
-                        .push((RuntimeError::CallToNonFunction(None, v).into(), expr.pos));
-                }
+                self.issues
+                    .push((RuntimeError::CallToNonFunction(try_get_name_of_fn(f_expr), v).into(),
+                           expr.pos));
                 return Some(Type::Any);
             }
         };
 
         let func_call_sign = func_type.get_call_sign();
         if !func_call_sign.variadic && args.len() != func_type.get_call_sign().num_params {
             self.issues
-                .push((RuntimeError::ArgumentLength(try_get_name_of_fn(expr)).into(), expr.pos));
+                .push((RuntimeError::ArgumentLength(try_get_name_of_fn(f_expr)).into(), expr.pos));
             return Some(Type::Any);
         }
         match func_type {