Changeset 25

Timestamp:

02/06/06 23:30:15 (3 years ago)

Author:

krobillard

Message:

series which/index renamed to n/it.

Location:

trunk/orca

Files:

• TODO (modified) (1 diff)
• bytecode.c (modified) (3 diffs)
• context.c (modified) (7 diffs)
• files.c (modified) (7 diffs)
• gl/dlist.c (modified) (12 diffs)
• gl/gx.c (modified) (8 diffs)
• gl/project.r (modified) (1 diff)
• math.c (modified) (2 diffs)
• math3d.c (modified) (1 diff)
• op.c (modified) (2 diffs)
• ovalue.c (modified) (44 diffs)
• ovalue.h (modified) (3 diffs)
• parse.c (modified) (9 diffs)
• print.c (modified) (10 diffs)
• qt/project.r (modified) (2 diffs)
• qt/qorca.cpp (modified) (11 diffs)
• series.c (modified) (82 diffs)
• unix/os.c (modified) (2 diffs)

trunk/orca/TODO

@@ -27 +27 @@
   * Words are stored in single string.
   * UCell union
-  * Series.which/index -> series.n/it
   * Value structure hidden more using macros (ur_int(), etc.)
   * Tokenizer has no nested block limit.

trunk/orca/bytecode.c

@@ -142 +142 @@
         {
             OBlock* blk = orBLOCKS + val->index;
-            OValue* it  = blk->values + val->series.index;
+            OValue* it  = blk->values + val->series.it;
             OValue* end = blk->values + blk->used;
             int len = end - it;
@@ -176 +176 @@
         {
             OString* str = orSTRINGS + val->index;
-            int len = str->used - val->series.index;
+            int len = str->used - val->series.it;
 
             if( len > 255 )
@@ -197 +197 @@
             *cp++ = len & 0xff;
 
-            memCpy( cp, str->charArray + val->series.index, len );
+            memCpy( cp, str->charArray + val->series.it, len );
         }
             break;

trunk/orca/context.c

@@ -298 +298 @@
         if( (it->type == OT_BLOCK) || (it->type == OT_PAREN) )
         {
-            OBlock* blk = orCopyBlock( it->index, it->series.index, 1 );
+            OBlock* blk = orCopyBlock( it->index, it->series.it, 1 );
             orSetSeries( copy, orBlockN(blk), 0 ); 
         }
@@ -696 +696 @@
 
         blk = orBLOCK( a1 );
-        it  = blk->values + a1->series.index;
+        it  = blk->values + a1->series.it;
         end = blk->values + blk->used;
 
@@ -725 +725 @@
     orRefPop( 1 );
 
-    orEvalBlock( orBlockPtr( a2->index ), a2->series.index );
+    orEvalBlock( orBlockPtr( a2->index ), a2->series.it );
 }
 
@@ -975 +975 @@
     OValue* a2 = a1 + 1;
     OIndex serN = a2->index;
-    OIndex si   = a2->series.index;
+    OIndex si   = a2->series.it;
     OIndex send;
     OIndex body = (a1 + 2)->index;
-    OIndex bi   = (a1 + 2)->series.index;
+    OIndex bi   = (a1 + 2)->series.it;
     OValue saveA1;
 
