Changeset 538 for trunk/thune/eval.c

Timestamp:

06/14/08 16:30:57 (6 months ago)

Author:

krobillard

Message:

Added get/words, isGlobalIndex(), and 10 reserved atoms.

Files:

• trunk/thune/eval.c (modified) (3 diffs)

trunk/thune/eval.c

@@ -1089 +1089 @@
    (word -- val)
    (word ctx -- val)
+   /words (ctx -- blk)
 */
 UR_CALL( uc_get )
@@ -1107 +1108 @@
     else if( ur_is(tos, UT_CONTEXT) )
     {
-        val = ur_s_prev( tos );
-        if( ur_isAWord(val) )
-        {
-            UBlock* blk;
-            int wrdN;
-
-            wrdN = ur_lookup( tos, ur_atom(val) );
-            if( wrdN > -1 )
-            {
-                blk = ur_blockPtr( tos->ctx.valBlk );
-                ur_copyCell(val, blk->ptr.cells[ wrdN ]);
-                /*
-                if( ur_is(ctx, UT_UNSET) )
-                    _throwUnset( ut, ctx );
-                */
-            }
-            else
-            {
-                ur_setNone( val );
-            }
-
-            UR_S_DROP;
+        UBlock* blk;
+        UCell* inv = UR_CALL_CELL;
+
+        if( inv && ur_sel(inv) == UR_ATOM_WORDS )
+        {
+            int len;
+            UIndex blkN;
+
+            blk = ur_blockPtr( tos->ctx.valBlk );
+            len = blk->used;
+            blk = ur_blockPtr( tos->ctx.wordBlk );
+            val = blk->ptr.cells;
+
+            blkN = ur_makeBlockT( ut, len, &blk );     // gc!
+            ur_copyCells( val, val + len, blk->ptr.cells );
+            blk->used = len;
+            ur_bindT( ut, blkN, tos, isGlobalIndex(tos->ctx.valBlk) ?
+                                         UR_BIND_GLOBAL : UR_BIND_THREAD );
+
+            ur_initBlock( tos, blkN, 0 ); 
             return;
+        }
+        else
+        {
+            val = ur_s_prev( tos );
+            if( ur_isAWord(val) )
+            {
+                int wrdN;
+
+                wrdN = ur_lookup( tos, ur_atom(val) );
+                if( wrdN > -1 )
+                {
+                    blk = ur_blockPtr( tos->ctx.valBlk );
+                    ur_copyCell(val, blk->ptr.cells[ wrdN ]);
+                    /*
+                    if( ur_is(ctx, UT_UNSET) )
+                        _throwUnset( ut, ctx );
+                    */
+                }
+                else
+                {
+                    ur_setNone( val );
+                }
+
+                UR_S_DROP;
+                return;
+            }
         }
     }
@@ -1154 +1179 @@
 #endif
 
-    ur_throwErr( UR_ERR_DATATYPE, "get expected word!" );
+    ur_throwErr( UR_ERR_DATATYPE, "get expected word!/context!" );
 }