COMMON: added ref var type

Author: chrisws

ChangeLog

@@ -1,3 +1,7 @@
+2014-08-30
+	Added reference variable type
+	Fixed HASH var handling with parenthesis
+
 2014-08-22
 	Fix HASH var crash
 	Fix HASH var handling of mixed types

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], [0.11.13])
+AC_INIT([smallbasic], [0.11.14])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET

debian/changelog

@@ -1,3 +1,8 @@
+smallbasic (0.11.14) unstable; urgency=low
+  * Added reference variable type
+
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 30 August 2014 09:45:25 +1000
+
 smallbasic (0.11.13) unstable; urgency=low
   * Fixed UDS handling
 

samples/distro-examples/tests/output/ref.out

@@ -0,0 +1,12 @@
+cat=	cat
+dog=	dog
+3=	3
+1=	1
+a=b	a=b
+a<>b	a<>b
+[NAME=kitchen]
+[NAME=hall]
+[NAME=Kitchen,FRIDGE=empty]
+[NAME=toilet,OCCUPIED=-1]
+[NAME=Kitchen,FRIDGE=empty]
+[NAME=hall]

samples/distro-examples/tests/ref.bas

@@ -0,0 +1,42 @@
+' reference variable tests
+
+a = "cat"
+b = @a
+
+print "cat=", b
+a = "dog"
+print "dog=", b
+print "3=", len(b)
+print "1=", not empty(b)
+print "a=b", iFF(a==b, "a=b", "a<>b")
+
+b = "goodbye a"
+print "a<>b", iFF(a==b, "a=b", "a<>b")
+
+dim rooms
+sub addRoom(byref room)
+  rooms << @room
+end
+
+dim kitchen,hall,toilet
+kitchen.name= "kitchen"
+hall.name = "hall"
+toilet.name ="toilet"
+
+addRoom(kitchen)
+addRoom(hall)
+
+print rooms(0)
+print rooms(1)
+
+kitchen.name = "Kitchen"
+kitchen.fridge = "empty"
+print rooms(0)
+
+insert rooms, 0, @toilet
+toilet.occupied = true
+
+print rooms(0)
+print rooms(1)
+print rooms(2)
+

samples/distro-examples/tests/uds.bas

@@ -82,4 +82,9 @@ if (my_pet.color != "black") then
    ? "error assigning structure 11"
 fi 
 
+my_pet.x = 10
+if ((my_pet.x + 1) < 10) then
+  ? "wrong !"
+fi
+
 ? "end of test"

src/common/blib.c

@@ -36,7 +36,7 @@ void cmd_let(int allowConst) {
       return;
     }
 
