COMMON unify uds and hash

Author: chrisws

ChangeLog

@@ -2,6 +2,7 @@
 	Fix HASH var crash
 	Fix HASH var handling of mixed types
 	Fix illegal UDS field variable names
+	Unitfy HASH and UDS
 
 2014-08-15
 	Improved runtime performance

samples/distro-examples/tests/call_tau.bas

@@ -20,9 +20,19 @@ rem check system-variables
 predef.prsys
 
 x=PI
-foyer.name= "PI"
+dim foyer
+foyer.name= "my name is PI"
+? "test"
+?  foyer("NAME")
+?  foyer("name")
+?  foyer.Name
+?  foyer.name
+
+? "end"
+
 tau.addRoom(foyer,x)
 
+
 sub addRoom(the_thing, d)
   print the_thing.name, d
 end

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

@@ -11,5 +11,10 @@ message from tau
 [1,2,3,4]
 Predefined Variables
 PI     =3.14159265358979
-PI	3.14159265358979
-PI	3.14159265358979
+test
+my name is PI
+my name is PI
+my name is PI
+my name is PI
+end
+my name is PI	3.14159265358979

samples/distro-examples/tests/tau.bas

@@ -37,7 +37,7 @@ sub cerr
 end
 
 sub addRoom(the_thing,d)
-  print the_thing.name,d
+
 end
 
 rem initialization

samples/distro-examples/tests/uds.bas

@@ -32,6 +32,7 @@ sub passByVal(udsVal)
 end
 
 'test with formal+actual arguments having differing names
+dim _udsRef
 _udsRef.field1 = "initField1"
 _udsRef.field2 = "initField2"
 _udsRef.field3 = 3.0
@@ -50,6 +51,7 @@ if (_udsRef.field2 != "updatedField2") then
 fi
 
 'test with formal+actual arguments with global names
+dim udsRef
 udsRef.field1 = "initField1"
 udsRef.field2 = "initField2"
 udsRef.field3 = 3.0
@@ -68,6 +70,7 @@ if (udsRef.field2 != "updatedField2") then
 fi
 
 'test complex structures - this is pretty cool :)
+dim animal
 animal.pet.cat.legs = 4
 animal.pet.cat.color = "black"
 

src/common/blib.c

@@ -285,7 +285,7 @@ void cmd_lins() {
       // move all form idx one down
       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)), 
