Changeset 166

Timestamp:

06/04/06 03:43:03 (3 years ago)

Author:

krobillard

Message:

Thune - Can now make (and extend) context from an existing context.

Location:

trunk/thune

Files:

• make.c (modified) (7 diffs)
• parse.c (modified) (2 diffs)
• series.c (modified) (3 diffs)
• tests/working/context.good (added)
• tests/working/context.t (added)

trunk/thune/make.c

@@ -161 +161 @@
 
 
+/**
+   Make context with wordCount reserved (used set to zero).
+*/
 void ur_makeContext( UContext* ctx, int wordCount )
 {
@@ -206 +209 @@
     ctx->ctx.valBlk      = ur_blockN( ptrB );
     ctx->ctx.protoValBlk = ctx->ctx.valBlk;
+}
+
+
+extern void ur_copyCells( UCell* src, UCell* srcEnd, UCell* dest );
+
+
+/*
+   Create context from initializer block.
+   protoCtx may be zero.
+   Caller must hold init and protoCtx (if non-zero) from GC.
+*/
+static void _makeContextProto( UContext* res, const UCell* init,
+                               const UCell* protoCtx )
+{
+    if( init && ur_is(init, UT_BLOCK) )
+    {
+        int size = 0;
+        UBlock* blk;
+        UCell* it;
+        UCell* start;
+        UCell* end;
+
+        blk = ur_blockPtr( init->series.n );
+        UR_ITER_BLOCK( start, end, blk, init )
+
+        it = start;
+
+        if( protoCtx )
+        {
+            // Check if prototype must be extended with new words.
+
+            while( it != end )
+            {
+                if( ur_is(it, UT_SETWORD) )
+                {
+                    if( ur_lookup(protoCtx, ur_atom(it)) < 0 )
+                        ++size;
+                }
+                ++it;
+            }
+
+            if( size )
+            {
+                UIndex pwN;
+                UIndex pvN;
+                UCell* rend;
+                UBlock* rblk;
+
+                // Keep indices in case protoCtx == res
+                pwN = protoCtx->ctx.wordBlk;
+                pvN = protoCtx->ctx.valBlk;
+
+                blk  = ur_blockPtr( pvN );
+                size += blk->used;
+
+                ur_makeContext( res, size );
+
+                // Copy value block.
+
+                blk  = ur_blockPtr( pvN );      // re-acquire
+                rblk = ur_blockPtr( res->ctx.valBlk );
+                rblk->used = size;
+                ur_copyCells( blk->ptr.cells,
+                              blk->ptr.cells + blk->used,
+                              rblk->ptr.cells );
+
+                // Init new words to none.
+
+                it   = rblk->ptr.cells + blk->used;
+                rend = rblk->ptr.cells + size;
+                while( it != rend )
+                {
+                    ur_setType( it, UT_NONE );
+                    ++it;
+                }
+
+                // Copy word block.
+
+                blk  = ur_blockPtr( pwN );
+                rblk = ur_blockPtr( res->ctx.wordBlk );
+                rblk->used = blk->used;
+                ur_copyCells( blk->ptr.cells,
+                              blk->ptr.cells + blk->used,
+                              rblk->ptr.cells );
+            }
+            else
+            {
+                // No new words in init block; clone to share word block.
+
+                if( res != protoCtx )
+                {
+                    ur_copyCell( res, *protoCtx );
+                }
+                ur_clone( res, size, 1 );
+                return;
+            }
+        }
+        else
+        {
+            while( it != end )
+            {
+                if( ur_is(it, UT_SETWORD) )
+                    ++size;
+                ++it;
+            }
+
+            ur_makeContext( res, size );
+        }
+
+        it = start;
+        while( it != end )
+        {
+            if( ur_is(it, UT_SETWORD) )
+                ur_internWord( res, it->word.atom );
+            ++it;
+        }
+    }
 }
 
@@ -543 +663 @@
 
 
-static void _makeContextProto( UContext* ctx, const UCell* proto )
-{
-    if( proto && ur_is(proto, UT_BLOCK) )
-    {
-        int size = 0;
-        UBlock* blk;
-        UCell* it;
-        UCell* start;
-        UCell* end;
-
-        blk = ur_blockPtr( proto->series.n );
-        UR_ITER_BLOCK( start, end, blk, proto )
-
-        it = start;
-        while( it != end )
-        {
-            if( ur_is(it, UT_SETWORD) )
-                ++size;
-            ++it;
-        }
-
-        ur_makeContext( ctx, size );
-
-        it = start;
-        while( it != end )
-        {
-            if( ur_is(it, UT_SETWORD) )
-                ur_internWord( ctx, it->word.atom );
-            ++it;
-        }
-    }
-}
-
-
 typedef  void (*call_t)(void*,void*);
 
@@ -660 +746 @@
   (opcode! code word -- value)
   (binary! int bytes -- value)
+  (context block -- value)
 */
 UR_CALL_PUB( uc_make )
@@ -678 +765 @@
             return;
         }
+    }
+    else if( ur_is(res, UT_CONTEXT) )
+    {
+        if( ! ur_is(tos, UT_BLOCK) )
+            goto error;
+
+        UR_S_PUSH( *res );      // Hold original context.
+        _makeContextProto( res, tos, UR_TOS );
+        ur_bind( tos->series.n, res );
+        UR_S_DROP;
+
+        UR_CALL_OP = OP_DO;
+        return;
     }
     else
@@ -912 +1012 @@
             if( ur_is(tos, UT_BLOCK) )
             {
-                _makeContextProto( res, tos );
+                _makeContextProto( res, tos, 0 );
                 ur_bind( tos->series.n, res );
 
@@ -923 +1023 @@
             {
                 ur_copyCell( res, *tos );
-                ur_clone( res, UR_COPY_ALL, 1 );
+                ur_clone( res, 0, 0 );
             }
             break;

trunk/thune/parse.c

@@ -372 +372 @@
                 }
 
-                /* Re-aquire pointer & check if input modified. */
+                /* Re-acquire pointer & check if input modified. */
                 istr = pe->str = ur_binPtr( pe->input.n );
                 if( istr->used < pe->input.end )
@@ -852 +852 @@
                 }
 
-                /* Re-aquire pointer & check if input modified. */
+                /* Re-acquire pointer & check if input modified. */
                 iblk = pe->blk = ur_blockPtr( pe->input.n );
                 if( iblk->used < pe->input.end )

trunk/thune/series.c

@@ -446 +446 @@
 
 
-static void copyV( UCell* src, UCell* srcEnd, UCell* dest )
+void ur_copyCells( UCell* src, UCell* srcEnd, UCell* dest )
 {
 #if __WORDSIZE == 64
@@ -604 +604 @@
                 }
 
-                copyV( s2->ptr.cells + tos->series.it,
-                       s2->ptr.cells + s2->used,
-                       ipos );
+                ur_copyCells( s2->ptr.cells + tos->series.it,
+                              s2->ptr.cells + s2->used,
+                              ipos );
 
                 s1->used += srcLen;
@@ -914 +914 @@
                 ur_arrayReserve( s1, sizeof(UCell), used + srcLen );
 
-                copyV( s2->ptr.cells + tos->series.it,
-                       s2->ptr.cells + s2->used,
-                       s1->ptr.cells + s1->used );
+                ur_copyCells( s2->ptr.cells + tos->series.it,
+                              s2->ptr.cells + s2->used,
+                              s1->ptr.cells + s1->used );
                 s1->used += srcLen;
             }