Changeset 164 for trunk/thune/context.c

Timestamp:

06/03/06 19:42:11 (3 years ago)

Author:

krobillard

Message:

Thune -

Added ur_setDatatypeBit() and ur_clrDatatypeBit().
Added 'lift-local and _scanControlStack().
'copy now handles context!.
Renamed ur_copy() as ur_clone().
ur_clone() now holds root block when deep copying.
Removed unused context code.

Files:

• trunk/thune/context.c (modified) (1 diff)

trunk/thune/context.c

@@ -217 +217 @@
     return -1;
 }
-
-
-#if 0
-/**
-*/
-void orMakeContext( OContext* ctx, int size )
-{
-    ctx->wblkN = orBlockN( orMakeBlock( size ) );
-    orRefPush( OT_BLOCK, ctx->wblkN );
-    ctx->vblkN = orBlockN( orMakeBlock( size ) );
-    orRefPop( 1 );
-}
-
-
-static void internSetWords( OContext* ctx, UCell* it, UCell* end )
-{
-    int wrdN;
-    OBlock* wordBlk = orBlockPtr( ctx->wblkN );
-
-    while( it != end )
-    {
-        if( it->type == OT_SETWORD )
-        {
-            // Word might be redefined mulitple times so we have to
-            // orLookup() first.
-            wrdN = orLookup( ctx, it->word.atom );
-            if( wrdN < 0 )
-                wrdN = orInternA( wordBlk, it->word.atom );
-        }
-        ++it;
-    }
-}
-
-
-static void unsetValues( UCell* it, UCell* end )
-{
-    while( it != end )
-    {
-        orSetTF( it, OT_UNSET );
-        ++it;
-    }
-}
-
-
-/**
-  Returns 0 if fails.
-*/
-int orMakeObject( OBlock* pblk, int blkI, OContext* ctx )
-{
-    OBlock* wblk;
-    OBlock* vblk;
-    UCell* it;
-    UCell* end;
-    OIndex blkN;
-    int wcount;
-
-
-    wcount = 0;
-    it  = pblk->values + blkI;
-    end = pblk->values + pblk->used;
-    while( it != end )
-    {
-        // This could be optimized to not count duplicate words.
-        if( it->type == OT_SETWORD )
-            ++wcount;
-        ++it;
-    }
-
-    blkN = orBlockN( pblk );
-    orRefPush( OT_BLOCK, blkN );
-    orMakeContext( ctx, wcount + 1 );
-
-    // re-acquire
-    wblk = orBlockPtr( ctx->wblkN );
-    vblk = orBlockPtr( ctx->vblkN );
-    pblk = orBlockPtr( blkN );
-
-    // Intern words.
-    it = pblk->values + blkI;
-    orInternA( wblk, orEnv->atom_self );
-    internSetWords( ctx, it, end );
-
-    vblk->used = wblk->used;
-    it = vblk->values;
-    orSetTF( it, OT_OBJECT );
-    it->ctx = *ctx;
-    unsetValues( it + 1, it + vblk->used );
-
-    orRefPush( OT_BLOCK, ctx->wblkN );
-    orRefPush( OT_BLOCK, ctx->vblkN );
-
-    // Bind prototype block.
-    orBind( pblk, ctx );
-
-    pblk = orBlockPtr( blkN );  // re-acquire
-    orEvalBlock( pblk, blkI );
-
-    orRefPop( 3 );
-
-    if( orErrorThrown )
-        return 0;
-    return 1;
-}
-
-
-/*
-   Similar to deep orCopyBlock() but OT_FUNCTION bodies are also copied.
-*/
-static void copyObjectValues( UCell* copy, UCell* it, int n )
-{
-    UCell* end = it + n;
-    while( it != end )
-    {
-        orCopyV( copy, *it );
-
-        if( (it->type == OT_BLOCK) || (it->type == OT_PAREN) )
-        {
-            OBlock* blk = orCopyBlock( it->index, it->series.index, 1 );
-            orSetSeries( copy, orBlockN(blk), 0 ); 
-        }
-        else if( it->type == OT_FUNCTION )
-        {
-            OBlock* blk = orCopyBlock( it->func.bodyBlk, 0, 1 );
-            copy->func.bodyBlk = orBlockN(blk);
-        }
-
-        ++copy;
-        ++it;
-    }
-}
-
-
-/**
-  Orig & clone must not point to the same OContext.
-*/
-void orCloneObject( const OContext* orig, OContext* clone )
-{
-    int size;
-    OBlock* cblk;
-    OBlock* vblk;
-    UCell* val;
-
-
-    vblk = orBlockPtr( orig->vblkN );
-    size = vblk->used;
-    cblk = orMakeBlock( size );
-    cblk->used = size;
-
-    clone->wblkN = orig->wblkN;
-    clone->vblkN = orBlockN( cblk );
-
-    // Point self to the new object.
-    assert( cblk->avail );
-    val = cblk->values;
-    orSetTF( val, OT_OBJECT );
-    val->ctx = *clone;
-
-    // Must set cblk->used and clear values in case GC called in
-    // copyObjectValues().
-    unsetValues( val + 1, val + size );
-
-    orRefPush( OT_BLOCK, clone->vblkN );
-    vblk = orBlockPtr( orig->vblkN );   // re-acquire
-    copyObjectValues( cblk->values + 1, vblk->values + 1, size - 1 );
-    orRefPop( 1 );
-
-    cblk = orBlockPtr( clone->vblkN );  // re-acquire
-    orBind( cblk, clone );
-}
-
-
-/**
-  Clones the orig context if no new members are added in the block.
-  Returns new context number or -1 if fails.
-*/
-int orMakeClone( const OContext* orig, OContext* clone,
-                 OIndex blkN, OIndex blkI )
-{
-    OBlock* pblk;
-    OBlock* vblk;
-    OBlock* cblk;
-    UCell* it;
-    UCell* end;
-    int wcount;
-    int origUsed;
-
-
-    orRefPush( OT_BLOCK, blkN );
-
-    vblk = orBlockPtr( orig->vblkN );
-    wcount = origUsed = vblk->used;
-
-    pblk = orBlockPtr( blkN );
-    it  = pblk->values + blkI;
-    end = pblk->values + pblk->used;
-    while( it != end )
-    {
-        if( it->type == OT_SETWORD )
-        {
-            if( orLookup( orig, it->word.atom ) < 0 )
-                ++wcount;
-        }
-        ++it;
-    }
-
-    if( wcount == origUsed )
-    {
-        orCloneObject( orig, clone );
-    }
-    else
-    {
-        orMakeContext( clone, wcount );
-
-        // Re-acquire.
-        pblk = orBlockPtr( blkN );
-        cblk = orBlockPtr( clone->wblkN );
-        vblk = orBlockPtr( orig->wblkN );
-
-        assert( cblk->avail );
-        memCpy( cblk->values, vblk->values, sizeof(UCell) * origUsed );
-        cblk->used = origUsed;
-        internSetWords( clone, pblk->values + blkI, end );
-        wcount = cblk->used;
-
-
-        vblk = orBlockPtr( orig->vblkN );
-        cblk = orBlockPtr( clone->vblkN );
-        cblk->used = wcount;
-
-        // Point self to the new object.
-        it = cblk->values;
-        orSetTF( it, OT_OBJECT );
-        it->ctx = *clone;
-
-        unsetValues( it + 1, it + wcount );
-
-        orRefPush( OT_BLOCK, clone->wblkN );
-        orRefPush( OT_BLOCK, clone->vblkN );
-        copyObjectValues( it + 1, vblk->values + 1, origUsed - 1 );
-        orRefPop( 2 );
-    }
-
-    orBind( orBlockPtr( blkN ), clone );
-
-    orRefPop( 1 );
-
-    orRefPush( OT_BLOCK, clone->wblkN );
-    orRefPush( OT_BLOCK, clone->vblkN );
-    orEvalBlock( orBlockPtr( blkN ), blkI );
-    orRefPop( 2 );
-
-    if( orErrorThrown )
-        return 0;
-
-    return 1;
-}
-#endif