Changeset 81 for trunk/orca

Timestamp:

03/08/06 17:14:05 (3 years ago)

Author:

volker

Message:

nested remove-each works.

Files:

• trunk/orca/context.c (modified) (7 diffs)

trunk/orca/context.c

@@ -1223 +1223 @@
     OIndex serN = a2->index;
     OIndex si   = a2->series.it;
-    //:
+
     OIndex sdest = 0;//in second buffer
     OIndex sorig = si; 
@@ -1314 +1314 @@
                 memCpy( wval, blk->values + si, vlen * sizeof(OValue) );
 
-                //:
                 orEvalBlock( orBlockPtr( body ), bi );
                 if( orErrorThrown )
                     goto error;
                 blk = orBlockPtr( serN );          // Reacquire.
-                //:
+                send = blk->used;
+
                 if( !orIfTrue(orRESULT)){
                   memCpy( keept + sdest, blk->values + si, vlen * sizeof(OValue) );
                   sdest += vlen;
                 }
-                si += vlen; //:moved
+                si += vlen; 
             }
 
@@ -1346 +1346 @@
                 if( orErrorThrown )
                     goto error;
-                //:
+
                 blk = orBlockPtr( serN );          // Reacquire.
+                send = blk->used;
                 if( !orIfTrue(orRESULT)){
                   memCpy( keept + sdest, blk->values + si, (blk->used - si) * sizeof(OValue) );
@@ -1353 +1354 @@
                 }               
             }
-
-            //: return block        
+        
             orResultBLOCK( serN );
             blk->used = sorig + sdest;
@@ -1392 +1392 @@
                     goto error;
                 str = orStringPtr( serN );     // Reacquire.
-                //:
+                send = str->used;
+
                 if( !orIfTrue(orRESULT)){
                   strNCpy( keept + sdest, str->charArray + ssrc, vlen );
@@ -1418 +1419 @@
 
                 orEvalBlock( orBlockPtr( body ), bi );
+
                 if( orErrorThrown )
                     goto error;
-                //:
+
                 str = orStringPtr( serN );          // Reacquire.
+                send = str->used;
                 if( !orIfTrue(orRESULT)){
                   strNCpy( keept + sdest, str->charArray + ssrc, (str->used - ssrc) );
@@ -1427 +1430 @@
                 }               
             }
-            //: return string
+
             orResultSTRING( serN );
             str->used = sorig + sdest;