Merge pull request #113 from chrisws/12_21

12 21

Author: chrisws

ChangeLog

@@ -1,8 +1,24 @@
+2021-04-02 (12.21)
+	ANDROID: Added range checking for the web services port
+
+2021-03-28 (12.21)
+	COMMON: Fix CIRCLE command to ensure radius uses the WINDOW coordinate system
+	COMMON: Fix to ensure the default VIEW is maintained during resizing
+
+2021-03-21 (12.21)
+	COMMON: Fix square bracket field access issue
+
+2021-02-23 (12.21)
+	COMMON: Fix crash when line length limit exceeded
+
+2021-01-18 (12.21)
+	COMMON: Handle octal escapes correctly
+
 2020-12-19 (12.20)
 	SDL: Update editor popup appearance
 
 2020-11-19 (12.20)
-	COMMON: Fix to allow multiple modules and units within saem program
+	COMMON: Fix to allow multiple modules and units within same program
 
 2020-11-13 (12.20)
 	ANDROID: add option to preserve user data when app uninstalled

configure.ac

@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [12.20])
+AC_INIT([smallbasic], [12.21])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET

samples/distro-examples/tests/array.bas

@@ -313,4 +313,17 @@ next i
 m[1,2,3,4,5,6]=999
 if (999 <> m[1,2,3,4,5,6]) then
   throw "e"
-endif
+endif
+
+REM test that "[0, 0]" in anims[0].framePoses[0, 0].translation is not scanned as a codearray
+dim amims(0 to 1)
+dim j(0 to 1, 0 to 1)
+j[0, 0].translation = [1,2,3]
+k.framePoses = j
+anims << k
+sub xfunc(argx)
+  local xx=[1,2,3]
+  if xx!=argx then throw "err"
+end
+z=anims[0].framePoses[0, 0].translation
+xfunc(anims[0].framePoses[0, 0].translation)

src/common/bc.c

@@ -40,6 +40,27 @@ int bc_is_escape(char c, char *value) {
   return result;
 }
 
+/*
+ * whether the character is octal escape
+ */
+int bc_is_octal(char *str, char *output) {
+  char *next = str + 1;
+  int result = 0;
+  int digits = 0;
+  int value = 0;
+
+  while (isdigit(*next) && digits < 4) {
+    value = (value << 3) + (*next - '0');
+    digits++;
+    next++;
+  }
+  if (digits == 3 && value < 256) {
+    *output = value;
+    result = 1;
+  }
+  return result;
+}
+
 /*
  * Create a bytecode segment
  */
@@ -240,7 +261,15 @@ char *bc_store_string(bc_t *bc, char *src) {
       char code[] = {escape, '\0'};
       cstr_append_i(&cs, base, p - base);
       cstr_append_i(&cs, code, 1);
+      // skip single escape character
       base = (++p) + 1;
+    } else if (*p == '\\' && bc_is_octal(p, &escape)) {
+      char code[] = {escape, '\0'};
+      cstr_append_i(&cs, base, p - base);
+      cstr_append_i(&cs, code, 1);
+      // skip octal digits
+      p += 3;
+      base = p + 1;
     } else if (*p == V_QUOTE) {
       // revert hidden quote
       *p = '\"';

src/common/device.h

@@ -1069,6 +1069,13 @@ void panic(const char *fmt, ...);
  */
 void lwrite(const char *buf);
 
+/**
+ * @ingroup dev_f
+ *
+ * resize the window coordinate system
+ */
+void dev_resize(int width, int height);
+
 #if defined(__cplusplus)
 }
 #endif

src/common/scan.c

@@ -1110,6 +1110,10 @@ int comp_is_code_array(bc_t *bc, char *p) {
       }
       p++;
     }
+    if (*p == '.') {
+      // a[1].foo is not a code array
+      result = 0;
+    }
     if (!count) {
       result = 1;
     }
@@ -1331,10 +1335,11 @@ void comp_expression(char *expr, byte no_parser) {
       // string
       ptr = bc_store_string(&bc, ptr);
     } else if (*ptr == '[') {
-      // code-defined array
+      // potential code-defined array
       ptr++;
       level++;
-      if (comp_is_code_array(&bc, ptr)) {
+      // can't be a code array if this is already part of a variable
+      if ((bc.size == 0 || bc.ptr[0] != kwTYPE_VAR) && comp_is_code_array(&bc, ptr)) {
         // otherwise treat as array index
         bc_add_fcode(&bc, kwCODEARRAY);
       }
@@ -3942,29 +3947,6 @@ char *comp_load(const char *file_name) {
   return buf;
 }
 
-const char *format_numeric_text(const char *str, char **output) {
-  const char *result = str + 1;
-  int value = 0;
-  int digits = 0;
-
-  while (isdigit(*result)) {
-    value = (value << 3) + (*result - '0');
-    digits++;
-    result++;
-  }
-
-  if (digits == 3 && value > V_JOIN_LINE && value < 256) {
-    **output = value;
-  } else {
-    **output = *str;
-    result = str + 1;
-  }
-
-  (*output)++;
-
-  return result;
-}
-
 /**
  * format source-code text
  *
@@ -4173,9 +4155,6 @@ char *comp_format_text(const char *source) {
         }
         // new line auto-ends the quoted string
         quotes = !quotes;
-      } else if (*p == '\\') {
-        p = format_numeric_text(p, &ps);
-        continue;
       }
       *ps++ = *p++;
     }
@@ -4677,6 +4656,7 @@ int comp_pass1(const char *section, const char *text) {
 
     char *ps = new_text;
     char *p = ps;
+    int line_size = 0;
     while (*p) {
       if (*p == '\n') {
         // proceed
@@ -4695,11 +4675,17 @@ int comp_pass1(const char *section, const char *text) {
           break;
         }
         ps = p + 1;
+        line_size = 0;
       }
       if (comp_error) {
         break;
       }
       p++;
+      if (++line_size >= SB_SOURCELINE_SIZE) {
+        *p = '\0';
+        sc_raise(ERR_LINE_LENGTH, p - 50);
+        break;
+      }
     }
   }