Merge pull request #41 from chrisws/0_11_20

0 12 6

Author: chrisws

ChangeLog

@@ -1,3 +1,13 @@
+2016-04-26 (0.12.6)
+	Fixes for unit case sensitivity
+
+2016-04-24 (0.12.6)
+	Fixes for RUN/EXEC
+
+2016-04-20 (0.12.6)
+	Fixed memory handling issues with UNITs
+	Fixed memory issue related to SUB/FUNC pointers
+
 2016-03-29 (0.12.6)
 	Removed TICKSPERSEC
 	Removed BALLOC, MALLOC and VADR keywords. Removed duplicate ENVIRON
@@ -32,6 +42,7 @@
 	Fixed issues with CHAIN
 	Fixed TLOAD to work correctly with TRY/CATCH
 	Fixed XPOS and YPOS to return 0 based values
+	Fixed compiler checking for redundant symbols, for example: let a = 1 2 3
 
 2016-02-11
 	Added export to mobile command (SDL)

Makefile.am

@@ -13,6 +13,9 @@ deb:
 test:
 	(cd @TEST_DIR@ && make test)
 
+leak-test:
+	(cd src/platform/unix && make leak-test)
+
 release:
 	(cd $(SUBDIRS) && make release)
 

configure.ac

@@ -336,7 +336,6 @@ function buildConsole() {
       dnl preconfigured values for unix console build
       TARGET="Building Unix console version."
       AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
-      AC_DEFINE(USE_TERM_IO, 0, [Uses terminal-io functions.])
       AC_DEFINE(DEV_EVENTS_OSD, 0, [dev_events() implemented using osd_events().])
       PACKAGE_LIBS="${PACKAGE_LIBS} -lm -ldl -lpthread"
       BUILD_SUBDIRS="src/common src/platform/unix"
@@ -367,6 +366,9 @@ PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -Wall -Wno-unused-result"
 BUILD_DATE=`date +"%a, %d %b %Y"`
 AC_DEFINE_UNQUOTED([BUILD_DATE],["$BUILD_DATE"],[Build date])
 
+SB_DWORD_VER=`awk -F "." '{printf "0x%02d%02d%02d", $1,$2,$3}' <<< ${PACKAGE_VERSION}`
+AC_DEFINE_UNQUOTED([SB_DWORD_VER],[$SB_DWORD_VER],[SB_DWORD_VER])
+
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 

ide/android/assets/main.bas

@@ -56,8 +56,8 @@ sub do_okay_button()
   button.x = xmax / 2
   button.y = -1
   button.label = "Close"
-  button.backgroundColor = "green"
-  button.color = "white"
+  button.backgroundColor = 8
+  button.color = 10
   frm.inputs << button
   frm = form(frm)
   print
@@ -73,7 +73,7 @@ sub do_about()
   print
   print "Version "; sbver
   print
-  print "Copyright (c) 2002-2015 Chris Warren-Smith"
+  print "Copyright (c) 2002-2016 Chris Warren-Smith"
   print "Copyright (c) 1999-2006 Nic Christopoulos" + chr(10)
   print "http://smallbasic.sourceforge.net" + chr(10)
   print "SmallBASIC comes with ABSOLUTELY NO WARRANTY. ";

samples/distro-examples/tests/iifs.bas

@@ -36,3 +36,4 @@ goto 200
 ? "label 600 - Ok"
 goto 210
 
+

samples/distro-examples/tests/output/stream-files.out

@@ -0,0 +1,4 @@
+Hello	 world!
+I read: [Hello]+[ world!]
+NL=[Hello, world!]
+NL=[One more text line]

src/common/blib_func.c

@@ -1451,49 +1451,8 @@ void cmd_strN(long funcCode, var_t *r) {
     // Win32: use & at the end of the command to run-it in background
     //
     par_getstr(&arg1);
-
-    if (!prog_error) {
-#if defined(_Win32)
-      char *buf;
-#else
-      int bytes = 0, total = 0;
-      char buf[256];
-#endif
-
-#if defined(_Win32)
-      if ((buf = pw_shell(arg1.v.p.ptr)) != NULL) {
-        r->type = V_STR;
-        r->v.p.ptr = buf;
-        r->v.p.size = strlen(buf) + 1;
-      }
-#else
-      /**
-       *   default popen/pclose
-       */
-      r->type = V_STR;
-      r->v.p.ptr = malloc(256);
-      *r->v.p.ptr = '\0';
-      r->v.p.size = 256;
-
-      FILE *fin = popen(arg1.v.p.ptr, "r");
-      if (fin) {
-        while (!feof(fin)) {
-          bytes = fread(buf, 1, 255, fin);
-          total += bytes;
-          buf[bytes] = '\0';
-          strcat(r->v.p.ptr, buf);
-          if (total + 256 >= r->v.p.size) {
-            r->v.p.size += 256;
-            r->v.p.ptr = realloc(r->v.p.ptr, r->v.p.size);
-          }
-        }
-        pclose(fin);
-      }
-#endif // bcb or not
-      else {
-        v_zerostr(r);
-        rt_raise(ERR_RUNFUNC_FILE, arg1.v.p.ptr);
-      }
+    if (!prog_error && !dev_run(arg1.v.p.ptr, r, 1)) {
+      rt_raise(ERR_RUNFUNC_FILE, arg1.v.p.ptr);
     }
     break;
 

src/common/brun.c

@@ -469,7 +469,6 @@ void cmd_chain(void) {
  */
 void cmd_run(int retf) {
   var_t var;
-
   v_init(&var);
   eval(&var);
   IF_ERR_RETURN;
@@ -482,7 +481,7 @@ void cmd_run(int retf) {
     v_free(&var);
   }
 
-  if (!dev_run(fileName, retf)) {
+  if (!dev_run(fileName, NULL, retf)) {
     err_run_err(fileName);
   }
 }
@@ -1196,7 +1195,9 @@ int brun_create_task(const char *filename, byte *preloaded_bc, int libf) {
       lseek(h, sizeof(unit_sym_t) * uft.sym_count, SEEK_CUR);
     }
     read(h, &hdr, sizeof(bc_head_t));
-
+    if (hdr.sbver != SB_DWORD_VER) {
+      panic("File '%s' version incorrect", fname);
+    }
     source = malloc(hdr.size + 4);
     lseek(h, 0, SEEK_SET);
     read(h, source, hdr.size);
@@ -1263,6 +1264,7 @@ int brun_create_task(const char *filename, byte *preloaded_bc, int libf) {
       cp += sizeof(bc_lib_rec_t);
     }
   }
+
   // build import-symbol table
   if (prog_symcount) {
     prog_symtable = (bc_symbol_rec_t *)malloc(prog_symcount * sizeof(bc_symbol_rec_t));
@@ -1271,21 +1273,22 @@ int brun_create_task(const char *filename, byte *preloaded_bc, int libf) {
       cp += sizeof(bc_symbol_rec_t);
     }
   }
+
   // create system stack
   prog_stack_alloc = SB_EXEC_STACK_SIZE;
   prog_stack = malloc(sizeof(stknode_t) * prog_stack_alloc);
   prog_stack_count = 0;
   prog_timer = NULL;
 
   // create eval's stack
-  eval_size = 64;
+  eval_size = SB_EVAL_STACK_SIZE;
   eval_stk = malloc(sizeof(var_t) * eval_size);
+  memset(eval_stk, 0, sizeof(var_t) * eval_size);
   eval_sp = 0;
 
   // initialize the rest tasks globals
   prog_error = 0;
   prog_line = 0;
-
   prog_dp = data_org = hdr.data_ip;
   prog_length = hdr.bc_count;
   prog_source = cp;
@@ -1385,7 +1388,6 @@ int brun_create_task(const char *filename, byte *preloaded_bc, int libf) {
 int exec_close_task() {
   word i;
   stknode_t node;
-
   if (ctask->bytecode) {
     // clean up - format list
     free_format();
@@ -1402,15 +1404,14 @@ int exec_close_task() {
     free(prog_stack);
     // clean up - variables
     for (i = 0; i < (int) prog_varcount; i++) {
-      int j, shared;
       // do not free imported variables
-      shared = -1;
+      int shared = -1;
+      int j;
       for (j = 0; j < prog_symcount; j++) {
-        if (prog_symtable[j].type == stt_variable) {
-          if (prog_symtable[j].var_id == i) {
-            shared = i;
-            break;
-          }
+        if (prog_symtable[j].type == stt_variable &&
+            prog_symtable[j].var_id == i) {
+          shared = j;
+          break;
         }
       }
 
@@ -1503,8 +1504,13 @@ void exec_sync_variables(int dir) {
         activate_task(ps->task_id);
         vp = tvar[us->vid];
 
+        // pointer assignment (shared var_t pointer)
         activate_task(tid);
-        tvar[ps->var_id] = vp;  // pointer assignment (shared var_t pointer)
+        if (tvar[ps->var_id] != vp) {
+          v_free(tvar[ps->var_id]);
+          free(tvar[ps->var_id]);
+        }
+        tvar[ps->var_id] = vp;
       } else {
         activate_task(tid);
         vp = tvar[ps->var_id];

src/common/ceval.c

@@ -141,6 +141,21 @@ void cev_prim_args() {
   }
 }
 
+// test for repeated primatives
+void cev_check_dup_prim() {
+  switch (CODE(IP)) {
+  case kwTYPE_INT:
+  case kwTYPE_NUM:
+  case kwTYPE_STR:
+  case kwTYPE_VAR:
+  case kwTYPE_CALLF:
+    cev_opr_err();
+    break;
+  default:
+    break;
+  }
+}
+
 /*
  * prim
  */
@@ -153,25 +168,31 @@ void cev_prim() {
   case kwTYPE_INT:
     bc_add_n(bc_out, bc_in->ptr + bc_in->cp, OS_INTSZ);
     IP += OS_INTSZ;
+    cev_check_dup_prim();
     break;
   case kwTYPE_NUM:
     bc_add_n(bc_out, bc_in->ptr + bc_in->cp, OS_REALSZ);
     IP += OS_REALSZ;
+    cev_check_dup_prim();
     break;
   case kwTYPE_STR:
     cev_prim_str();
+    cev_check_dup_prim();
     break;
   case kwTYPE_CALL_UDP:
     cev_udp();
+    cev_check_dup_prim();
     break;
   case kwTYPE_PTR:
     bc_add_n(bc_out, bc_in->ptr + bc_in->cp, ADDRSZ); // addr
     IP += ADDRSZ;
     bc_add_n(bc_out, bc_in->ptr + bc_in->cp, ADDRSZ); // return var
     IP += ADDRSZ;
+    cev_check_dup_prim();
     break;
   case kwTYPE_VAR:
     cev_prim_var();
+    cev_check_dup_prim();
     break;
   case kwTYPE_CALL_UDF:        // [udf1][addr2]
   case kwTYPE_CALLEXTF:        // [lib][index]
@@ -188,6 +209,9 @@ void cev_prim() {
         cev_prim_args();
       }
     }
+    if (code != kwBYREF) {
+      cev_check_dup_prim();
+    }
     break;
   };
 }

src/common/device.c

@@ -18,24 +18,6 @@
 #define usleep(s) Sleep((DWORD)((s+500)/1000))
 #endif
 
-/**
- * break signal
- */
-#if defined(_UnixOS) || defined(_DOS)
-void termination_handler(int signum) {
-  static int ctrlc_count;
-
-  prog_error = -2;
-  ctrlc_count++;
-  if (ctrlc_count == 1) {
-    dev_printf("\n\n\033[0m\033[7m\a * %s %d * \033[0m\n", WORD_BREAK_AT, prog_line);
-  } else if (ctrlc_count == 3) {
-    dev_restore();
-    exit(1);
-  }
-}
-#endif
-
 /**
  * initialize all drivers
  */
@@ -398,26 +380,31 @@ void dev_printf(const char *fmt, ...) {
  * prints to the output device as per dev_printf
  */
 void log_printf(const char *format, ...) {
-  char buf[4096], *p = buf;
   va_list args;
-
   va_start(args, format);
-  p += vsnprintf(p, sizeof buf - 1, format, args);
+  unsigned size = vsnprintf(NULL, 0, format, args);
   va_end(args);
 
-  while (p > buf && isspace(p[-1])) {
-    *--p = '\0';
-  }
+  if (size) {
+    char *buf = malloc(size + 3);
+    va_start(args, format);
+    vsnprintf(buf, size + 1, format, args);
+    va_end(args);
 
-  *p++ = '\r';
-  *p++ = '\n';
-  *p = '\0';
+    buf[size] = '\0';
+    int i = size - 1;
+    while (i >= 0 && isspace(buf[i])) {
+      buf[i--] = '\0';
+    }
+    strcat(buf, "\r\n");
 
 #if defined(IMPL_LOG_WRITE)
-  lwrite(buf);
+    lwrite(buf);
 #else
-  dev_print(buf);
+    dev_print(buf);
 #endif
+    free(buf);
+  }
 }
 
 #if defined(BUILD_CONSOLE)