COMMON: fixed issues with CHAIN

Author: chrisws

ChangeLog

@@ -14,18 +14,22 @@
 	Fixed editor highlighting
 	Runtime errors now show source screen with red error highlighter
 	Form refresh command now takes an boolean arg, true=push ui state to vars
+	The IMAGE argument can now be PNG data stored in an INT array
+	The IMAGE argument can now be x,y,w,h screen corordinates
+	The IMAGE argument can now be a 2-D array of POINTS
+	Updated IMAGE sub-command to save 2-D array of POINT
 	Added window.setFont command to set font size, bold and italic. example:
            w = window():w.setFont(10, "pt", false, true)
+	TRUE is now always returned as 1
+	Added file manager to main shell program
 	Fixed problem with escaped chars using FORMAT
 	Fixed problem with XNOR command result
-	TRUE is now always returned as 1
 	Fixed problem with IMP and EQV command result
 	Fixed problem with INKEY command
 	Fixed capslock handling
-	Added file manager to main shell program
 	Fixed issues with TRY/CATCH
 	Fixed using POINT to retrieve IMAGE data
-	The IMAGE argument can now be PNG data stored in an INT array
+	Fixed issues with CHAIN
 
 2016-02-11
 	Added export to mobile command (SDL)

samples/distro-examples/tests/chain.bas

@@ -1,12 +1,20 @@
-code = "print \"hello\""
-chain code
+'
+' Tests for CHAIN
+'
+
+chain "print \"error1\""
+chain "throw \"error2\""
+chain "throw \"error3\""
+chain "throw \"error4\""
 
 dim ar_code
 ar_code << "for i=0 to 10"
 ar_code << " print i"
 ar_code << "next i"
 chain ar_code
 
+chain "throw \"error5\""
+
 Const FILENAME = "chain.tmp"
 
 Sub open_1
@@ -34,8 +42,10 @@ Chain FILENAME
 ' BUG?: prints 16 (reads ONLY the first line,
 '      should read file as Array - not as String...):
 open_1
+? #1, "Print \"POW 2,4\""
 ? #1, "Print Pow(2, 4)"
 ? #1, "Print Pow(2, 5)"
+? #1, "Print \"done\""
 Close #1
 Chain FILENAME
 
@@ -56,3 +66,4 @@ Chain FILENAME
 ' BUG?: does not report an ERROR (entering endless/long loop - ONLY IF previous "Chain FILENAME" is uncommented):
 Chain "Print Power(2, 1)" ' using a "string" instead of filename.
 
+kill FILENAME

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

@@ -1,4 +1,22 @@
-hello
+error1
+
+
+ * RTE-ERROR AT CH_MAIN:1 * 
+Description:
+error2
+
+
+
+ * RTE-ERROR AT CH_MAIN:1 * 
+Description:
+error3
+
+
+
+ * RTE-ERROR AT CH_MAIN:1 * 
+Description:
+error4
+
 0
 1
 2
@@ -10,3 +28,31 @@ hello
 8
 9
 10
+
+
+ * RTE-ERROR AT CH_MAIN:1 * 
+Description:
+error5
+
+2
+4
+8
+POW 2,4
+16
+32
+done
+
+64
+128
+
+
+ * RTE-ERROR AT CH_MAIN:1 * 
+Description:
+Expr/RT: Variable is NOT an array (Use DIM)
+
+
+
+ * RTE-ERROR AT CH_MAIN:1 * 
+Description:
+Expr/RT: Variable is NOT an array (Use DIM)
+

src/common/blib.c

