Changeset 97 for trunk/orca/ovalue.c

Timestamp:

03/19/06 18:33:15 (3 years ago)

Author:

krobillard

Message:

Compose now takes /only refinement (currently the only implemented behavior).

Files:

• trunk/orca/ovalue.c (modified) (4 diffs)

trunk/orca/ovalue.c

@@ -2943 +2943 @@
 
 
-static void composeBlock( OBlock* blk, OIndex si, int deep )
-{
+static void composeBlock( OBlock* blk, OIndex si, int deep, int only )
+{
+    OValue* res;
     OValue* it  = blk->values + si;
     OValue* end = blk->values + blk->used;
@@ -2950 +2951 @@
     while( it != end )
     {
-        if( it->type == OT_PAREN )
+        if( orIs(it, OT_PAREN) )
         {
             orEvalBlock( orBLOCK(it), it->series.it );
             if( orErrorThrown )
                 break;
-            orCopyV( it, *orRESULT );
-        }
-        else if( (it->type == OT_BLOCK) && deep )
-        {
-            composeBlock( orBLOCK(it), it->series.it, 1 );
+
+            res = orRESULT;
+            if( orIs(res, OT_BLOCK) && ! only )
+            {
+                orError( "compose result of block! not implemented." );
+                return;
+            }
+            else
+            {
+                orCopyV( it, *res );
+            }
+        }
+        else if( orIs(it, OT_BLOCK) && deep )
+        {
+            composeBlock( orBLOCK(it), it->series.it, 1, only );
         }
         ++it;
@@ -2969 +2980 @@
 {
 #define REF_COMP_DEEP     a1+1
-
-    if( a1->type == OT_BLOCK )
+#define REF_COMP_ONLY     a1+2
+
+    if( orIs(a1, OT_BLOCK) )
     {
         OBlock* blk;
@@ -2978 +2990 @@
         deep = orRefineSet(REF_COMP_DEEP) ? 1 : 0;
 
-        blk = orCopyBlock( a1->index, a1->series.it, deep );
+        blk = orCopyBlock( a1->series.n, a1->series.it, deep );
         blkN = orBlockN(blk);
 
-        composeBlock( blk, 0, deep ); 
+        composeBlock( blk, 0, deep,
+                      orRefineSet(REF_COMP_ONLY) ? 1 : 0 ); 
         if( ! orErrorThrown )
         {