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

branches/thune/thread_safe/urlan.c

@@ -40 +40 @@
    The global context is fixed so it can be shared by all UrlanEnv instances.
 */
-UCellContext ur_global =
+UCellContext ur_thrGlobal =
 {
     UT_CONTEXT, 0, 0,
@@ -209 +209 @@
     dtBlk = ur_blockPtr( blkN );
 
-    i = ur_internWord( (UCell*) &ur_global, ur_intern( "datatypes", 9 ) );
+    i = ur_internWord( (UCell*) &ur_thrGlobal, ur_intern( "datatypes", 9 ) );
     cell = vblk->ptr.cells + i;
     ur_initBlock( cell, blkN, 0 );
@@ -222 +222 @@
 
     /* Add 'none */
-    i = ur_internWord( (UCell*) &ur_global, ur_intern( "none", 4 ) );
+    i = ur_internWord( (UCell*) &ur_thrGlobal, ur_intern( "none", 4 ) );
     cell = vblk->ptr.cells + i;
     ur_initType( cell, UT_NONE );
@@ -502 +502 @@
     //ur_makeBlock( 0 );        // 4 - BLK_DSTACK
 
-    ur_pushContext( ut, (UCell*) &ur_global );
+    ur_pushContext( ut, (UCell*) &ur_thrGlobal );
 
     {
@@ -530 +530 @@
     ur_evalCStr( _bootScript, sizeof(_bootScript) );
 #else
-    n = ur_tokenize( ut, _bootScript,
-                     _bootScript + sizeof(_bootScript), 0 );
+    n = ur_tokenize( ut, _bootScript, _bootScript + sizeof(_bootScript) );
     if( ! n )
         return UR_EVAL_ERROR;
-    ur_bind( n, (UCell*) &ur_global );
+    ur_bind( n, (UCell*) &ur_thrGlobal );
     n = ur_eval( ut, n, 0 );
     if( n != UR_EVAL_OK )
@@ -674 +673 @@
     //ur_makeBlock( 1024 );     // 4 - BLK_DSTACK
 
-    ur_pushContext( ut, (UCell*) &ur_global );
+    ur_pushContext( ut, (UCell*) &ur_thrGlobal );
 
     ur_makeBinary( 0 );       // 0 - BIN_THREAD_TMP
@@ -855 +854 @@
     UCell* val;
 
-    val = (UCell*) &ur_global;
+    val = (UCell*) &ur_thrGlobal;
     wrd = ur_lookup( val, firstAtom );
     if( wrd < 0 )