Show better errors for loops/procs.

Author: dmsc

src/compiler/parser-actions.cc

@@ -310,7 +310,7 @@ static bool SMB_E_POP_LOOP(parse &s)
     s.debug("E_POP_LOOP");
     auto l = s.pop_loop(LT_DO_LOOP);
     if(l.empty())
-        return false;
+        return s.loop_error("loop start missing");
     s.emit_word(l);
     s.emit_label(l + "_x");
     return true;
@@ -371,6 +371,8 @@ static bool SMB_E_EXIT_LOOP(parse &s)
         if(type == LT_ELIF || type == LT_IF || type == LT_ELSE || type == LT_FOR_2 ||
            type == LT_WHILE_2)
             continue;
+        else if(type <= LT_EXIT)
+            return s.loop_error("invalid EXIT");
         break;
     }
     s.emit_word(s.jumps[last].label + "_x");
@@ -584,7 +586,7 @@ static bool SMB_E_LABEL_DEF(parse &s)
     auto &v = s.labels;
     auto name = s.last_label;
     if(v[name].is_defined())
-        return false;
+        return s.loop_error("new label, got label already defined '" + name + "'");
     s.current_params = 0;
     s.emit_label(s.label_prefix + name);
     return true;
@@ -629,7 +631,7 @@ static bool SMB_E_LABEL_CREATE(parse &s)
     auto &v = s.labels[name];
     // Check type
     if(!v.is_proc())
-        return s.error("new label, got label already defined '" + name + "'");
+        return s.loop_error("new label, got label already defined '" + name + "'");
     // Store variable name
     s.add_text(name);
     s.last_label = name;

src/compiler/parser.h

@@ -270,6 +270,7 @@ class parse
         // Loop error takes precedence over all other errors
         saved_errors.clear();
         saved_errors.emplace(lvl, str);
+        max_pos = pos;
         debug("Set loop error='" + str + "'");
         return false;
     }

testsuite/tests/err-loop-4.chk

@@ -1,4 +1,4 @@
 Name: Check detection of loop errors
 Test: compile-error
 Error: bad loop at line 3 column 1
-Error-pos: 4:5
+Error-pos: 3:4

testsuite/tests/procerr2.chk

@@ -1,4 +1,4 @@
 Name: Check detection of already defined PROC
 Test: compile-error
 Error: parse error at line 6 column 10
-Error-pos: 6:5
+Error-pos: 6:10