COMMON: handle octal escapes correctly

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2021-01-18 (12.21)
+	COMMON: Handle octal escapes correctly
+
 2020-12-19 (12.20)
 	SDL: Update editor popup appearance
 

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

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/scan.c

@@ -3942,29 +3942,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 +4150,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++;
     }

src/platform/android/app/src/main/assets/main.bas

@@ -124,7 +124,7 @@ sub do_about()
   color colText
   print "Version "; sbver
   print
-  print "Copyright (c) 2002-2020 Chris Warren-Smith"
+  print "Copyright (c) 2002-2021 Chris Warren-Smith"
   print "Copyright (c) 1999-2006 Nicholas Christopoulos" + chr(10)
 
   local bn_home