Changeset 429

Timestamp:

07/07/07 23:25:20 (15 months ago)

Author:

krobillard

Message:

Added 'disconnect.

Location:

branches/thune/thread_safe

Files:

• component.c (modified) (1 diff)
• eval.c (modified) (1 diff)
• tests/working/component.good (modified) (1 diff)
• tests/working/component.t (modified) (1 diff)

branches/thune/thread_safe/component.c

@@ -270 +270 @@
 
 
-#if 0
 /*
-   ( -- )
+   (from to -- )
+
+   TODO:
+     (from 'all -- )
+     ('all to -- )   ; This will be costly - must check all components.
+                     ; May want to save blkN of all connected input components.
 */
 UR_CALL( uc_disconnect )
 {
-}
-#endif
+    UCell* arg1;
+    UCell* cc1;
+    UCell* cc2;
+    UCell* conn;
+    UCell* it;
+    UCell* end;
+    UBlock* b1;
+    UAtom atom;
+    int wrd;
+
+    // Disconnect this component input...
+    if( ur_is(tos, UT_SELECT) && ur_selIsAtom(tos) )
+    {
+        cc2 = ur_wordCell( ut, tos );
+        if( ! cc2 )
+            return;
+        if( ! ur_is(cc2, UT_COMPONENT) )
+            goto dt_err;
+        atom = ur_sel(tos);
+    }
+    else if( ur_is(tos, UT_COMPONENT) )
+    {
+        // Use first input.
+        cc2  = tos;
+        b1   = ur_blockPtr( cc2->ctx.wordBlk );
+        atom = b1->ptr.cells[ COMPONENT_CELLS ].word.atom;
+    }
+    else
+        goto dt_err;
+
+
+    // ...from this component output.
+    arg1 = ur_s_prev(tos);
+    if( ur_is(arg1, UT_SELECT) && ur_selIsAtom(arg1) )
+    {
+        cc1 = ur_wordCell( ut, arg1 );
+        if( ! cc1 )
+            return;
+        if( ! ur_is(cc1, UT_COMPONENT) )
+            goto dt_err;
+        wrd = ur_lookup( cc1, ur_sel(arg1) );
+        if( wrd < 0 )
+            goto dt_err;
+        b1 = ur_blockPtr( cc1->ctx.valBlk );
+        cc1 = b1->ptr.cells + COMPONENT_COUNTS;
+        if( wrd < (COMPONENT_CELLS + ur_ccIn(cc1)) )
+            goto out_err;
+        if( wrd >= (COMPONENT_CELLS + ur_ccIn(cc1) + ur_ccOut(cc1)) )
+            goto out_err;
+        conn = b1->ptr.cells + wrd;
+    }
+    else if( ur_is(arg1, UT_COMPONENT) )
+    {
+        // Use first output.
+        b1 = ur_blockPtr( arg1->ctx.valBlk );
+        cc1 = b1->ptr.cells + COMPONENT_COUNTS;
+        if( ur_ccOut(cc1) < 1 )
+            goto out_err;
+        conn = b1->ptr.cells + COMPONENT_CELLS + ur_ccIn(cc1);
+    }
+    else
+        goto dt_err;
+
+        
+    if( ur_is(conn, UT_BLOCK) )
+    {
+        // Multiple connections may exist.
+        b1 = tBlock( conn );
+        it  = b1->ptr.cells;
+        end = it + b1->used;
+        while( it != end )
+        {
+            assert( ur_is(it, UT_WORD) );
+            if( (ur_atom(it) == atom) &&
+                (it->word.valBlk == cc2->ctx.valBlk) )
+            {
+                ur_arrayErase( b1, sizeof(UCell), it - b1->ptr.cells, 1 );
+                break;
+            }
+            ++it;
+        }
+    }
+    else if( ur_is(conn, UT_WORD) )
+    {
+        // A single connection exists.
+        if( (ur_atom(conn) == atom) &&
+            (conn->word.valBlk == cc2->ctx.valBlk) )
+        {
+            ur_setNone( conn );
+        }
+    }
+    // Else no existing connections.
+
+    UR_S_DROPN( 2 );
+    return;
+
+dt_err:
+
+    ur_throwErr( UR_ERR_DATATYPE,
+                 "disconnect expected select! select! bound to components" );
+    return;
+
+out_err:
+
+    ur_throwErr( UR_ERR_SCRIPT, "Must disconnect from a component output" );
+}
 
 

branches/thune/thread_safe/eval.c

@@ -1760 +1760 @@
     { uc_component,    "component" },
     { uc_connect,      "connect" },
+    { uc_disconnect,   "disconnect" },
 #endif
 #ifdef UR_CONFIG_THREADS

branches/thune/thread_safe/tests/working/component.good

@@ -6 +6 @@
 --- copy ---
 22
+--- disconnect ---
+--- disconnect select ---

branches/thune/thread_safe/tests/working/component.t

@@ -30 +30 @@
 11 :c3/in
 
+
+"--- disconnect ---" print
+
+c3 probeA disconnect
+12 :c3/in
+
+
+"--- disconnect select ---" print
+
+'c2/out 'probeA/val disconnect
+7 :c2/b
+