Changeset 426 for branches/thune/thread_safe/eval.c

Timestamp:

07/05/07 04:03:51 (17 months ago)

Author:

krobillard

Message:

Added component! & lit-select! datatypes.
ur_makeBlockT() now has a ptr return argument.

Files:

• branches/thune/thread_safe/eval.c (modified) (9 diffs)

branches/thune/thread_safe/eval.c

@@ -120 +120 @@
             case UT_CONTEXT:
             case UT_PORT:
+#ifdef UR_CONFIG_DATAFLOW
+            case UT_COMPONENT:
+#endif
             {
                 int wrdN = ur_lookup( val, ur_sel(sel) );
@@ -184 +187 @@
 
 
+#ifdef UR_CONFIG_DATAFLOW
+void ur_setPlug( UThread*, UBlock* cblk, UIndex wrdN, const UCell* nval );
+#endif
+
+
 /**
   Returns non-zero if successful.
@@ -242 +250 @@
             break;
 
+#ifdef UR_CONFIG_DATAFLOW
+        case UT_COMPONENT:
+            if( ur_selIsAtom(sel) )
+            {
+                int wrdN;
+                wrdN = ur_lookup( val, ur_sel(sel) );
+                ur_setPlug( ut, tBlockPtr(val->ctx.valBlk), wrdN, nval );
+                return 1;
+            }
+            break;
+#endif
+
         default:
             if( ! ur_selIsAtom(sel) )
@@ -295 +315 @@
     {
         ur_type(tos) = UT_WORD;
+    }
+    else if( ur_is(tos, UT_LITSELECT) )
+    {
+        ur_type(tos) = UT_SELECT;
     }
     // else leave tos unchanged...
@@ -366 +390 @@
     {
         case UR_BIND_THREAD:
+#ifdef UR_CONFIG_DATAFLOW
+        case UR_BIND_PLUG:      // Each component has its own body for now.
+#endif
             // ur_blockPtr( pc->word.valBlk )
             blk = (((UBlock*) ut->blocks.arr.ptr.v) + pc->word.valBlk);
@@ -404 +431 @@
     }
 
+    _throwUnsetF( ut, pc, "Invalid bind mask" );
     return 0;
+}
+
+
+static int ur_setWord( UThread* ut, const UCell* pc, const UCell* val )
+{
+    UBlock* blk;
+    UCell* dest;
+    int wrdN;
+
+    wrdN = pc->word.index;
+    if( wrdN < 0 )
+    {
+        _throwUnbound( ut, pc);     // UR_UNBOUND
+        return 0;
+    }
+
+    switch( pc->word.flags & UR_FLAG_BIND_MASK )
+    {
+        case UR_BIND_THREAD:
+            // ur_blockPtr( pc->word.valBlk )
+            blk = (((UBlock*) ut->blocks.arr.ptr.v) + 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;
+
+        case UR_BIND_LOCAL:
+        {
+            LocalFrame* it  = UR_LF_BEG;
+            LocalFrame* end = UR_LF_END;
+            while( it != end )
+            {
+                if( it->n == pc->word.wordBlk )
+                {
+                    dest = it->cell + wrdN;
+                    goto set_word;
+                }
+                ++it;
+            }
+            _throwUnsetF( ut, pc, "out-of-scope local" );
+            return 0;
+        }
+
+#ifdef UR_CONFIG_DATAFLOW
+        case UR_BIND_PLUG:
+            // Assuming there are no global components.
+            ur_setPlug( ut, tBlockPtr(pc->word.valBlk), wrdN, val );
+            return 1;
+#endif
+
+        default:
+            _throwUnsetF( ut, pc, "Invalid bind mask" );
+            return 0;
+    }
+
+set_word:
+
+    ur_copyCell(dest, *val);
+    return 1;
 }
 
@@ -1378 +1469 @@
     argc = varc = 0;
 
-    sigN = scell->series.n;
     blk = ur_block( scell );
     it  = blk->ptr.cells;
@@ -1633 +1723 @@
 #ifdef UR_CONFIG_NET
 extern void uc_net_addr( UThread*, UCell* );
+#endif
+#ifdef UR_CONFIG_DATAFLOW
+#include "component.c"
 #endif
 
@@ -1667 +1760 @@
 #endif
 #ifdef LANG_THUNE
+#ifdef UR_CONFIG_DATAFLOW
+    { uc_component,    "component" },
+    { uc_connect,      "connect" },
+#endif
 #ifdef UR_CONFIG_THREADS
     { uc_thread,       "thread" },