Changeset 184 for trunk/thune/make.c

Timestamp:

06/12/06 01:58:22 (3 years ago)

Author:

krobillard

Message:

Thune -

Word lookup now uses an ordered binary search.
Renamed ur_setType as ur_initType.
Some error reporting improvements in eval.

Files:

• trunk/thune/make.c (modified) (22 diffs)

trunk/thune/make.c

@@ -203 +203 @@
     ur_arrayInit( ptrB, sizeof(UCell), wordCount );
 
-    ur_setType( ctx, UT_CONTEXT );
+    ur_initType( ctx, UT_CONTEXT );
     ctx->ctx.wordBlk     = ur_blockN( ptrA );
     ctx->ctx.valBlk      = ur_blockN( ptrB );
@@ -279 +279 @@
                 while( it != rend )
                 {
-                    ur_setType( it, UT_NONE );
+                    ur_initType( it, UT_NONE );
                     ++it;
                 }
@@ -683 +683 @@
     if( i == count )
     {
-        ur_setType( res, UT_DATATYPE );
+        ur_initType( res, UT_DATATYPE );
         ur_datatype(res) = UT_TYPEMASK;
         res->dt.bitCount = count;
@@ -695 +695 @@
     if( count == 2 )
     {
-        ur_setType( res, UT_SELECTOR );
+        ur_initType( res, UT_SELECTOR );
         if( nodeType & 2 )
             res->id.flags |= UR_FLAG_SEL_ATOM;
-        res->word.valBlk = GLOBAL_VAL_BLKN;
-        res->word.atom   = node[0];
-        ur_selector(res) = node[1];
-        res->word.index  = ur_internWord( &ur_global, res->word.atom );
+        res->word.wordBlk = 0;
+        res->word.valBlk  = GLOBAL_VAL_BLKN;
+        res->word.atom    = node[0];
+        ur_selector(res)  = node[1];
+        res->word.index   = ur_internWord( &ur_global, res->word.atom );
 
         return 1;
@@ -737 +738 @@
 
         cell = vblk->ptr.cells + wrdN;
-        ur_setType( cell, UT_CALL );
+        ur_initType( cell, UT_CALL );
         cell->call.addr = (call_t) def->addr;
 
@@ -758 +759 @@
     UCell* cell;
     UR_EXPAND_1( UCell, blk, cell );
-    ur_setType( cell, type );
+    ur_initType( cell, type );
     return cell;
 }
@@ -772 +773 @@
     cell = ur_appendCell( blk, type );
 
+    cell->word.atom    = ur_intern( name, len );
     cell->word.wordBlk = 0;     //GLOBAL_WORD_BLKN;
     cell->word.valBlk  = GLOBAL_VAL_BLKN;
-    cell->word.atom    = ur_intern( name, len );
+    cell->word.sel     = UR_CTX_UNORDERED;
 
     if( type != UT_LITWORD )
@@ -846 +848 @@
             if( ur_is(tos, UT_LITWORD) && ur_is(ur_s_prev(tos), UT_INT) )
             {
-                ur_setType( res, UT_OPCODE );
-                ur_opcode(res) = ur_int(ur_s_next(res));
-                ur_atom(res)   = ur_atom(tos);
+                ur_initType( res, UT_OPCODE );
+                ur_atom(res)     = ur_atom(tos);
+                ur_opcode(res)   = ur_int(ur_s_next(res));
+                ur_selector(res) = 0;
             }
             break;
 
         case UT_LOGIC:
-            ur_setType( res, UT_LOGIC );
+            ur_initType( res, UT_LOGIC );
             ur_logic(res) = ur_int(tos) ? 1 : 0;
             break;
@@ -866 +869 @@
 
                 // Word is added to global context.
-                ur_setType( res, t );
+                ur_initType( res, t );
                 res->word.wordBlk = 0;
                 res->word.valBlk  = GLOBAL_VAL_BLKN;
@@ -885 +888 @@
             if( ur_is(tos, UT_INT) )
             {
-                ur_setType( res, UT_CHAR );
+                ur_initType( res, UT_CHAR );
                 ur_char(res) = ur_int(tos);
             }
@@ -892 +895 @@
                 if( spA )
                 {
-                    ur_setType( res, UT_CHAR );
+                    ur_initType( res, UT_CHAR );
 
                     if( *spA == ESCAPE_CHAR )
@@ -924 +927 @@
             else
                 goto error;
-            ur_setType( res, UT_INT );
+            ur_initType( res, UT_INT );
             ur_int(res) = n;
         }
@@ -943 +946 @@
             else
                 goto error;
-            ur_setType( res, UT_DECIMAL );
+            ur_initType( res, UT_DECIMAL );
             ur_decimal(res) = n;
         }
@@ -954 +957 @@
                 UIndex blkN;
                 blkN = ur_makeBlock( ur_int(tos) );
-                ur_setType(res, ur_datatype(res) );
+                ur_initType(res, ur_datatype(res) );
                 ur_setSeries(res, blkN, 0);
             }
@@ -968 +971 @@
                 if( blkN )
                 {
-                    ur_setType(res, ur_datatype(res) );
+                    ur_initType(res, ur_datatype(res) );
                     ur_setSeries(res, blkN, 0);
                 }
@@ -1013 +1016 @@
                 }
 
-                ur_setType(res, UT_BINARY);
+                ur_initType(res, UT_BINARY);
                 ur_setSeries(res, binN, 0);
             }
@@ -1028 +1031 @@
                 UIndex binN;
                 binN = ur_makeBinary( ur_int(tos) );
-                ur_setType(res, UT_STRING);
+                ur_initType(res, UT_STRING);
                 //ur_setEncoding(res, UR_ENC_ASCII);
                 ur_setSeries(res, binN, 0);
@@ -1042 +1045 @@
                 ur_toStr( tos, str, 0 );
 
-                ur_setType(res, UT_STRING);
+                ur_initType(res, UT_STRING);
                 //ur_setEncoding(res, UR_ENC_ASCII);
                 ur_setSeries(res, binN, 0);
@@ -1055 +1058 @@
                     binN = ur_makeBinary( 0 );
 
-                ur_setType(res, UT_STRING);
+                ur_initType(res, UT_STRING);
                 //ur_setEncoding(res, UR_ENC_ASCII);
                 ur_setSeries(res, binN, 0);
@@ -1083 +1086 @@
             // Make bitset before setting res in case GC is called.
             UIndex binN = ur_makeBitset(tos);
-            ur_setType(res, UT_BITSET);
+            ur_initType(res, UT_BITSET);
             ur_setSeries(res, binN, 0);
         }
@@ -1092 +1095 @@
                 goto error;
 
-            ur_setType(res, UT_ERROR);
+            ur_initType(res, UT_ERROR);
             res->err.exType     = UR_EX_SCRIPT;
             res->err.messageStr = tos->series.n;
@@ -1101 +1104 @@
             if( ur_isASeries(tos) )
             {
-                ur_setType(res, UT_SLICE);
+                ur_initType(res, UT_SLICE);
                 ur_sliceDT(res) = ur_type(tos);
                 res->series.n = tos->series.n;