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

branches/thune/thread_safe/eval.c

@@ -24 +24 @@
 
 
-extern UContext ur_global;
+extern UContext ur_thrGlobal;
 extern UContext ur_envGlobal;
 
@@ -66 +66 @@
     int wrdN;
 
-    global = (ut->env->blocks.arr.used) ? &ur_envGlobal : &ur_global;
+    global = (ut->env->blocks.arr.used) ? &ur_envGlobal : &ur_thrGlobal;
 
     wrdN = ur_lookup( global, UR_ATOM_KERNEL_OPS );
@@ -358 +358 @@
 
 
-#define _throwUnset(th,cell)    _throwUnsetF(th,cell,"unset")
-#define _throwUnbound(th,cell)  _throwUnsetF(th,cell,"unbound")
+#define _throwUnset(th,cell)    _throwUnsetF(th,cell,"is unset")
+#define _throwUnbound(th,cell)  _throwUnsetF(th,cell,"is unbound")
 
 static void _throwUnsetF( UThread* ut, const UCell* wcell, const char* umsg )
@@ -368 +368 @@
     ur_atomStr( ur_atom(wcell), str );
     ur_termCStr( str );
-    ur_throwErr( UR_ERR_SCRIPT, "word '%s is %s", str->ptr.c, umsg );
+    ur_throwErr( UR_ERR_SCRIPT, "word '%s %s", str->ptr.c, umsg );
 }
 
@@ -413 +413 @@
                 ++it;
             }
-            _throwUnsetF( ut, pc, "out-of-scope local" );
+            _throwUnsetF( ut, pc, "is out-of-scope local" );
             return 0;
         }
@@ -419 +419 @@
             if( pc->word.wordBlk != ut->localWordBlk )
             {
-                _throwUnsetF( ut, pc, "out-of-scope local" );
+                _throwUnsetF( ut, pc, "is out-of-scope local" );
                 return 0;
             }
@@ -431 +431 @@
     }
 
-    _throwUnsetF( ut, pc, "Invalid bind mask" );
+    _throwUnsetF( ut, pc, "has invalid bind mask" );
     return 0;
 }
@@ -452 +452 @@
     {
         case UR_BIND_THREAD:
-            // ur_blockPtr( pc->word.valBlk )
-            blk = (((UBlock*) ut->blocks.arr.ptr.v) + pc->word.valBlk);
+            blk = tBlockPtr( pc->word.valBlk );
             dest = blk->ptr.cells + wrdN;
             break;
 
         case UR_BIND_GLOBAL:
-            // ur_blockPtr( pc->word.valBlk )
-            blk = (((UBlock*) ut->env->blocks.arr.ptr.v) - pc->word.valBlk);
-            dest = blk->ptr.cells + wrdN;
-            break;
+            _throwUnsetF( ut, pc, "is in shared global storage" );
+            return 0;
 
         case UR_BIND_LOCAL:
@@ -476 +473 @@
                 ++it;
             }
-            _throwUnsetF( ut, pc, "out-of-scope local" );
+            _throwUnsetF( ut, pc, "is out-of-scope local" );
             return 0;
         }
@@ -482 +479 @@
 #ifdef UR_CONFIG_DATAFLOW
         case UR_BIND_PLUG:
-            // Assuming there are no global components.
+            // Using tBlockPtr - assuming there are no global components.
             ur_setPlug( ut, tBlockPtr(pc->word.valBlk), wrdN, val );
             return 1;
@@ -488 +485 @@
 
         default:
-            _throwUnsetF( ut, pc, "Invalid bind mask" );
+            _throwUnsetF( ut, pc, "has invalid bind mask" );
             return 0;
     }
@@ -520 +517 @@
     if( end != cmd )
     {
-        blkN = ur_tokenize( ut, cmd, end, 0 );
+        blkN = ur_tokenize( ut, cmd, end );
         if( blkN )
         {
@@ -984 +981 @@
             if( tos->word.valBlk == BLK_GLOBAL_VAL )
             {
-                tos->word.index = ur_internWord( &ur_global, ur_atom(tos) );
+                tos->word.index = ur_internWord( &ur_thrGlobal, ur_atom(tos) );
             }
             else