Show variable names on errors in the cross-compiler.

This also makes the error position match between the IDE and the cross
compiler when a variable not defined or the wrong type is found.

Author: dmsc

src/compiler/parser-actions.cc

@@ -467,16 +467,22 @@ static bool SMB_E_VAR_SET_TYPE(parse &s)
     return var_type_is_array(type);
 }
 
-static bool var_check(parse &s, int type)
+static bool var_check(parse &s, enum VarType type)
 {
     auto &v = s.vars;
     std::string name;
     if(!s.get_ident(name))
         return false;
     if(v.find(name) == v.end())
+    {
+        s.error("variable name but got '" + name + "'");
         return false;
+    }
     if((v[name] & 0xFF) != type)
+    {
+        s.error(get_vt_name(type) + " and got '" + name + "'");
         return false;
+    }
     s.add_text(name);
     s.emit_varn(name);
     return true;

src/compiler/vartype.cc

@@ -47,19 +47,19 @@ std::string get_vt_name(enum VarType t)
     switch(t)
     {
     case VT_ARRAY_WORD:
-        return "Word Array";
+        return "word array";
     case VT_ARRAY_BYTE:
-        return "Byte Array";
+        return "byte array";
     case VT_ARRAY_STRING:
-        return "String Array";
+        return "string array";
     case VT_ARRAY_FLOAT:
-        return "Float Array";
+        return "float array";
     case VT_WORD:
-        return "Word";
+        return "word";
     case VT_STRING:
-        return "String";
+        return "string";
     case VT_FLOAT:
-        return "Float";
+        return "float";
     case VT_UNDEF:
         break;
     }

testsuite/tests/err-bad-pos.chk

@@ -1,4 +1,4 @@
 Name: Check error reporting in cross-compiler.
 Test: compile-error
 Error: parse error at line 2 column 6
-Error-pos: 2:5
+Error-pos: 2:6

testsuite/tests/err-parse-bug.chk

@@ -1,4 +1,4 @@
 Name: Check infinite loop bug in parser
 Test: compile-error
 Error: parse error at line 1 column 15
-Error-pos: 1:13
+Error-pos: 1:15