COMMON: update error handling

Author: chrisws

samples/distro-examples/tests/output/trycatch.out

@@ -4,12 +4,6 @@ open failed	FS(2): NO SUCH FILE OR DIRECTORY
 after try
 catch by error name
 outer after try
-
-
- * RTE-ERROR AT ../../../samples/distro-examples/tests/trycatch.bas:200 * 
-Description:
-Division by zero
-
 Stack:
  TRY: 199
  TRY: 198
@@ -21,3 +15,9 @@ Stack:
  IF: 192
  SUB: 216
 
+
+
+ * RTE-ERROR AT ../../../samples/distro-examples/tests/trycatch.bas:200 * 
+Description:
+Division by zero
+

samples/distro-examples/tests/trycatch.bas

@@ -198,15 +198,15 @@ if 1 == 1 then
             try
               try
                 a = 1 / 0
-              catch
+              catch "X"
               end try
-            catch
+            catch "X"
             end try
-          catch
+          catch "X"
           end try
-        catch
+        catch "X"
         end try
-      catch
+      catch "X"
       end try
     fi
   fi

src/common/blib.c

@@ -1475,9 +1475,8 @@ void cmd_endif() {
   stknode_t node;
 
   code_pop(&node, kwIF);
-  while (node.type != kwIF) {
+  while (node.type != kwIF && !prog_error) {
     code_pop(&node, kwIF);
-    IF_ERR_BREAK;
   }
 
   if (!prog_error) {

src/common/blib_db.c

@@ -564,7 +564,6 @@ void cmd_floadln() {
   int eof, eol, bufLen, bufIndex;
   dword unreadBytes;
 
-  err_reset();
   if (code_peek() == kwTYPE_SEP) {
     // "filename" is an already open file number
     flags = 0;
@@ -646,7 +645,7 @@ void cmd_floadln() {
           unreadBytes -= bufLen;
 
           dev_fread(handle, (byte *)buf, bufLen);
-          if (err_has_error()) {
+          if (prog_error) {
             eof = 1;
             break;
           }
@@ -666,7 +665,7 @@ void cmd_floadln() {
         }
       }                         // read line
 
-      if (err_has_error()) {
+      if (prog_error) {
         // clear & exit
         v_free(array_p);
         v_init(array_p);
@@ -716,7 +715,6 @@ void cmd_fsaveln() {
   int flags = DEV_FILE_OUTPUT;
   int handle, i;
 
-  err_reset();
   if (code_peek() == kwTYPE_SEP) {
     // "filename" is an already open file number
     flags = 0;

src/common/brun.c

@@ -35,6 +35,9 @@ static char fileName[OS_FILENAME_SIZE + 1];
 static int exec_tid;
 
 #define EVT_CHECK_EVERY 50
+#define IF_ERR_BREAK if (prog_error) { \
+  if (prog_error == errThrow)       \
+      prog_error = errNone; else break;}
 
 /**
  * jump to label
@@ -326,7 +329,7 @@ void exec_setup_predefined_variables() {
  * BREAK
  */
 void brun_stop() {
-  prog_error = -3;
+  prog_error = errBreak;
 }
 
 /**
@@ -421,7 +424,7 @@ void cmd_chain(void) {
   if (success == 0) {
     close_task(tid_base);
     activate_task(tid_prev);
-    prog_error = 1;
+    prog_error = errCompile;
     return;
   }
 
@@ -448,7 +451,7 @@ void cmd_chain(void) {
   strcpy(gsb_last_errmsg, "");
 
   if (success == 0) {
-    prog_error = 1;
+    prog_error = errRuntime;
   }
 }
 
@@ -671,7 +674,7 @@ static inline void bc_loop_call_proc() {
     dev_print("\nSTKDUMP:\n");
     dump_stack();
     // end of program
-    prog_error = -1;
+    prog_error = errEnd;
     break;
   case kwDEFINEKEY:
     cmd_definekey();
@@ -722,7 +725,7 @@ static inline void bc_loop_end() {
     }
   }
   // end of program
-  prog_error = -1;
+  prog_error = errEnd;
 }
 
 /**
@@ -775,7 +778,7 @@ void bc_loop(int isf) {
         // break event
         break;
       case -2:
-        prog_error = -2;
+        prog_error = errBreak;
         inf_break(prog_line);
         break;
       default:
@@ -1275,7 +1278,7 @@ int brun_create_task(const char *filename, byte *preloaded_bc, int libf) {
   eval_sp = 0;
 
   // initialize the rest tasks globals
-  prog_error = 0;
+  prog_error = errNone;
   prog_line = 0;
   prog_dp = data_org = hdr.data_ip;
   prog_length = hdr.bc_count;
@@ -1533,10 +1536,10 @@ int sbasic_exec_task(int tid) {
 
   prev_tid = activate_task(tid);
 
-  bc_loop(0);                   // natural the value -1 is end of program
-  success = (prog_error == 0 || prog_error == -1);
+  bc_loop(0);
+  success = (prog_error == errNone || prog_error == errEnd);
   if (success) {
-    prog_error = 0;
+    prog_error = errNone;
   }
   activate_task(prev_tid);
   return success;

src/common/eval.c

@@ -1306,6 +1306,7 @@ void eval(var_t *r) {
       default:
         if (code == kwTYPE_EOC ||
             code == kwTYPE_SEP ||
+            code == kwTO ||
             kw_check_evexit(code)) {
           IP--;
           // restore stack pointer

src/common/sberr.c

@@ -14,8 +14,6 @@
 #include <string.h>
 #include <errno.h>
 
-int error_caught;
-
 /**
  * common message handler
  */
@@ -32,11 +30,41 @@ void err_common_msg(const char *seg, const char *file, int line, const char *des
   log_printf("\033[80m\033[0m");
 }
 
+void err_stack_dump() {
+  int i_stack, i_kw;
+
+  if (prog_stack_count) {
+    log_printf("\033[4mStack:\033[0m\n");
+  }
+
+  // log the stack trace
+  for (i_stack = prog_stack_count; i_stack > 0; i_stack--) {
+    stknode_t node = prog_stack[i_stack - 1];
+    switch (node.type) {
+    case 0xFF:
+    case kwBYREF:
+    case kwTYPE_CRVAR:
+      // ignore these types
+      break;
+
+    default:
+      for (i_kw = 0; keyword_table[i_kw].name[0] != '\0'; i_kw++) {
+        if (node.type == keyword_table[i_kw].code) {
+          log_printf(" %s: %d", keyword_table[i_kw].name, node.line);
+        }
+      }
+    }
+  }
+  if (prog_stack_count) {
+    log_printf("\n");
+  }
+}
+
 /**
  * raise a compiler error
  */
 void sc_raise2(const char *sec, int scline, const char *buff) {
-  prog_error = 0x40;
+  prog_error = errCompile;
   err_common_msg(WORD_COMP, sec, scline, buff);
 }
 
@@ -46,44 +74,16 @@ void sc_raise2(const char *sec, int scline, const char *buff) {
 void rt_raise(const char *fmt, ...) {
   char *buff;
   va_list ap;
-  int i_stack, i_kw;
-
-  if (!gsb_last_error) {
-    prog_error = 0x80;
 
+  if (!gsb_last_error && !prog_error) {
+    prog_error = errRuntime;
     va_start(ap, fmt);
     buff = malloc(SB_TEXTLINE_SIZE + 1);
     vsprintf(buff, fmt, ap);
     va_end(ap);
-
     err_common_msg(WORD_RTE, prog_file, prog_line, buff);
     free(buff);
-
-    if (prog_stack_count) {
-      log_printf("\033[4mStack:\033[0m\n");
-    }
-
-    // log the stack trace
-    for (i_stack = prog_stack_count; i_stack > 0; i_stack--) {
-      stknode_t node = prog_stack[i_stack - 1];
-      switch (node.type) {
-      case 0xFF:
-      case kwBYREF:
-      case kwTYPE_CRVAR:
-        // ignore these types
-        break;
-
-      default:
-        for (i_kw = 0; keyword_table[i_kw].name[0] != '\0'; i_kw++) {
-          if (node.type == keyword_table[i_kw].code) {
-            log_printf(" %s: %d", keyword_table[i_kw].name, node.line);
-          }
-        }
-      }
-    }
-    if (prog_stack_count) {
-      log_printf("\n");
-    }
+    err_stack_dump();
   }
 }
 
@@ -95,7 +95,7 @@ void err_syntax(int keyword, const char *fmt) {
     char *buff = malloc(SB_TEXTLINE_SIZE + 1);
     char *fmt_p = (char *)fmt;
 
-    prog_error = 0x80;
+    prog_error = errSyntax;
     buff[0] = '\0';
     if (keyword != -1) {
       if (kw_getfuncname(keyword, buff) ||
@@ -169,7 +169,7 @@ void err_arrmis_rp(void) {
 }
 
 void err_arridx(int i, int m) {
-  rt_raise(ERR_ARRAY_RANGE, i, m);
+  err_throw(ERR_ARRAY_RANGE, i, m);
 }
 
 void err_typemismatch(void) {
@@ -234,7 +234,7 @@ void err_missing_sep(void) {
 }
 
 void err_division_by_zero(void) {
-  rt_raise(ERR_DIVZERO);
+  err_throw(ERR_DIVZERO);
 }
 
 void err_matop(void) {
@@ -411,6 +411,10 @@ void err_throw_str(const char *err) {
       }
     }
 
+    if (!caught) {
+      err_stack_dump();
+    }
+
     // cleanup the stack
     stknode_t node;
     int sp;
@@ -422,10 +426,11 @@ void err_throw_str(const char *err) {
     }
   }
   if (!caught) {
-    prog_error = 0x80;
+    prog_error = errRuntime;
     err_common_msg(WORD_RTE, prog_file, prog_line, err);
+  } else {
+    prog_error = errThrow;
   }
-  error_caught = caught;
 }
 
 // throw internal error
@@ -469,17 +474,9 @@ void err_file(dword code) {
   }
 }
 
-void err_reset() {
-  error_caught = 0;
-}
-
-int err_has_error() {
-  return error_caught || prog_error;
-}
-
 int err_handle_error(const char *err, var_p_t var) {
   int result;
-  if (error_caught == 1) {
+  if (prog_error == errThrow) {
     result = 1;
   } else if (prog_error) {
     rt_raise(err);

src/common/sberr.h

@@ -16,7 +16,16 @@
 extern "C" {
 #endif
 
-#define IF_ERR_BREAK if (prog_error) {break;}
+typedef enum {
+  errNone = 0,
+  errEnd,
+  errBreak,
+  errThrow,
+  errCompile,
+  errRuntime,
+  errSyntax
+} ErrorState;
+
 #define IF_ERR_RETURN if (prog_error) {return;}
 #define IF_ERR_RETURN_0 if (prog_error) {return 0;}
 
@@ -71,13 +80,11 @@ void err_ref_var();
 void err_ref_circ_var();
 void err_array();
 void err_form_input();
+void err_throw(const char *fmt, ...);
+int  err_handle_error(const char *err, var_p_t var);
 void inf_done(void);
 void inf_break(int pline);
-void err_throw(const char *fmt, ...);
 void cmd_throw();
-void err_reset();
-int  err_handle_error(const char *err, var_p_t var);
-int  err_has_error();
 
 #if defined(__cplusplus)
   }