@@ -984 +984 @@
     {
         blk = orBLOCK( a1 );
-        wval = blk->values + a1->series.index;
+        wval = blk->values + a1->series.it;
         wend = blk->values + blk->used;
 
@@ -1085 +1085 @@
             orResultNONE;
 
-            if( a2->series.index )
+            if( a2->series.it )
             {
                 OValue* begin;
@@ -1094 +1094 @@
                 blk = orBLOCK(a2);
                 begin = blk->values;
-                it    = begin + a2->series.index;
+                it    = begin + a2->series.it;
 
                 while( it->LIST_NEXT > 0 )

trunk/orca/files.c

@@ -82 +82 @@
     OString* str = orSTRING(a1);
     orCTermStr( str );
-    if( orIsDir( str->charArray + a1->series.index ) > -1 )
+    if( orIsDir( str->charArray + a1->series.it ) > -1 )
         logic = 1;
     orResult( OT_LOGIC, logic );
@@ -93 +93 @@
     OString* str = orSTRING(a1);
     orCTermStr( str );
-    size = orFileSize( str->charArray + a1->series.index );
+    size = orFileSize( str->charArray + a1->series.it );
     if( size < 0 )
     {
@@ -110 +110 @@
     OString* str = orSTRING(a1);
     orCTermStr( str );
-    status = orIsDir( str->charArray + a1->series.index );
+    status = orIsDir( str->charArray + a1->series.it );
     if( status < 0 )
         status = 0;
@@ -122 +122 @@
     OString* str = orSTRING(a1);
     orCTermStr( str );
-    status = orFileModified( str->charArray + a1->series.index, orRESULT );
+    status = orFileModified( str->charArray + a1->series.it, orRESULT );
     if( status < 0 )
     {
@@ -254 +254 @@
         orCTermStr( str );
 
-        fn = str->charArray + a1->series.index;
+        fn = str->charArray + a1->series.it;
         n = orIsDir( fn );
         if( n < 0 )
@@ -506 +506 @@
 
     str = orSTRING(a1);
-    len = str->used - a1->series.index;
+    len = str->used - a1->series.it;
     blen = len + (len / 99) + 600;
     bin = orMakeString( blen /*+ 4*/ );
@@ -513 +513 @@
     {
         ret = BZ2_bzBuffToBuffCompress( bin->charArray /*+ 4*/, &blen,
-                                        str->charArray + a1->series.index, len,
+                                        str->charArray + a1->series.it, len,
                                         3, 0, 0 );
         if( ret == BZ_OUTBUFF_FULL )

trunk/orca/gl/dlist.c

@@ -313 +313 @@
             case DLP_TEXT_STR:
                 // TODO: Hold string.
-                RP_ADD_ARG( ROP_TEXT, 0, cbp.values[1].series.index );
+                RP_ADD_ARG( ROP_TEXT, 0, cbp.values[1].series.it );
                 pc->list = cbp.values[1].index;
                 RP_INC;
@@ -327 +327 @@
             case DLP_VERTS:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_VERTS, 0, cbp.values[1].series.index );
+                RP_ADD_ARG( ROP_VERTS, 0, cbp.values[1].series.it );
                 pc->list = cbp.values[1].index;
                 RP_INC;
@@ -334 +334 @@
             case DLP_NORMALS:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_NORMALS, 0, cbp.values[1].series.index );
+                RP_ADD_ARG( ROP_NORMALS, 0, cbp.values[1].series.it );
                 pc->list = cbp.values[1].index;
                 RP_INC;
@@ -341 +341 @@
             case DLP_COLORS:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_COLORS, 0, cbp.values[1].series.index );
+                RP_ADD_ARG( ROP_COLORS, 0, cbp.values[1].series.it );
                 pc->list = cbp.values[1].index;
                 RP_INC;
@@ -348 +348 @@
             case DLP_UVS:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_UVS, 0, cbp.values[1].series.index );
+                RP_ADD_ARG( ROP_UVS, 0, cbp.values[1].series.it );
                 pc->list = cbp.values[1].index;
                 RP_INC;
@@ -355 +355 @@
             case DLP_QUADS:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_QUADS, 0, cbp.values[2].series.index );
+                RP_ADD_ARG( ROP_QUADS, 0, cbp.values[2].series.it );
                 pc->list = cbp.values[2].index;
                 RP_INC;
@@ -364 +364 @@
             case DLP_TRIS:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_TRIS, 0, cbp.values[2].series.index );
+                RP_ADD_ARG( ROP_TRIS, 0, cbp.values[2].series.it );
                 pc->list = cbp.values[2].index;
                 RP_INC;
@@ -373 +373 @@
             case DLP_STRIP:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_TRISTRIP, 0, cbp.values[2].series.index );
+                RP_ADD_ARG( ROP_TRISTRIP, 0, cbp.values[2].series.it );
                 pc->list = cbp.values[2].index;
                 RP_INC;
@@ -382 +382 @@
             case DLP_FAN:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_TRIFAN, 0, cbp.values[2].series.index );
+                RP_ADD_ARG( ROP_TRIFAN, 0, cbp.values[2].series.it );
                 pc->list = cbp.values[2].index;
                 RP_INC;
@@ -391 +391 @@
             case DLP_POINTS:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_POINTS, 0, cbp.values[2].series.index );
+                RP_ADD_ARG( ROP_POINTS, 0, cbp.values[2].series.it );
                 pc->list = cbp.values[2].index;
                 RP_INC;
@@ -400 +400 @@
             case DLP_LINES:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_LINES, 0, cbp.values[2].series.index );
+                RP_ADD_ARG( ROP_LINES, 0, cbp.values[2].series.it );
                 pc->list = cbp.values[2].index;
                 RP_INC;
@@ -510 +510 @@
     orArrayInit( &prog, sizeof(RenderWord), orSeriesLen(blk,a2) );
 
-    error = compileProg( blk->values + a2->series.index,
+    error = compileProg( blk->values + a2->series.it,
                          blk->values + blk->used, &prog );
     if( error )

trunk/orca/gl/gx.c

@@ -197 +197 @@
                 iv[ INPUT_MY ].integer   = gView->height - event->y - 1;
 
-                orEvalBlock( orBLOCKS + blkV->index, blkV->series.index );
+                orEvalBlock( orBLOCKS + blkV->index, blkV->series.it );
                 gxHandleError();
             }
