commit 5648263116a4635aca055e3642aab515ba7ac284
author Gavin Howard <yzena.tech@gmail.com> Tue Feb 20 16:53:51 2018 -0700
committer Gavin Howard <yzena.tech@gmail.com> Tue Aug 28 17:10:28 2018 -0600
tree a3b7a090432c037fcb762979b52079a3c22c8d59
parent 6c2443626f4db19a3584a9a0c7cf734743c323e0

Fix bugs in the vm that printed errors twice or not at all

src/bc/vm.c

diff --git a/src/bc/vm.c b/src/bc/vm.c
index b6e7b53..35fb643 100644
--- a/src/bc/vm.c
+++ b/src/bc/vm.c
@@ -153,6 +153,11 @@
 
     status = bc_parse_parse(&vm->parse);
 
+    if (status) {
+      bc_error_file(status, vm->parse.lex.file, vm->parse.lex.line);
+      goto err;
+    }
+
     if (bc_signal && !bc_interactive) {
       goto read_err;
     }
@@ -160,7 +165,7 @@
 
       status = bc_vm_handleSignal(vm);
 
-      if (status) return status;
+      if (status) goto read_err;
     }
 
     if (status) {
@@ -171,6 +176,7 @@
           status != BC_STATUS_PARSE_LIMITS)
       {
         bc_error_file(status, vm->program.file, vm->parse.lex.line);
+        goto err;
       }
       else if (status == BC_STATUS_PARSE_QUIT) {
         break;
@@ -181,14 +187,10 @@
         continue;
       }
 
-      while (vm->parse.token.type != BC_LEX_NEWLINE &&
+      while (!status && vm->parse.token.type != BC_LEX_NEWLINE &&
              vm->parse.token.type != BC_LEX_SEMICOLON)
       {
         status = bc_lex_next(&vm->parse.lex, &vm->parse.token);
-
-        if (status) {
-          break;
-        }
       }
     }
 
@@ -272,6 +274,8 @@
 
   bc_error(status);
 
+err:
+
   free(data);
 
   return status;
@@ -424,9 +428,7 @@
       status = BC_STATUS_SUCCESS;
     }
 
-    while (!status) {
-      status = bc_parse_parse(&vm->parse);
-    }
+    while (!status) status = bc_parse_parse(&vm->parse);
 
     if (status == BC_STATUS_PARSE_QUIT) {
       break;
@@ -437,15 +439,30 @@
     }
     else if (status != BC_STATUS_LEX_EOF && status != BC_STATUS_PARSE_EOF) {
 
+      BcFunc*func;
+      BcInstPtr* ip;
+
       bc_error_file(status, vm->program.file, vm->parse.lex.line);
 
+      ip = bc_vec_item(&vm->program.stack, 0);
+      func = bc_vec_item(&vm->program.funcs, 0);
+
+      if (ip && func) ip->idx = func->code.len;
+
       while (vm->parse.token.type != BC_LEX_NEWLINE &&
              vm->parse.token.type != BC_LEX_SEMICOLON)
       {
         status = bc_lex_next(&vm->parse.lex, &vm->parse.token);
 
         if (status && status != BC_STATUS_LEX_EOF) {
+
           bc_error_file(status, vm->program.file, vm->parse.lex.line);
+
+          ip = bc_vec_item(&vm->program.stack, 0);
+          func = bc_vec_item(&vm->program.funcs, 0);
+
+          if (ip && func) ip->idx = func->code.len;
+
           break;
         }
         else if (status == BC_STATUS_LEX_EOF) {