Changeset 427 for branches/thune/thread_safe/make.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/make.c (modified) (6 diffs)

branches/thune/thread_safe/make.c

@@ -33 +33 @@
 extern double ur_stringToDec( const char*, const char*, const char** );
 
-extern UContext ur_global;
-extern UContext ur_envGlobal;
+extern UContext ur_thrGlobal;
 
 
 //#define GC_STRESS_TEST  1
 
+
+extern void ur_internDefault( UThread* ut, UCell* wc, UAtom atom,
+                              UCell* cbot, UCell* ctop );
 
 /*
@@ -45 +47 @@
 static void ur_internGlobal( UThread* ut, UCell* wc, UAtom atom )
 {
-    UBlock* mblk;
-    UCell* mtop;
-    UCell* mbot;
-    int wrdN;
-
-    // Look for atom in module context stack.
-    mblk = ur_blockPtr( BLK_CTX_STACK );
-    mbot = mblk->ptr.cells;
-    mtop = mbot + mblk->used;
-    do
-    {
-        --mtop;
-        wrdN = ur_lookup( mtop, atom );
-        if( wrdN > -1 )
-            goto assign;
-    }
-    while( mtop != mbot );
-
-
-    // Now try the shared global context.
-    if( ut->env->blocks.arr.used )
-    {
-        wrdN = ur_lookup( &ur_envGlobal, atom );
-        if( wrdN > -1 )
-        {
-            ur_setBindType( wc, UR_BIND_GLOBAL );
-            wc->word.wordBlk = ur_envGlobal.ctx.wordBlk;
-            wc->word.valBlk  = ur_envGlobal.ctx.valBlk;
-            wc->word.index   = wrdN;
-            return;
-        }
-    }
-
-    // Word not found, so intern into current module (top of context stack).
-    mtop = mbot + (mblk->used - 1);
-    wrdN = ur_internWord( mtop, atom );
-
-assign:
-
-    // UR_BIND_THREAD should already be set.
-    wc->word.wordBlk = mtop->ctx.wordBlk;
-    wc->word.valBlk  = mtop->ctx.valBlk;
-    wc->word.index   = wrdN;
+    UBlock* cblk = tBlockPtr( BLK_CTX_STACK );
+    ur_internDefault( ut, wc, atom, cblk->ptr.cells,
+                                    cblk->ptr.cells + cblk->used );
 }
 
@@ -1282 +1244 @@
             ++cp;
 
-        wrdN = ur_internWord( &ur_global,
+        wrdN = ur_internWord( &ur_thrGlobal,
                               ur_intern(def->name, cp - def->name) );
 
@@ -1288 +1250 @@
         ur_initType( cell, UT_CALL );
         cell->call.addr = (call_t) def->addr;
-
-        /*
-        ur_appendWord( wblk, UT_WORD, "make", 4 );
-        cell = ur_appendCell( vblk, UT_CALL );
-        cell->call.addr = (call_t) uc_make;
-        */
 
         ++def;
@@ -1320 +1276 @@
     UCell* cell = ur_appendCell( blk, type );
 
+#if 0
     // Add word to global context.
 
     ur_atom(cell) = ur_intern( name, len );
     ur_sel(cell)  = UR_CTX_UNORDERED;
+
     ur_internGlobal( ut, cell, ur_atom(cell) );
+#else
+    ur_setUnbound( cell, ur_intern( name, len ) );
+#endif
 
     return cell;
@@ -1616 +1577 @@
                 if( spA )
                 {
-                    blkN = ur_tokenize( ut, spA, spB, 0 );
+                    blkN = ur_tokenize( ut, spA, spB );
                     if( ! blkN )
                         return;     // ur_tokenize() has thrown.