COMMON: implemented FOR char in str

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2019-03-02 (0.12.15)
+	COMMON: Implemented - FOR character IN string
+
 2019-03-02 (0.12.15)
 	ANDROID: In editor, hide status when scrolled
 

samples/distro-examples/tests/strings.bas

@@ -181,3 +181,11 @@ s= "a\c\e"
 if mid(s, 2, 1) != "\\" then throw s
 if mid(s, 4, 1) != "\\" then throw s
 
+REM FOR character IN string
+s1 = "cats"
+s2 = ""
+for c in s1
+  s2 += c
+next c
+if (s1 <> s2) then throw s2
+

src/common/blib.c

@@ -1559,6 +1559,7 @@ void cmd_for_in(bcip_t true_ip, bcip_t false_ip, var_p_t var_p) {
   node.x.vfor.var_ptr = var_p;
   node.x.vfor.to_expr_ip = prog_ip;
   node.x.vfor.flags = 0;
+  node.x.vfor.str_ptr = NULL;
 
   if (code_isvar()) {
     // array variable
@@ -1575,6 +1576,7 @@ void cmd_for_in(bcip_t true_ip, bcip_t false_ip, var_p_t var_p) {
     switch (new_var->type) {
     case V_MAP:
     case V_ARRAY:
+    case V_STR:
       break;
 
     default:
@@ -1605,6 +1607,13 @@ void cmd_for_in(bcip_t true_ip, bcip_t false_ip, var_p_t var_p) {
       }
       break;
 
+    case V_STR:
+      var_elem_ptr = node.x.vfor.str_ptr = v_new();
+      v_init_str(var_elem_ptr, 1);
+      var_elem_ptr->v.p.ptr[0] = array_p->v.p.ptr[0];
+      var_elem_ptr->v.p.ptr[1] = '\0';
+      break;
+
     default:
       break;
     }
@@ -1797,6 +1806,20 @@ void cmd_until() {
   v_free(&var);
 }
 
+//
+// FOR chr in str
+//
+var_t *cmd_next_for_in_str(stknode_t *node) {
+  var_t *result = NULL;
+  var_t *array_p = node->x.vfor.arr_ptr;
+  int index = ++node->x.vfor.step_expr_ip;
+  if (index < v_strlen(array_p)) {
+    result = node->x.vfor.str_ptr;
+    result->v.p.ptr[0] = array_p->v.p.ptr[index];
+  }
+  return result;
+}
+
 //
 // FOR [EACH] v1 IN v2
 //
@@ -1808,6 +1831,10 @@ void cmd_next_for_in(stknode_t *node, bcip_t next_ip) {
   var_t *var_p = node->x.vfor.var_ptr;
 
   switch (array_p->type) {
+  case V_STR:
+    var_elem_ptr = cmd_next_for_in_str(node);
+    break;
+
   case V_MAP:
     var_elem_ptr = map_elem_key(array_p, ++node->x.vfor.step_expr_ip);
     break;
@@ -1834,6 +1861,11 @@ void cmd_next_for_in(stknode_t *node, bcip_t next_ip) {
       v_free(node->x.vfor.arr_ptr);
       v_detach(node->x.vfor.arr_ptr);
     }
+    if (node->x.vfor.str_ptr) {
+      v_free(node->x.vfor.str_ptr);
+      v_detach(node->x.vfor.str_ptr);
+      node->x.vfor.str_ptr = NULL;
+    }
     code_jump(next_ip);
   }
 }

src/common/var.h

@@ -107,6 +107,7 @@ typedef struct stknode_s {
     struct {
       var_t *var_ptr; /**< 'FOR' variable */
       var_t *arr_ptr; /**< FOR-IN array-variable */
+      var_t *str_ptr; /**< FOR-IN string variable */
       bcip_t to_expr_ip; /**< IP of 'TO' expression */
       bcip_t step_expr_ip; /**< IP of 'STEP' expression (FOR-IN = current element) */
       bcip_t jump_ip; /**< code block IP */

src/platform/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.1'
+    classpath 'com.android.tools.build:gradle:3.3.2'
     classpath "com.github.ben-manes:gradle-versions-plugin:0.20.0"
   }
 }