@@ -214 +214 @@
                 iv[ INPUT_MY ].integer   = gView->height - event->y - 1;
 
-                orEvalBlock( orBLOCKS + blkV->index, blkV->series.index );
+                orEvalBlock( orBLOCKS + blkV->index, blkV->series.it );
                 gxHandleError();
             }
@@ -244 +244 @@
                 }
 
-                orEvalBlock( orBLOCKS + blkV->index, blkV->series.index );
+                orEvalBlock( orBLOCKS + blkV->index, blkV->series.it );
                 gxHandleError();
             }
@@ -262 +262 @@
                 iv[ INPUT_DY ].integer = event->y;
 
-                orEvalBlock( orBLOCKS + blkV->index, blkV->series.index );
+                orEvalBlock( orBLOCKS + blkV->index, blkV->series.it );
                 gxHandleError();
             }
@@ -276 +276 @@
                 if( hval )
                 {
-                    orEvalBlock( orBLOCKS + hval->index, hval->series.index );
+                    orEvalBlock( orBLOCKS + hval->index, hval->series.it );
                     gxHandleError();
                 }
@@ -291 +291 @@
                 if( hval )
                 {
-                    orEvalBlock( orBLOCKS + hval->index, hval->series.index );
+                    orEvalBlock( orBLOCKS + hval->index, hval->series.it );
                     gxHandleError();
                 }
@@ -662 +662 @@
     orArrayInit( &prog, sizeof(RenderWord), blk->used );
 
