COMMON: Fix array append regression #122

Author: chrisws

ChangeLog

@@ -1,3 +1,9 @@
+2021-07-28 (12.23)
+	COMMON: Fix array append regression #122
+
+2021-07-28 (12.23)
+	ANDROID: Hide keypad on run. Show keypad for INPUT, then re-hide on completion.
+
 2021-07-28 (12.22)
 	UI: Allow RGB to be used with image array passed to IMAGE
 

src/common/blib.c

@@ -258,11 +258,6 @@ void cmd_append() {
 
   // for each argument to append
   do {
-    // get the value to append
-    var_t arg_p;
-    v_init(&arg_p);
-    eval(&arg_p);
-
     // find the array element
     var_t *elem_p;
     if (var_p->type != V_ARRAY) {
@@ -274,7 +269,8 @@ void cmd_append() {
     }
 
     // set the value onto the element
-    v_move(elem_p, &arg_p);
+    v_init(elem_p);
+    eval(elem_p);
 
     // next parameter
     if (code_peek() != kwTYPE_SEP) {
@@ -288,27 +284,6 @@ void cmd_append() {
   } while (1);
 }
 
-void cmd_append_opt() {
-  var_t *v_left = code_getvarptr();
-
-  // skip kwTYPE_SEP + ","
-  code_skipsep();
-
-  // skip kwTYPE_VAR
-  code_skipnext();
-
-  var_t *elem_p;
-  if (v_left->type != V_ARRAY) {
-    v_toarray1(v_left, 1);
-    elem_p = v_elem(v_left, 0);
-  } else {
-    v_resize_array(v_left, v_asize(v_left) + 1);
-    elem_p = v_elem(v_left, v_asize(v_left) - 1);
-  }
-
-  v_set(elem_p, tvar[code_getaddr()]);
-}
-
 /**
  * INSERT A, index, v1 [, vN]
  */

src/common/blib.h

@@ -37,7 +37,6 @@ void cmd_packed_let();
 void cmd_dim(int);
 void cmd_redim(void);
 void cmd_append(void);
-void cmd_append_opt(void);
 void cmd_lins(void);
 void cmd_ldel(void);
 void cmd_erase(void);

src/common/brun.c

@@ -882,9 +882,6 @@ void bc_loop(int isf) {
       case kwAPPEND:
         cmd_append();
         break;
-      case kwAPPEND_OPT:
-        cmd_append_opt();
-        break;
       case kwINSERT:
         cmd_lins();
         break;

src/common/kw.h

@@ -151,7 +151,6 @@ enum keyword {
   kwFORSEP,
   kwOUTPUTSEP,
   kwAPPEND,
-  kwAPPEND_OPT,
   kwINSERT,
   kwDELETE,
   kwAPPENDSEP,

src/common/scan.c

@@ -3740,20 +3740,20 @@ bcip_t comp_optimise_line_goto(bcip_t ip) {
 }
 
 // use simpler LET where possible to avoid eval on the right term
-bcip_t comp_optimise_let(bcip_t ip, byte kw_opr, char sep, byte opt_kw) {
+bcip_t comp_optimise_let(bcip_t ip) {
   bcip_t ip_next = ip + 1;
   if (comp_prog.ptr[ip_next] == kwTYPE_VAR) {
     ip_next += 1 + sizeof(bcip_t);
     while (ip_next < comp_prog.count && comp_prog.ptr[ip_next] != kwTYPE_EOC
            && comp_prog.ptr[ip_next] != kwTYPE_LINE) {
-      if (comp_prog.ptr[ip_next] == kw_opr &&
-          comp_prog.ptr[ip_next + 1] == sep) {
+      if (comp_prog.ptr[ip_next] == kwTYPE_CMPOPR &&
+          comp_prog.ptr[ip_next + 1] == '=') {
         ip_next += 2;
         if (ip_next < comp_prog.count &&
             comp_prog.ptr[ip_next] == kwTYPE_VAR &&
             (comp_prog.ptr[ip_next + 1 + sizeof(bcip_t)] == kwTYPE_EOC ||
              comp_prog.ptr[ip_next + 1 + sizeof(bcip_t)] == kwTYPE_LINE)) {
-          comp_prog.ptr[ip] = opt_kw;
+          comp_prog.ptr[ip] = kwLET_OPT;
           ip = ip_next;
         }
         break;
@@ -3774,10 +3774,7 @@ void comp_optimise() {
       }
       break;
     case kwLET:
-      ip = comp_optimise_let(ip, kwTYPE_CMPOPR, '=', kwLET_OPT);
-      break;
-    case kwAPPEND:
-      ip = comp_optimise_let(ip, kwTYPE_SEP, ',', kwAPPEND_OPT);
+      ip = comp_optimise_let(ip);
       break;
     case kwTYPE_EOC:
       if (!opt_autolocal &&