Changeset 140

Timestamp:

05/06/06 02:05:44 (3 years ago)

Author:

krobillard

Message:

Orca - Function arguments are now copied to the function context unless
recursion is in progress.

Location:

trunk/orca

Files:

• context.c (modified) (2 diffs)
• ovalue.c (modified) (8 diffs)
• ovalue.h (modified) (1 diff)
• tests/working/func_closure2.r (added)

trunk/orca/context.c

@@ -556 +556 @@
 
 
+#if 0
 /*
    Returns true if block contains does or func.
@@ -623 +624 @@
     }
 }
+#endif
 
 

trunk/orca/ovalue.c

@@ -2217 +2217 @@
     cr->count  = ac
 
-extern void orRebind( OIndex blk, OIndex from, OIndex to );
+#define RECURSE_COUNT   index
+
+//extern void orRebind( OIndex blk, OIndex from, OIndex to );
 
 /**
@@ -2600 +2602 @@
     total = nv->argc + nv->refc;
 
+#if 0
     if( nv->flags & OR_FLAG_CLOSURE )
     {
@@ -2636 +2639 @@
     data->used -= total;
     *DATA_TOP = *nv;
+#else
+    vblk = orBlockPtr( vblkN );
+    save = vblk->values + total;
+    if( save->RECURSE_COUNT )
+    {
+        // Point context values to stack.
+        save = vblk->values;
+        vblk->values = DATA_TOP - total;
+
+        orSetTF( DATA_TOP, OT_UNSET );
+        DATA_TOP->RECURSE_COUNT = 1;
+        ++data->used;
+
+        orEvalBlock( orBLOCKS + nv->func.bodyBlk, 0 );
+
+        // Restore context (note we re-acquire the context after eval).
+        vblk = orBlockPtr( vblkN );
+        vblk->values = save;
+
+        nv = DATA_TOP;
+        data->used -= total + 1;
+        *DATA_TOP = *nv;
+    }
+    else
+    {
+        // Copy arguments from stack to function context.
+        data->used -= total;
+        memCpy( vblk->values, DATA_TOP, sizeof(OValue) * total );
+
+        ++save->RECURSE_COUNT;
+        orEvalBlock( orBLOCKS + nv->func.bodyBlk, 0 );
+        --save->RECURSE_COUNT;
+    }
+#endif
     }
 
@@ -4257 +4294 @@
 
 
-//extern void orRebindClosure( OIndex blkN );
-
 OR_NATIVE( orDoesNative )
 {
@@ -4283 +4318 @@
 
 
-extern int orClosureRequired( OIndex );
+//extern int orClosureRequired( OIndex );
 
 //void orMakeFunction( OBlock* spec, OBlock* body )
@@ -4317 +4352 @@
     {
     OBlock* vblk;
+    int total = argc + refc;
 
     // ctx->flags = OR_CTX_ONSTACK;
     // orMakeContext( &ctx, argc + refc );
 
-    ctx.wblkN = orBlockN( orMakeBlock( argc + refc ) );
+    ctx.wblkN = orBlockN( orMakeBlock( total ) );
     orRefPush( OT_BLOCK, ctx.wblkN );
 
-    vblk = orMakeBlock( 0 );
-    vblk->used = argc + refc;
+    vblk = orMakeBlock( total + 1 );
+    vblk->used = total;
     ctx.vblkN = orBlockN( vblk );
     orRefPush( OT_BLOCK, ctx.vblkN );
+
+    next = vblk->values + total;
+    orSetTF( next, OT_UNSET );
+    next->RECURSE_COUNT = 0;
 
     wblk = orBlockPtr( ctx.wblkN );
@@ -4424 +4464 @@
     res->func.context = ctx.vblkN;
 
+#if 0
     if( orClosureRequired( bodyN ) )
     {
@@ -4429 +4470 @@
         //printf( "KR closure bit\n" );
     }
+#endif
     }
 }

trunk/orca/ovalue.h

@@ -124 +124 @@
 #define OR_FLAG_HEX         0x02    // integer! only
 #define OR_FLAG_RECURSION   0x02    // object! only
-#define OR_FLAG_CLOSURE     0x04    // object! only
+//#define OR_FLAG_CLOSURE     0x04    // object! only
 #define OR_FLAG_CATCH       0x08
 #define OR_FLAG_THROW       0x10