COMMON: Fixed TLOAD to work correctly with TRY/CATCH

Author: chrisws

ChangeLog

@@ -30,6 +30,7 @@
 	Fixed issues with TRY/CATCH
 	Fixed using POINT to retrieve IMAGE data
 	Fixed issues with CHAIN
+	Fixed TLOAD to work correctly with TRY/CATCH
 
 2016-02-11
 	Added export to mobile command (SDL)

samples/distro-examples/tests/trycatch.bas

@@ -131,3 +131,62 @@ end try
 if (!caughtError) then
   throw "Error not caught!!!"
 endif
+
+' some more tests from Shain
+
+Found = 0
+
+Try
+  Tload "__xyz__abc__0123", lines
+  ? "Error"
+Catch err
+  Found++
+End Try
+
+Try
+  Tsave ":foo-name:/~~~", lines
+  ? "Error"
+Catch err
+  Found++
+End Try
+
+' catch file error outside sub or function
+Try
+  Open "xyz__xyz__012" For Input As #1
+  ? "Error"
+Catch err
+  Found++
+End Try
+
+' catch file error within function
+Func open_safe(filename)
+  Local fn = Freefile
+  Try
+    Open filename For Input As #fn
+    open_safe = fn
+    ? "Error!"
+  Catch err
+    Found++
+    open_safe = 0
+  End Try
+End Func
+
+' catch file error within nested function:
+Func call_safe(filename)
+  Local fn
+  fn = open_safe(filename)
+  call_safe = fn
+End Func
+
+' catch file error within function:
+fn = open_safe("xyz__xyz__012")
+
+' catch file error within nested functions
+fn = call_safe("xyz__xyz__012")
+
+if (Found != 5) then
+  throw "Failed: " + Found
+endif
+
+
+

src/common/blib_db.c

@@ -551,19 +551,9 @@ void cmd_mkdir() {
  */
 #define LDLN_INC    256
 #define GROW_SIZE   1024
-#define BUFMAX       256
-
-#define CHK_ERR_CLEANUP(s)                      \
-  if (prog_error) {                             \
-    v_free(&file_name);                         \
-    rt_raise(s);                                \
-    return;                                     \
-  }
-#define CHK_ERR(s)                              \
-  if (prog_error) {                             \
-    rt_raise(s);                                \
-    return;                                     \
-  }
+#define BUFMAX      256
+#define CHK_ERR_CLEANUP(s) if (err_handle_error(s, &file_name)) return;
+#define CHK_ERR(s) if (err_handle_error(s, NULL)) return;
 
 void cmd_floadln() {
   var_t file_name, *array_p = NULL, *var_p = NULL;
@@ -574,6 +564,7 @@ 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;
@@ -655,7 +646,7 @@ void cmd_floadln() {
           unreadBytes -= bufLen;
 
           dev_fread(handle, (byte *)buf, bufLen);
-          if (prog_error) {
+          if (err_has_error()) {
             eof = 1;
             break;
           }
@@ -675,7 +666,8 @@ void cmd_floadln() {
         }
       }                         // read line
 
-      if (prog_error) {         // clear & exit
+      if (err_has_error()) {
+        // clear & exit
         v_free(array_p);
         v_init(array_p);
         break;
@@ -724,6 +716,7 @@ 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/sberr.c

@@ -14,6 +14,8 @@
 #include <string.h>
 #include <errno.h>
 
+int error_caught;
+
 /**
  * common message handler
  */
@@ -145,18 +147,6 @@ void err_parm_num(int found, int expected) {
   rt_raise(ERR_PARAM_NUM, found, expected);
 }
 
-void err_file(dword code) {
-  char buf[1024], *p;
-
-  strcpy(buf, strerror(code));
-  p = buf;
-  while (*p) {
-    *p = to_upper(*p);
-    p++;
-  }
-  err_throw(FSERR_FMT, code, buf);
-}
-
 void err_stackoverflow(void) {
   rt_raise(ERR_STACK_OVERFLOW);
 }
@@ -435,6 +425,7 @@ void err_throw_str(const char *err) {
     prog_error = 0x80;
     err_common_msg(WORD_RTE, prog_file, prog_line, err);
   }
+  error_caught = caught;
 }
 
 // throw internal error
@@ -468,3 +459,36 @@ void cmd_throw() {
   }
 }
 
+void err_file(dword code) {
+  if (!gsb_last_error) {
+    char *err = malloc(SB_TEXTLINE_SIZE + 1);
+    sprintf(err, FSERR_FMT, code, strerror(code));
+    strupper(err);
+    err_throw_str(err);
+    free(err);
+  }
+}
+
+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) {
+    result = 1;
+  } else if (prog_error) {
+    rt_raise(err);
+    result = 1;
+  } else {
+    result = 0;
+  }
+  if (result && var) {
+    v_free(var);
+  }
+  return result;
+}

src/common/sberr.h

@@ -71,14 +71,13 @@ void err_ref_var();
 void err_ref_circ_var();
 void err_array();
 void err_form_input();
-
-#define err_type_mismatch() err_typemismatch()
-
 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)
   }