+        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));
@@ -1038,7 +1038,6 @@ void cmd_udp(int cmd) {
         ready = 1;              // finish flag
         break;
 
-      case kwTYPE_UDS:
       case kwTYPE_VAR:         // the parameter is a variable
         ofs = prog_ip;          // keep expression's IP
 
@@ -1149,7 +1148,6 @@ void cmd_call_unit_udp(int cmd, int udp_tid, addr_t goto_addr, addr_t rvid) {
         // parameters
         ready = 1;              // finish flag
         break;
-      case kwTYPE_UDS:
       case kwTYPE_VAR:         // the parameter is a variable
         ofs = prog_ip;          // keep expression's IP
 
@@ -1607,7 +1605,7 @@ void cmd_endif() {
     code_pop(&node);
     IF_ERR_BREAK;
   }
-  
+
   if (!prog_error) {
     prog_ip += (ADDRSZ + ADDRSZ);
   }
@@ -2163,7 +2161,7 @@ void cmd_pause() {
   long start, now;
 
   code = code_peek();
-  if (code == kwTYPE_VAR || code == kwTYPE_UDS) {
+  if (code == kwTYPE_VAR) {
     x = par_getint();
     if (prog_error) {
       return;

src/common/brun.c

@@ -324,7 +324,7 @@ var_t *code_resolve_varptr(var_t *var_p, int until_parens) {
       }
       break;
     case kwTYPE_UDS_EL:
-      var_p = code_resolve_varptr(uds_resolve_fields(var_p), until_parens);
+      var_p = code_resolve_varptr(hash_resolve_fields(var_p), until_parens);
       break;
     }
   }
@@ -383,15 +383,13 @@ var_t *code_isvar_arridx(var_t *basevar_p) {
 int code_isvar() {
   var_t *basevar_p;
   var_t *var_p = NULL;
-  addr_t cur_ip;
 
-  cur_ip = prog_ip;             // store IP
+  // store IP
+  addr_t cur_ip = prog_ip;
 
-  switch (code_peek()) {
-  case kwTYPE_VAR:
+  if (code_peek() == kwTYPE_VAR) {
     code_skipnext();
     var_p = basevar_p = tvar[code_getaddr()];
-
     switch (basevar_p->type) {
     case V_HASH:
     case V_ARRAY:
@@ -403,23 +401,18 @@ int code_isvar() {
         var_p = NULL;
       }
     }
-    break;
-
-  case kwTYPE_UDS:
-    code_skipnext();
-    var_p = tvar[code_getaddr()];
-    var_p = code_resolve_varptr(uds_resolve_fields(var_p), 0);
-    break;
   }
 
   if (var_p) {
     if (kw_check_evexit(code_peek()) || code_peek() == kwTYPE_LEVEL_END) {
-      prog_ip = cur_ip;         // restore IP
+      // restore IP
+      prog_ip = cur_ip;
       return 1;
     }
   }
 
-  prog_ip = cur_ip;             // restore IP
+  // restore IP
+  prog_ip = cur_ip;
   return 0;
 }
 
@@ -552,7 +545,7 @@ void exec_setup_predefined_variables() {
 
   {
     static char stupid_os_envsblog[1024]; // it must be static at
-    // least by default on DOS 
+    // least by default on DOS
     // or Win32(BCB)
     sprintf(stupid_os_envsblog, "SBLOG=%s%csb.log", homedir, OS_DIRSEP);
     putenv(stupid_os_envsblog);
@@ -805,10 +798,10 @@ void bc_loop(int isf) {
 
       // debug
       /*
-       * fprintf(stderr, "\t%d: %d = ", prog_ip, code); for ( i = 0; 
+       * fprintf(stderr, "\t%d: %d = ", prog_ip, code); for ( i = 0;
        * keyword_table[i].name[0] != '\0'; i ++) { if ( code ==
        * keyword_table[i].code ) { fprintf(stderr,"%s ",
-       * keyword_table[i].name); break; } } fprintf(stderr,"\n"); 
+       * keyword_table[i].name); break; } } fprintf(stderr,"\n");
        */
 
       switch (code) {
@@ -948,7 +941,7 @@ void bc_loop(int isf) {
 
         /*
          * ----------------------------------------- * external
-         * procedures 
+         * procedures
          */
       case kwTYPE_CALLEXTP:    // [lib][index]
       {
@@ -969,7 +962,7 @@ void bc_loop(int isf) {
         break;
         /*
          * ----------------------------------------- * buildin
-         * procedures -- BEGIN 
+         * procedures -- BEGIN
          */
       case kwTYPE_CALLP:
         pcode = code_getaddr();
@@ -1362,7 +1355,7 @@ void dump_stack() {
 
 /*
  * RUN byte-code
- * 
+ *
  * ByteCode Structure (executables, not units):
  *
  * [header (bc_head_t)]
@@ -1606,14 +1599,14 @@ int brun_create_task(const char *filename, mem_t preloaded_bc, int libf) {
     // for ( i = 0; i < prog_symcount; i ++ ) {
     // if ( prog_symtable[i].task_id == -1 && prog_libtable[i].type == 1 )
     // panic("Symbol (unit) '%s' missing\n", prog_symtable[i].symbol);
-    // if ( prog_symtable[i].task_id == -1 && prog_libtable[i].type == 0 ) { 
+    // if ( prog_symtable[i].task_id == -1 && prog_libtable[i].type == 0 ) {
     // if ( prog_symtable[j].exp_idx == -1 )
     // panic("Symbol (module) '%s' missing\n", prog_symtable[i].symbol);
     // }
     // }
     // }
   }
-  // 
+  //
   return tid;
 }
 
@@ -1949,9 +1942,9 @@ int sbasic_exec(const char *file) {
   strcpy(gsb_last_file, file);
   strcpy(gsb_last_errmsg, "");
 
-  // compile it - if opt_nosave, bytecode_h is a 
+  // compile it - if opt_nosave, bytecode_h is a
   // memory handle of BC; otherwise you must run the file
-  success = sbasic_compile(file); 
+  success = sbasic_compile(file);
 
   if (opt_syntaxcheck)          // this is a command-line flag to
     // syntax-check only
@@ -1976,7 +1969,7 @@ int sbasic_exec(const char *file) {
     evt_check_every = (50 * CLOCKS_PER_SEC) / 1000; // setup event checker time = 50ms
     srand(clock());             // randomize
 
-    // run 
+    // run
     sbasic_recursive_exec(exec_tid);
 
     // normal exit

src/common/ceval.c

@@ -77,7 +77,6 @@ void cev_prim() {
     break;
 
   case kwTYPE_UDS_EL:
-  case kwTYPE_UDS:
   case kwTYPE_VAR:
     bc_add_n(bc_out, bc_in->ptr + bc_in->cp, ADDRSZ); // 1 addr
     IP += ADDRSZ;
@@ -366,17 +365,17 @@ void expr_parser(bc_t *bc_src) {
 
   code = CODE_PEEK();
 
-  // 
+  //
   // empty!
-  // 
+  //
   if (code == kwTYPE_LINE || code == kwTYPE_EOC) {
     bc_destroy(bc_out);
     tmp_free(bc_out);
     return;
   }
-  // 
+  //
   // LET|CONST special code
-  // 
+  //
   if (code == kwTYPE_CMPOPR) {
     IP++;
     if (CODE(IP) != '=') {

src/common/eval.c

@@ -1164,7 +1164,6 @@ void eval(var_t *r) {
       r->v.ap.v = code_getaddr();
       break;
 
-    case kwTYPE_UDS:
     case kwTYPE_VAR:
       // variable
       V_FREE(r);

src/common/hotspots.h

@@ -152,8 +152,7 @@ static inline var_int_t v_igetval(var_t *v) {
 static inline var_t* code_getvarptr_parens(int until_parens) {
   var_t *var_p = NULL;
 
-  switch (code_peek()) {
-  case kwTYPE_VAR:
+  if (code_peek() == kwTYPE_VAR) {
     code_skipnext();
     var_p = tvar[code_getaddr()];
     switch (var_p->type) {
@@ -166,13 +165,6 @@ static inline var_t* code_getvarptr_parens(int until_parens) {
         err_varisnotarray();
       }
     }
-    break;
-
-  case kwTYPE_UDS:
-    code_skipnext();
-    var_p = tvar[code_getaddr()];
-    var_p = code_resolve_varptr(uds_resolve_fields(var_p), until_parens);
-    break;
   }
 
   if (var_p == NULL && !prog_error) {