Changeset 427

Timestamp:

07/07/07 04:41:31 (15 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.

Location:

branches/thune/thread_safe

Files:

• context.c (modified) (1 diff)
• eval.c (modified) (13 diffs)
• gl/gx_atoms.h (modified) (1 diff)
• make.c (modified) (6 diffs)
• thune.c (modified) (1 diff)
• tokenize.c (modified) (5 diffs)
• urlan.c (modified) (7 diffs)
• urlan.h (modified) (1 diff)

branches/thune/thread_safe/context.c

@@ -526 +526 @@
 
 
+extern UContext ur_envGlobal;
+
+/*
+   wc->flags, wc->word wordBlk, valBlk, & index are set.
+   ctop must be greater than cbot.
+*/
+void ur_internDefault( UThread* ut, UCell* wc, UAtom atom,
+                       UCell* cbot, UCell* ctop )
+{
+    UCell* cit;
+    int wrdN;
+
+    // Look for atom in module context stack.
+    cit = ctop;
+    do
+    {
+        --cit;
+        wrdN = ur_lookup( cit, atom );
+        if( wrdN > -1 )
+            goto assign;
+    }
+    while( cit != cbot );
+
+
+    // 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).
+    cit = ctop - 1;
+    wrdN = ur_internWord( cit, atom );
+
+assign:
+
+    ur_setBindType( wc, UR_BIND_THREAD );
+    wc->word.wordBlk = cit->ctx.wordBlk;
+    wc->word.valBlk  = cit->ctx.valBlk;
+    wc->word.index   = wrdN;
+}
+
+
+static
+UBlock* _bindDefault( UThread* ut, UIndex blkN, UCell* cbot, UCell* ctop )
+{
+    UBlock* blk;
+    UCell* it;
+    UCell* end;
+
+    if( ur_isGlobal(blkN) )
+        return 0;       // Cannot bind global blocks.
+
+    blk = ur_blockPtr( blkN );
+    it  = blk->ptr.cells;
+    end = it + blk->used;
+
+    while( it != end )
+    {
+        switch( ur_type(it) )
+        {
+            case UT_WORD:
+            case UT_SETWORD:
+            case UT_GETWORD:
+            case UT_LITWORD:
+            case UT_SELECT:
+            case UT_SETSELECT:
+            case UT_LITSELECT:
+            case UT_OPCODE:
+                ur_internDefault( ut, it, ur_atom(it), cbot, ctop );
+                break;
+
+            case UT_PATH:
+            case UT_SETPATH:
+            {
+                UCell* path1 = ur_blockPtr( it->series.n )->ptr.cells;
+                if( ur_isAWord(path1) )
+                {
+                    ur_internDefault( ut, path1, ur_atom(path1), cbot, ctop );
+                }
+            }
+                break;
+
+            case UT_BLOCK:
+            case UT_PAREN:
+                _bindDefault( ut, it->series.n, cbot, ctop );
+                break;
+
+            case UT_FUNCTION:
+                _bindDefault( ut, it->func.bodyN, cbot, ctop );
+                break;
+        }
+
+        ++it;
+    }
+
+    return blk;
+}
+
+
+void ur_bindDefault( UThread* ut, UIndex blkN )
+{
+    UBlock* blk;
+    UBlock* cblk;
+    UCell* ctx;
+    UCell* it;
+    UCell* end;
+
+    cblk = tBlockPtr( BLK_CTX_STACK );
+    ctx = cblk->ptr.cells + (cblk->used - 1);
+
+    // Intern all set-words found in block to the top context.
+    blk = ur_blockPtr( blkN );
+    it  = blk->ptr.cells;
+    end = it + blk->used;
+    while( it != end )
+    {
+        if( ur_is(it, UT_SETWORD) )
+            ur_internWord( ctx, it->word.atom );
+        ++it;
+    }
+
+    _bindDefault( ut, blkN, cblk->ptr.cells,
+                            cblk->ptr.cells + cblk->used );
+}
+
+
+#if 0
+/**
+   Intern all set-words found in block to the top context.
+*/
+void ur_internSetWords( UThread* ut, UIndex blkN )
+{
+    UBlock* blk;
+    UBlock* cblk;
+    UCell* ctx;
+    UCell* it;
+    UCell* end;
+
+    cblk = tBlockPtr( BLK_CTX_STACK );
+    ctx = cblk->ptr.cells + (cblk->used - 1);
+
+    blk = ur_blockPtr( blkN );
+    it  = blk->ptr.cells;
+    end = it + blk->used;
+    while( it != end )
+    {
+        if( ur_is(it, UT_SETWORD) )
+            ur_internWord( ctx, it->word.atom );
+        ++it;
+    }
+}
+#endif
+
+
 /*EOF*/

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    

branches/thune/thread_safe/gl/gx_atoms.h

@@ -1 +1 @@
 // This file is automatically generated - do not edit.
 
-#define UR_ATOM_DRAW_LIST_OPCODES               316
-#define UR_ATOM_WIDTH           317
-#define UR_ATOM_HEIGHT          318
-#define UR_ATOM_AREA            319
-#define UR_ATOM_RECT            320
-#define UR_ATOM_RASTER          321
-#define UR_ATOM_TEXTURE         322
-#define UR_ATOM_ELEM            323
-#define UR_ATOM_CLOSE           176
-#define UR_ATOM_FOCUS           324
-#define UR_ATOM_RESIZE          325
-#define UR_ATOM_KEY_DOWN                326
-#define UR_ATOM_KEY_UP          327
-#define UR_ATOM_MOUSE_MOVE              328
-#define UR_ATOM_MOUSE_UP                329
-#define UR_ATOM_MOUSE_DOWN              330
-#define UR_ATOM_MOUSE_WHEEL             331
-#define UR_ATOM_AMBIENT         332
-#define UR_ATOM_DIFFUSE         333
-#define UR_ATOM_SPECULAR                334
-#define UR_ATOM_POS             335
-#define UR_ATOM_SHADER          336
-#define UR_ATOM_VERTEX          337
-#define UR_ATOM_FRAGMENT                338
-#define UR_ATOM_DEFAULT         339
-#define UR_ATOM_WAIT            340
-#define UR_ATOM_RGB             341
-#define UR_ATOM_RGBA            342
-#define UR_ATOM_DEPTH           343
-#define UR_ATOM_CLAMP           344
-#define UR_ATOM_REPEAT          345
-#define UR_ATOM_NEAREST         346
-#define UR_ATOM_LINEAR          347
-#define UR_ATOM_MIN             348
-#define UR_ATOM_MAG             349
-#define UR_ATOM_MIPMAP          350
-#define UR_ATOM_ON              255
-#define UR_ATOM_OFF             257
-#define UR_ATOM_ADD             195
-#define UR_ATOM_BURN            351
-#define UR_ATOM_COLOR           352
-#define UR_ATOM_TRANS           353
-#define UR_ATOM_SPRITE          354
+#define UR_ATOM_DRAW_LIST_OPCODES               317
+#define UR_ATOM_WIDTH           318
+#define UR_ATOM_HEIGHT          319
+#define UR_ATOM_AREA            320
+#define UR_ATOM_RECT            321
+#define UR_ATOM_RASTER          322
+#define UR_ATOM_TEXTURE         323
+#define UR_ATOM_ELEM            324
+#define UR_ATOM_CLOSE           177
+#define UR_ATOM_FOCUS           325
+#define UR_ATOM_RESIZE          326
+#define UR_ATOM_KEY_DOWN                327
+#define UR_ATOM_KEY_UP          328
+#define UR_ATOM_MOUSE_MOVE              329
+#define UR_ATOM_MOUSE_UP                330
+#define UR_ATOM_MOUSE_DOWN              331
+#define UR_ATOM_MOUSE_WHEEL             332
+#define UR_ATOM_AMBIENT         333
+#define UR_ATOM_DIFFUSE         334
+#define UR_ATOM_SPECULAR                335
+#define UR_ATOM_POS             336
+#define UR_ATOM_SHADER          337
+#define UR_ATOM_VERTEX          338
+#define UR_ATOM_FRAGMENT                339
+#define UR_ATOM_DEFAULT         340
+#define UR_ATOM_WAIT            341
+#define UR_ATOM_RGB             342
+#define UR_ATOM_RGBA            343
+#define UR_ATOM_DEPTH           344
+#define UR_ATOM_CLAMP           345
+#define UR_ATOM_REPEAT          346
+#define UR_ATOM_NEAREST         347
+#define UR_ATOM_LINEAR          348
+#define UR_ATOM_MIN             349
+#define UR_ATOM_MAG             350
+#define UR_ATOM_MIPMAP          351
+#define UR_ATOM_ON              256
+#define UR_ATOM_OFF             258
+#define UR_ATOM_ADD             196
+#define UR_ATOM_BURN            352
+#define UR_ATOM_COLOR           353
+#define UR_ATOM_TRANS           354
+#define UR_ATOM_SPRITE          355

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.

branches/thune/thread_safe/thune.c

@@ -475 +475 @@
                             tblkN = ur_tokenize( ut,
                                                  str->ptr.c + val->series.it,
-                                                 str->ptr.c + str->used, 0 );
+                                                 str->ptr.c + str->used );
                             if( ! tblkN )
                                 goto throw_cc;

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;
 

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 )

branches/thune/thread_safe/urlan.h

@@ -539 +539 @@
 void    ur_gcMarkBlock( UCollector*, UIndex );
 void    ur_gcMarkResource( UCollector*, UIndex );
-UIndex  ur_tokenize( UThread*, const char* it, const char* end, void* );
+UIndex  ur_tokenize( UThread*, const char* it, const char* end );
 void    ur_throwErr( UThread*, int exceptionType, const char* fmt, ... );
 int     ur_userAllows( UThread*, const char* fmt, ... );