Changeset 54 for trunk/orca/context.c

Timestamp:

02/17/06 15:30:01 (3 years ago)

Author:

krobillard

Message:

Now using orDecimal() & orInt() where appropriate.

Files:

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

trunk/orca/context.c

@@ -158 +158 @@
     while( it != end )
     {
-        if( it->word.atom == atom )
+        if( orAtom(it) == atom )
             return it - wordBlk->values;
         ++it;
@@ -232 +232 @@
     while( it != end )
     {
-        if( it->word.atom == atom )
+        if( orAtom(it) == atom )
             return it - wblk->values;
         ++it;
@@ -264 +264 @@
             // Word might be redefined mulitple times so we have to
             // orLookup() first.
-            wrdN = orLookup( ctx, it->word.atom );
+            wrdN = orLookup( ctx, orAtom(it) );
             if( wrdN < 0 )
-                wrdN = orInternA( wordBlk, it->word.atom );
+                wrdN = orInternA( wordBlk, orAtom(it) );
         }
         ++it;
@@ -444 +444 @@
         if( it->type == OT_SETWORD )
         {
-            if( orLookup( orig, it->word.atom ) < 0 )
+            if( orLookup( orig, orAtom(it) ) < 0 )
                 ++wcount;
         }
@@ -506 +506 @@
 {
     int wrdN;
-    wrdN = orLookup( ctx, val->word.atom );
+    wrdN = orLookup( ctx, orAtom(val) );
     if( wrdN > -1 )
     {
@@ -571 +571 @@
             (it->type == OT_GETWORD) )
         {
-            if( (it->word.atom == orEnv->atom_func) ||
-                (it->word.atom == orEnv->atom_does) )
+            if( (orAtom(it) == orEnv->atom_func) ||
+                (orAtom(it) == orEnv->atom_does) )
                 return 1;
         }
@@ -681 +681 @@
     vblk = orBlockPtr( ctx.wblkN );
 
-    if( a1->type == OT_WORD )
-    {
-        wrdN = orLookup( &ctx, a1->word.atom );
+    if( orIs(a1, OT_WORD) )
+    {
+        wrdN = orLookup( &ctx, orAtom(a1) );
         if( wrdN > -1 )
         {
@@ -689 +689 @@
         }
     }
-    else if( a1->type == OT_BLOCK )
+    else if( orIs(a1, OT_BLOCK) )
     {
         OBlock* blk = orBLOCK( a1 );
@@ -696 +696 @@
         while( it != end )
         {
-            if( it->type == OT_WORD )
-            {
-                wrdN = orLookup( &ctx, a1->word.atom );
+            if( orIs(it, OT_WORD) )
+            {
+                wrdN = orLookup( &ctx, orAtom(a1) );
                 if( wrdN > -1 )
                 {
@@ -720 +720 @@
     OIndex wrdN;
 
-    wrdN = orLookup( &a1->ctx, a2->word.atom );
+    wrdN = orLookup( &a1->ctx, orAtom(a2) );
     if( wrdN < 0 )
     {
@@ -730 +730 @@
         // a1->context remains unchanged.
         a1->word.index = wrdN;
-        a1->word.atom  = a2->word.atom;
+        orAtom(a1)     = orAtom(a2);
     }
 }
@@ -754 +754 @@
     {
         orMakeContext( &ctx, 1 );
-        orInternA( orBlockPtr( ctx.wblkN ), a1->word.atom );
+        orInternA( orBlockPtr( ctx.wblkN ), orAtom(a1) );
     }
     else
@@ -770 +770 @@
         {
             if( it->type == OT_WORD )
-                orInternA( blk, it->word.atom );
+                orInternA( blk, orAtom(it) );
             ++it;
         }
@@ -846 +846 @@
             if( it->type == OT_WORD )
             {
-                orInternA( blk, it->word.atom );
+                orInternA( blk, orAtom(it) );
             }
             else
@@ -861 +861 @@
     {
         orMakeContext( &ctx, 1 );
-        orInternA( orBlockPtr( ctx.wblkN ), a1->word.atom );
+        orInternA( orBlockPtr( ctx.wblkN ), orAtom(a1) );
     }
 
@@ -942 +942 @@
             {
                 for( rlen = 0; rlen < vlen; ++rlen )
-                    (wval + rlen)->integer = str->charArray[ si++ ];
+                    orInt(wval + rlen) = str->charArray[ si++ ];
 
                 orEvalBlock( orBlockPtr( body ), bi );
@@ -956 +956 @@
                 while( si < str->used )
                 {
-                    wval->integer = str->charArray[ si++ ];
+                    orInt(wval) = str->charArray[ si++ ];
                     ++wval;
                 }
@@ -1127 +1127 @@
                         {
                             orSetTF( val, OT_CHAR );
-                            val->integer = str->charArray[ si ];
+                            orInt(val) = str->charArray[ si ];
                         }
                         else