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

branches/thune/thread_safe/print.c

@@ -291 +291 @@
     else if( braceType == UT_PAREN )
         append1( '(', out );
+#ifdef UR_CONFIG_MARCOS
+    else if( braceType == UT_MACRO )
+        append1( '<', out );
+#endif
 
     if( it != end )
@@ -322 +326 @@
     else if( braceType == UT_PAREN )
         append1( ')', out );
+#ifdef UR_CONFIG_MARCOS
+    else if( braceType == UT_MACRO )
+        append1( '>', out );
+#endif
 }
 
@@ -699 +707 @@
         case UT_SELECT:
         case UT_SETSELECT:
+        case UT_LITSELECT:
         case UT_INT:
         case UT_DECIMAL:
@@ -817 +826 @@
 
 
+/*
+   Print words only - no ticks or colons.
+*/
 static void _selectToStr( UThread* ut, const UCell* val, UString* out )
 {
@@ -928 +940 @@
 #endif
 
+        case UT_LITSELECT:
+            append1('\'', out);
+            // Fall through to UT_SELECT...
+
         case UT_SELECT:
             _selectToStr( ut, val, out );
@@ -1160 +1176 @@
         case UT_CONTEXT:
         case UT_PORT:
+#ifdef UR_CONFIG_DATAFLOW
+        case UT_COMPONENT:
+#endif
             if( val->id.flags & UR_FLAG_CTX_RECURSION )
             {
-                append( out, "?context?", 8 );
+                append( out, "?context?", 9 );
             }
             else
@@ -1284 +1303 @@
 #endif
 
+#if 0
+#ifdef UR_CONFIG_DATAFLOW
+        case UT_COMPONENT:
+        {
+            UBlock* wblk = ur_blockPtr( val->ctx.wordBlk );
+            UBlock* vblk = ur_blockPtr( val->ctx.valBlk );
+            UCell* it  = wblk->ptr.cells + 2;
+            UCell* end = it + wblk->used;
+            UCell* vit = vblk->ptr.cells;
+
+            /*
+            while( it != end )
+            {
+                ++it;
+                ++vit;
+            }
+            */
+
+            ur_blockToStr( ut, out,
+                           vblk->ptr.cells + val->series.it,
+                           vblk->ptr.cells + blk->used,
+                           UT_BLOCK, depth );
+            append( out, " component", 10 );
+        }
+            break;
+#endif
+#endif
+
         default:
             if( ur_type(val) < UT_BI_COUNT )