-    if (prog_source[prog_ip] == kwTYPE_CMPOPR && 
+    if (prog_source[prog_ip] == kwTYPE_CMPOPR &&
         prog_source[prog_ip + 1] == '=') {
       code_skipopr();
     }
@@ -173,12 +173,11 @@ void cmd_redim() {
  * A << x1 [, x2, ...]
  */
 void cmd_ladd() {
-  var_t *var_p, *elem_p, *arg_p;
-
-  var_p = code_getvarptr();
+  var_t *var_p = code_getvarptr();
   if (prog_error) {
     return;
   }
+
   if (code_peek() == kwTYPE_CMPOPR && prog_source[prog_ip + 1] == '=') {
     // compatible with LET, operator format
     code_skipopr();
@@ -190,30 +189,37 @@ void cmd_ladd() {
     return;
   }
 
-  // data
-  arg_p = v_new();
+  // for each argument to append
+  var_t *arg_p = v_new();
   do {
-    // get parameter on arg_p
+    // get the value to append
     v_free(arg_p);
 
+    int byref = 0;
     if (code_peek() == kwBYREF) {
       code_skipnext();
-      v_eval_ref(var_p);
+      byref = 1;
     } else {
       eval(arg_p);
-      if (prog_error) {
-        break;
-      }
-      
-      // append data
-      if (var_p->type != V_ARRAY) {
-        v_toarray1(var_p, 1);
-        elem_p = (var_t *) var_p->v.a.ptr;
-      } else {
-        v_resize_array(var_p, var_p->v.a.size + 1);
-        elem_p = (var_t *) (var_p->v.a.ptr + (sizeof(var_t) * (var_p->v.a.size - 1)));
-      }
-      
+    }
+    if (prog_error) {
+      break;
+    }
+
+    // find the array element
+    var_t *elem_p;
+    if (var_p->type != V_ARRAY) {
+      v_toarray1(var_p, 1);
+      elem_p = (var_t *)var_p->v.a.ptr;
+    } else {
+      v_resize_array(var_p, var_p->v.a.size + 1);
+      elem_p = (var_t *)(var_p->v.a.ptr + (sizeof(var_t) * (var_p->v.a.size - 1)));
+    }
+
+    // set the value onto the element
+    if (byref) {
+      v_eval_ref(elem_p);
+    } else {
       v_set(elem_p, arg_p);
     }
 
@@ -226,7 +232,6 @@ void cmd_ladd() {
         break;
       }
     }
-
   } while (1);
 
   // cleanup
@@ -238,23 +243,22 @@ void cmd_ladd() {
  * INSERT A, index, v1 [, vN]
  */
 void cmd_lins() {
-  var_t *var_p, *elem_p, *arg_p;
-  int idx, ladd, i;
-
-  var_p = code_getvarptr();
+  var_t *var_p = code_getvarptr();
   if (prog_error) {
     return;
   }
   par_getcomma();
   if (prog_error) {
     return;
   }
+
   // convert to array
   if (var_p->type != V_ARRAY) {
     v_toarray1(var_p, 0);
   }
+
   // get 'index'
-  idx = par_getint();
+  int idx = par_getint();
   if (prog_error) {
     return;
   }
@@ -264,42 +268,59 @@ void cmd_lins() {
   if (prog_error) {
     return;
   }
-  // if ( (idx > var_p->v.a.size) || (idx < 0) ) {
-  // err_out_of_range();
-  // return;
-  // }
 
-  ladd = 0;
+  int ladd = 0;
   if (idx >= var_p->v.a.size) {
-    ladd = 1;                   // append
+    // append
+    ladd = 1;
     idx = var_p->v.a.size;
   } else if (idx <= 0) {
-    idx = 0;                    // insert at top
+    // insert at top
+    idx = 0;
   }
-  // data
-  arg_p = v_new();
+
+  // for each argument to insert
+  var_t *arg_p = v_new();
   do {
-    // get parameter on arg_p
+    // get the value to append
     v_free(arg_p);
-    eval(arg_p);
+
+    int byref = 0;
+    if (code_peek() == kwBYREF) {
+      code_skipnext();
+      byref = 1;
+    } else {
+      eval(arg_p);
+    }
     if (prog_error) {
       break;
     }
+
     // resize +1
     v_resize_array(var_p, var_p->v.a.size + 1);
 
-    if (ladd) {                 // append
-      elem_p = (var_t *) (var_p->v.a.ptr + (sizeof(var_t) * (var_p->v.a.size - 1)));
+    // find the array element
+    var_t *elem_p;
+    if (ladd) {
+      // append
+      elem_p = (var_t *)(var_p->v.a.ptr + (sizeof(var_t) * (var_p->v.a.size - 1)));
     } else {
       // move all form idx one down
+      int i;
       for (i = var_p->v.a.size - 1; i > idx; i--) {
         // A(i) = A(i-1)
-        v_set((var_t *) (var_p->v.a.ptr + (sizeof(var_t) * i)),
-        (var_t *) (var_p->v.a.ptr + (sizeof(var_t) * (i - 1))));
+        v_set((var_t *)(var_p->v.a.ptr + (sizeof(var_t) * i)),
+              (var_t *)(var_p->v.a.ptr + (sizeof(var_t) * (i - 1))));
       }
-      elem_p = (var_t *) (var_p->v.a.ptr + (sizeof(var_t) * idx));
+      elem_p = (var_t *)(var_p->v.a.ptr + (sizeof(var_t) * idx));
+    }
+
+    // set the value onto the element
+    if (byref) {
+      v_eval_ref(elem_p);
+    } else {
+      v_set(elem_p, arg_p);
     }
-    v_set(elem_p, arg_p);
 
     // next parameter
     if (code_peek() != kwTYPE_SEP) {

src/common/blib_func.c

@@ -2163,8 +2163,9 @@ void cmd_genfunc(long funcCode, var_t * r) {
           v_set(r, &arg);       // set the false value
           v_free(&arg);
         }
-      } else
+      } else {
         par_skip();
+      }
     }
     break;
     //

src/common/ceval.c

@@ -68,15 +68,12 @@ void cev_prim() {
   case kwTYPE_CALL_UDP:
     cev_udp();
     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;
     break;
-
-  case kwTYPE_UDS_EL:
   case kwTYPE_VAR:
     bc_add_n(bc_out, bc_in->ptr + bc_in->cp, ADDRSZ); // 1 addr
     IP += ADDRSZ;
@@ -104,6 +101,7 @@ void cev_prim() {
         }
 
         if (CODE_PEEK() != kwTYPE_LEVEL_END) {
+          fprintf(stderr, "1\n");
           cev_missing_rp();
         } else {
           cev_add1(kwTYPE_LEVEL_END);
@@ -149,6 +147,9 @@ void cev_prim() {
       }
 
       if (CODE_PEEK() == kwTYPE_UDS_EL) {
+        // code + string
+        cev_add1(CODE(IP));
+        IP++;
         cev_prim();
       } else if (CODE_PEEK() != kwTYPE_LEVEL_END) {
         cev_missing_rp();
@@ -183,6 +184,9 @@ void cev_parenth() {
       cev_add1(CODE(IP));
       IP++;
     } else if (CODE_PEEK() == kwTYPE_UDS_EL) {
+      // code + string
+      cev_add1(CODE(IP));
+      IP++;
       cev_prim();
     } else if (CODE_PEEK() != kwTYPE_LEVEL_END) {
       cev_missing_rp();

src/common/eval.c

@@ -651,7 +651,23 @@ static inline void eval_shortc(var_t *r, addr_t addr, byte op) {
   }
 }
 
+var_t *eval_ref_var(var_t *var_p) {
+  var_t *result = var_p;
+  while (result->type == V_REF) {
+    if (result->v.ref == var_p) {
+      // circular referance error
+      result = NULL;
+      err_ref_var();
+      break;
+    } else {
+      result = result->v.ref;
+    }
+  }
+  return result;
+}
+
 static inline void eval_var(var_t *r, var_t *var_p) {
+  var_t *var_deref;
   switch (var_p->type) {
   case V_PTR:
     r->type = var_p->type;
@@ -671,6 +687,12 @@ static inline void eval_var(var_t *r, var_t *var_p) {
   case V_HASH:
     v_set(r, var_p);
     break;
+  case V_REF:
+    var_deref = eval_ref_var(var_p);
+    if (var_deref != NULL) {
+      eval_var(r, var_deref);
+    }
+    break;
   }
 }