COMMON: fix reference func issue

Author: chrisws

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

@@ -1,13 +1,4 @@
 cat=	cat
 dog=	dog
-3=	3
-1=	1
-a=b	a=b
-a<>b	a<>b
-{"name":"kitchen"}
-{"name":"hall"}
-{"fridge":"empty","name":"Kitchen"}
-{"name":"toilet","occupied":1}
-{"fridge":"empty","name":"Kitchen"}
-{"name":"hall"}
-toilet
+10
+20

samples/distro-examples/tests/ref.bas

@@ -1,44 +1,26 @@
-' reference variable tests
-
-a = "cat"
-b = @a
-
-print "cat=", b
+rem reference variables not supported
 a = "dog"
+b = @a
+a = "cat"
+print "cat=", a
 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 << byref room
+rem complex pseudo class method references
+func C
+  func f(j)
+    return j
+  end
+  local r = {}
+  r.f = @f
+  return r
 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)
-
-roomref = byref rooms(0)
-print roomref.name
+func Q
+  local r = {}
+  r.c = C()
+  return r
+end
+c.m = Q()
+j = [1,2,3]
+for n in c.m.c.f(j)
+  print n
+next n

src/common/var_eval.c

@@ -21,10 +21,9 @@
 bcip_t get_array_idx(var_t *array) {
   bcip_t idx = 0;
   bcip_t lev = 0;
-  bcip_t m = 0;
-  var_t var;
 
   do {
+    var_t var;
     v_init(&var);
     eval(&var);
 
@@ -34,13 +33,13 @@ bcip_t get_array_idx(var_t *array) {
       err_varnotnum();
       break;
     } else {
-      bcip_t i;
       bcip_t idim = v_getint(&var);
+
       v_free(&var);
       idim = idim - v_lbound(array, lev);
 
-      m = idim;
-      for (i = lev + 1; i < v_maxdim(array); i++) {
+      bcip_t m = idim;
+      for (bcip_t i = lev + 1; i < v_maxdim(array); i++) {
         m = m * (ABS(v_ubound(array, i) - v_lbound(array, i)) + 1);
       }
       idx += m;
@@ -228,13 +227,17 @@ var_t *code_resolve_map(var_t *var_p, int until_parens) {
   return var_p;
 }
 
-var_t *resolve_var_ref(var_t *var_p) {
+var_t *resolve_var_ref(var_t *var_p, int *is_ptr) {
   switch (code_peek()) {
   case kwTYPE_LEVEL_BEGIN:
-    var_p = resolve_var_ref(code_getvarptr_arridx(var_p));
+    if (var_p->type == V_PTR) {
+      *is_ptr = 1;
+    } else {
+      var_p = resolve_var_ref(code_getvarptr_arridx(var_p), is_ptr);
+    }
     break;
   case kwTYPE_UDS_EL:
-    var_p = resolve_var_ref(map_resolve_fields(var_p, NULL));
+    var_p = resolve_var_ref(map_resolve_fields(var_p, NULL), is_ptr);
     break;
   }
   return var_p;
@@ -293,7 +296,12 @@ int code_isvar() {
       var_p = code_resolve_varptr(var_p, 0);
       break;
     case V_REF:
-      var_p = resolve_var_ref(var_p);
+      is_ptr = 0;
+      var_p = resolve_var_ref(var_p, &is_ptr);
+      if (is_ptr) {
+        prog_ip = cur_ip;
+        return 1;
+      }
       break;
     default:
       if (code_peek() == kwTYPE_LEVEL_BEGIN) {

src/platform/console/Makefile.am

@@ -26,7 +26,7 @@ sbasic_DEPENDENCIES = $(top_srcdir)/src/common/libsb_common.a
 TEST_DIR=../../../samples/distro-examples/tests
 UNIT_TESTS=array break byref eval-test iifs matrices metaa ongoto \
 	         uds hash pass1 call_tau short-circuit strings stack-test \
-           replace-test read-data proc optchk letbug ptr \
+           replace-test read-data proc optchk letbug ptr ref \
            trycatch chain stream-files split-join sprint all scope goto
 
 test: ${bin_PROGRAMS}