-    error = compileProg( blk->values + a1->series.index,
+    error = compileProg( blk->values + a1->series.it,
                          blk->values + blk->used, &prog );
     if( error )
@@ -1480 +1480 @@
 void keyHandlerNative( OValue* a1 )
 {
-    if( validKeyHandlerBlock( a1->index, a1->series.index ) )
-    {
-        OBlock* blk2 = orCopyBlock( a1->index, a1->series.index, 0 );
+    if( validKeyHandlerBlock( a1->index, a1->series.it ) )
+    {
+        OBlock* blk2 = orCopyBlock( a1->index, a1->series.it, 0 );
         mapKeyAtoms( blk2 );
         orSetSeries( a1, orBlockN(blk2), 0 );

trunk/orca/gl/project.r

@@ -11 +11 @@
     include_from %..
     include_from %../util
-    libs_from %.. %orca
+    libs_from %.. %orca0
 
     macx [

trunk/orca/math.c

@@ -138 +138 @@
                 {
                     rn = genrand_int32();
-                    used -= a1->series.index;
-                    a1->series.index += rn % used;
+                    used -= a1->series.it;
+                    a1->series.it += rn % used;
                     return;
                 }
@@ -280 +280 @@
         case OT_BITSET:
         {
-            OString* bin = orCopyString( a1->index, a1->series.index );
+            OString* bin = orCopyString( a1->index, a1->series.it );
             uint8_t* it  = bin->byteArray;
             uint8_t* end = bin->byteArray + bin->used;

trunk/orca/math3d.c

@@ -279 +279 @@
 
     OBlock* blk = orBLOCK(blkV);
-    OValue* it  = blk->values + blkV->series.index;
+    OValue* it  = blk->values + blkV->series.it;
     OValue* end = blk->values + blk->used;
     float* vend = vec + count;

trunk/orca/op.c

@@ -437 +437 @@
             case OT_SETPATH:
                 // TODO: compare all values.
-                if( (a->index == b->index) &&
-                    (a->series.index == b->series.index) )
+                if( (a->series.n == b->series.n) &&
+                    (a->series.it == b->series.it) )
                     logic = 1;
                 break;
@@ -568 +568 @@
         else if( orIsSeries(a->type) )
         {
-            if( (a->index == b->index) &&
-                (a->series.index == b->series.index) )
+            if( (a->series.n == b->series.n) &&
+                (a->series.it == b->series.it) )
                 logic = 1;
         }

trunk/orca/ovalue.c

@@ -617 +617 @@
                 OContext ctx;
                 OString* str = orSTRING( from );
-                int start = from->series.index;
+                int start = from->series.it;
 
                 orGlobalCtx( ctx );
@@ -658 +658 @@
             {
                 OString* str = orSTRING(from);
-                char* it  = str->charArray + from->series.index;
+                char* it  = str->charArray + from->series.it;
                 char* end = str->charArray + str->used;
                 const char* fin;
@@ -677 +677 @@
             {
                 OString* str = orSTRING(from);
-                char* it  = str->charArray + from->series.index;
+                char* it  = str->charArray + from->series.it;
                 char* end = str->charArray + str->used;
                 const char* fin;
@@ -690 +690 @@
             {
                 OBlock* blk = orBLOCK( from );
-                OValue* it  = blk->values + from->series.index;
+                OValue* it  = blk->values + from->series.it;
                 OValue* end = blk->values + blk->used;
                 if( (end - it) == 2 &&
@@ -709 +709 @@
             {
                 OBlock* blk = orBLOCK( from );
-                OValue* it  = blk->values + from->series.index;
+                OValue* it  = blk->values + from->series.it;
                 OValue* end = blk->values + blk->used;
                 uint8_t* tuple = res->tuple;
@@ -771 +771 @@
                 {
                     OContext ctx;
-                    if( orMakeObject( orBLOCK(a2), a2->series.index, &ctx ) )
+                    if( orMakeObject( orBLOCK(a2), a2->series.it, &ctx ) )
                     {
                         orSetTF( a1, OT_OBJECT );
@@ -787 +787 @@
                 {
                 case OT_STRING:
-                    bin = orMakeCharset( orSTRING(a2), a2->series.index );
+                    bin = orMakeCharset( orSTRING(a2), a2->series.it );
                     break;
 
                 case OT_BINARY:
-                    bin = orCopyString( a2->index, a2->series.index );
+                    bin = orCopyString( a2->index, a2->series.it );
                     break;
 
                 case OT_BLOCK:
-                    bin = _makeBitset( orBLOCK(a2), a2->series.index );
+                    bin = _makeBitset( orBLOCK(a2), a2->series.it );
                     break;
                 }
@@ -811 +811 @@
                 {
                     OBlock* blk = orBLOCK( a2 );
-                    OValue* it  = blk->values + a2->series.index;
+                    OValue* it  = blk->values + a2->series.it;
                     OValue* end = blk->values + blk->used;
                     int len = end - it;
@@ -884 +884 @@
         {
             OContext ctx;
-            if( orMakeClone( &a1->ctx, &ctx, a2->index, a2->series.index ) )
+            if( orMakeClone( &a1->ctx, &ctx, a2->index, a2->series.it ) )
             {
                 orSetTF( a1, OT_OBJECT );
@@ -955 +955 @@
             orSetSeries( res, orBlockN(blk), 0 );
 
-            if( bin->used > a2->series.index )
+            if( bin->used > a2->series.it )
             {
                 OIndex len;
                 const uint8_t* code;
-                code = bin->byteArray + a2->series.index;
+                code = bin->byteArray + a2->series.it;
                 if( orByteCodeBlock( &code, &len ) )
                     orRevaluateByteCodes( code, len, blk );
@@ -987 +987 @@
             OString* str;
             OBlock* blk = orBLOCK(a2);
-            OValue* it  = blk->values + a2->series.index;
+            OValue* it  = blk->values + a2->series.it;
             OValue* end = blk->values + blk->used;
 
@@ -1182 +1182 @@
     {
         OString* str = orSTRING( a1 );
-        blk = orTokenize( str->charArray + a1->series.index,
+        blk = orTokenize( str->charArray + a1->series.it,
                           str->charArray + str->used );
         if( blk )
@@ -1316 +1316 @@
     if( orIs(a1, OT_BLOCK) || orIs(a1, OT_PAREN) )
     {
-        orEvalBlock( orBLOCK( a1 ), a1->series.index );
+        orEvalBlock( orBLOCK( a1 ), a1->series.it );
     }
     else if( orIs(a1, OT_FILE) )
@@ -1407 +1407 @@
     {
         OBlock* blk = orBLOCK(a1);
-        OValue* it  = blk->values + a1->series.index;
+        OValue* it  = blk->values + a1->series.it;
         OValue* end = blk->values + blk->used;
         while( it != end )
@@ -1477 +1477 @@
         {
             OValue* a2 = a1 + 1;
-            orEvalBlock( orBLOCK( a2 ), a2->series.index );
+            orEvalBlock( orBLOCK( a2 ), a2->series.it );
             return;
         }
@@ -1491 +1491 @@
     {
         OValue* a2 = a1 + 1;
-        orEvalBlock( orBLOCK( a2 ), a2->series.index );
+        orEvalBlock( orBLOCK( a2 ), a2->series.it );
         return;
     }
@@ -1506 +1506 @@
             --blkArg;
     }
-    orEvalBlock( orBLOCK( blkArg ), blkArg->series.index );
+    orEvalBlock( orBLOCK( blkArg ), blkArg->series.it );
 }
 
@@ -1518 +1518 @@
     ++a1;
     body = a1->index;
-    bi   = a1->series.index;
+    bi   = a1->series.it;
 
     while( n > 0 )
@@ -1537 +1537 @@
     OValue* a3 = a1 + 2;
     OIndex body = a3->index;
-    OIndex bi   = a3->series.index;
+    OIndex bi   = a3->series.it;
 
     orWordVal(