@@ -2767,14 +2767,12 @@ void cmd_call_vfunc() {
   if (v_func == NULL || v_func->type != V_FUNC) {
     rt_raise(ERR_NO_FUNC);
   } else {
-    if (code_peek() != kwTYPE_LEVEL_BEGIN) {
-      err_missing_lp();
-    } else {
+    if (code_peek() == kwTYPE_LEVEL_BEGIN) {
+      code_skipnext();
+    }
+    v_func->v.fn.cb(v_func->v.fn.self);
+    if (code_peek() == kwTYPE_LEVEL_END) {
       code_skipnext();
-      v_func->v.fn.cb(v_func->v.fn.self);
-      if (!prog_error && code_peek() != kwTYPE_LEVEL_END) {
-        err_missing_rp();
-      }
     }
   }
 }

src/common/brun.c

@@ -366,8 +366,7 @@ void brun_break() {
  */
 void cmd_chain(void) {
   var_t var;
-  const char *code = NULL;
-  char *code_alloc = NULL;
+  char *code = NULL;
 
   v_init(&var);
   eval(&var);
@@ -380,20 +379,18 @@ void cmd_chain(void) {
   if (var.type == V_STR) {
     if (access(var.v.p.ptr, R_OK) == 0) {
       // argument is a file name
-      FILE *f = fopen(var.v.p.ptr, "r");
-      if (!fseek(f, 0, SEEK_END)) {
-        int len = ftell(f);
-        fseek(f, 0, SEEK_SET);
-        if (len) {
-          code_alloc = malloc(len + 1);
-          fgets(code_alloc, len, f);
-          code = code_alloc;
-        }
+      int h = open(var.v.p.ptr, O_BINARY | O_RDONLY, 0644);
+      if (h != -1) {
+        int len = lseek(h, 0, SEEK_END);
+        lseek(h, 0, SEEK_SET);
+        code = (char *)malloc(len + 1);
+        len = read(h, code, len);
+        code[len] = '\0';
+        close(h);
       }
-      fclose(f);
     }
     if (!code) {
-      code = var.v.p.ptr;
+      code = strdup(var.v.p.ptr);
     }
   } else if (var.type == V_ARRAY) {
     int el;
@@ -403,19 +400,16 @@ void cmd_chain(void) {
       if (el_p->type == V_STR) {
         int str_len = strlen(el_p->v.p.ptr) + 2;
         if (len) {
-          code_alloc = realloc(code_alloc, len + str_len);
-          strcat(code_alloc, el_p->v.p.ptr);
+          code = realloc(code, len + str_len);
+          strcat(code, el_p->v.p.ptr);
         } else {
-          code_alloc = malloc(str_len);
-          strcpy(code_alloc, el_p->v.p.ptr);
+          code = malloc(str_len);
+          strcpy(code, el_p->v.p.ptr);
         }
-        strcat(code_alloc, "\n");
+        strcat(code, "\n");
         len += str_len + 1;
       }
     }
-    if (len) {
-      code = code_alloc;
-    }
   }
 
   if (code == NULL) {
@@ -424,24 +418,30 @@ void cmd_chain(void) {
     return;
   }
 
+  v_free(&var);
+
   int tid_base = create_task("CH_BASE");
   int tid_prev = activate_task(tid_base);
 
   // compile the buffer
   sys_before_comp();
   int success = comp_compile_buffer(code);
 
-  v_free(&var);
-  if (code_alloc) {
-    free(code_alloc);
-  }
+  free(code);
+  code = NULL;
+
   if (success == 0) {
     close_task(tid_base);
     activate_task(tid_prev);
     prog_error = 1;
     return;
   }
 
+  char last_file[OS_PATHNAME_SIZE + 1];
+  char bas_dir[OS_PATHNAME_SIZE + 1];
+  strcpy(last_file, gsb_last_file);
+  strcpy(bas_dir, gsb_bas_dir);
+
   int tid_main = brun_create_task("CH_MAIN", ctask->bytecode, 0);
   exec_sync_variables(0);
 
@@ -452,6 +452,13 @@ void cmd_chain(void) {
   close_task(tid_base);         // cleanup task container
   activate_task(tid_prev);      // resume calling task
 
+  // reset globals
+  gsb_last_line = 0;
+  gsb_last_error = 0;
+  strcpy(gsb_last_file, last_file);
+  strcpy(gsb_bas_dir, bas_dir);
+  strcpy(gsb_last_errmsg, "");
+
   if (success == 0) {
     prog_error = 1;
   }