Changeset 427 for branches/thune/thread_safe/tokenize.c

Timestamp:

07/07/07 04:41:31 (17 months ago)

Author:

krobillard

Message:

Setting words in the shared global store now throws an error.
Default binding changed so top-level set-words are added to thread context.

Files:

• branches/thune/thread_safe/tokenize.c (modified) (5 diffs)

branches/thune/thread_safe/tokenize.c

@@ -29 +29 @@
 extern void ur_makeVec3( UCell* res, const char* spA, const char* spB );
 extern const char* ur_readBinary( UBinary*, const char* it, const char* end );
+
+extern void ur_bindDefault( UThread*, UIndex blkN );
 
 
@@ -299 +301 @@
  \return  Returns block index or zero if an error is thrown.
 */
-UIndex ur_tokenize( UThread* ut, const char* it, const char* end,
-                    void* tci )
+UIndex ur_tokenize( UThread* ut, const char* it, const char* end )
 {
     UArray stack;
@@ -314 +315 @@
     int macroNest = 0;
 #endif
-
-    (void) tci;
 
 
@@ -441 +440 @@
                         UCell* otos;
                         UBlock* blk;
+                        UIndex blkN;
 
                         otos = UR_TOS;
-                        ur_infuseOpcodes( ut, STACK[ stack.used ] );
-                        tn = ur_eval( ut, STACK[ stack.used ], 0 );
+                        blkN = STACK[ stack.used ];
+
+                        ur_bindDefault( ut, blkN );
+                        ur_infuseOpcodes( ut, blkN );
+
+                        tn = ur_eval( ut, blkN, 0 );
                         if( tn == UR_EVAL_ERROR )
                         {
@@ -1035 +1039 @@
     hold = STACK[0];
     ur_arrayFree( &stack );
+
+    ur_bindDefault( ut, hold );
+
     return hold;