Changeset 54 for trunk/orca/ovalue.c

Timestamp:

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

Author:

krobillard

Message:

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

Files:

• trunk/orca/ovalue.c (modified) (34 diffs)

trunk/orca/ovalue.c

@@ -396 +396 @@
 
     // Makes sure double is aligned on 8 byte boundary.
-    assert( ((char*) res) + 8 == ((char*) &res->num.decimal) );
+    assert( ((char*) res) + 8 == ((char*) &orDecimal(res)) );
 
     orNative( orNativeNative, "native" );
@@ -651 +651 @@
             if( from->type == OT_INTEGER )
             {
-                orResult( OT_ACTION, from->integer );
+                orResult( OT_ACTION, orInt(from) );
                 return 1;
             }
@@ -657 +657 @@
 #endif
         case OT_LOGIC:
-            orResult( OT_LOGIC, from->integer ? 1 : 0 );
+            orResult( OT_LOGIC, orInt(from) ? 1 : 0 );
             return 1;
 
@@ -663 +663 @@
             if( from->type == OT_LOGIC )
             {
-                res->integer = from->integer;
+                orInt(res) = orInt(from);
                 return 1;
             }
             else if( from->type == OT_DECIMAL )
             {
-                res->integer = (int) from->num.decimal;
+                orInt(res) = (int) orDecimal(from);
                 return 1;
             }
@@ -677 +677 @@
                 char* end = str->charArray + str->used;
                 const char* fin;
-                res->integer = orStringToInt( it, end, &fin );
+                orInt(res) = orStringToInt( it, end, &fin );
                 if( fin == end )
                     return 1;
@@ -687 +687 @@
                 (from->type == OT_LOGIC) )
             {
-                res->num.decimal = (double) from->integer;
+                orDecimal(res) = (double) orInt(from);
                 return 1;
             }
@@ -696 +696 @@
                 char* end = str->charArray + str->used;
                 const char* fin;
-                res->num.decimal = orStringToDec( it, end, &fin );
+                orDecimal(res) = orStringToDec( it, end, &fin );
                 if( fin == end )
                     return 1;
@@ -735 +735 @@
                         if( it->type != OT_INTEGER )
                             break;
-                        *tuple++ = it->integer;
+                        *tuple++ = orInt(it);
                         ++it;
                     }
@@ -760 +760 @@
     if( a1->type == OT_DATATYPE )
     {
-        if( orMake( a1->integer, a2, a1 ) )
+        if( orMake( orInt(a1), a2, a1 ) )
             return;
 
-        switch( a1->integer )
+        switch( orInt(a1) )
         {
             case OT_BLOCK:
                 if( a2->type == OT_INTEGER )
                 {
-                    OBlock* blk = orMakeBlock( a2->integer );
+                    OBlock* blk = orMakeBlock( orInt(a2) );
                     orResultBLOCK( blk - orBLOCKS );
                     return;
@@ -777 +777 @@
                 if( a2->type == OT_INTEGER )
                 {
-                    OString* str = orMakeString( a2->integer );
+                    OString* str = orMakeString( orInt(a2) );
                     orResultSTRING( str - orSTRINGS );
                     return;
@@ -843 +843 @@
                 else if( a2->type == OT_INTEGER )
                 {
-                    OBlock* blk = orMakeList( a2->integer );
+                    OBlock* blk = orMakeList( orInt(a2) );
                     orResultSeries( OT_LIST, orBlockN(blk), LIST_TAIL );
                     return;
@@ -869 +869 @@
             {
                 OValue* res = orRESULT;
-                orSetTF( res, a1->integer );
+                orSetTF( res, orInt(a1) );
                 res->vec3.x = 0.0f;
                 res->vec3.y = 0.0f;
@@ -922 +922 @@
     type = a1->type;
     if( type == OT_DATATYPE )
-        type = a1->integer;
+        type = orInt(a1);
 
     if( type == a2->type )
@@ -1477 +1477 @@
     int logic;
     if( (a1->type == OT_NONE) ||
-        ((a1->type == OT_LOGIC) && (a1->integer == OR_FALSE)) )
+        ((a1->type == OT_LOGIC) && (orInt(a1) == OR_FALSE)) )
         logic = OR_TRUE;
     else
@@ -1515 +1515 @@
     if( a1->type != OT_NONE )
     {
-        if( (a1->type != OT_LOGIC) || (a1->integer != 0)  )
+        if( (a1->type != OT_LOGIC) || (orInt(a1) != 0)  )
             --blkArg;
     }
@@ -1526 +1526 @@
     OIndex body;
     OIndex bi;
-    int n = a1->integer;
+    int n = orInt(a1);
 
     ++a1;
@@ -1556 +1556 @@
     {
         int counter = 0;
-        int n = a2->integer;
+        int n = orInt(a2);
         orSetTF( wval, OT_INTEGER );
         while( counter < n )
         {
-            wval->integer = ++counter;
+            orInt(wval) = ++counter;
             orEvalBlock( orBLOCKS + body, bi );
             if( orErrorThrown )
@@ -1600 +1600 @@
                 if( si >= str->used )
                     break;
-                wval->integer = str->charArray[ si++ ];
+                orInt(wval) = str->charArray[ si++ ];
                 orEvalBlock( orBLOCKS + body, bi );
                 if( orErrorThrown )
@@ -1628 +1628 @@
         if( res->type != OT_NONE )
         {
-            if( (res->type != OT_LOGIC) || (res->integer != 0) )
+            if( (res->type != OT_LOGIC) || (orInt(res) != 0) )
                 break;
         }
@@ -1657 +1657 @@
     if( res->type != OT_NONE )
     {
-        if( (res->type != OT_LOGIC) || (res->integer != 0) )
+        if( (res->type != OT_LOGIC) || (orInt(res) != 0) )
         {
             if( onstack )
@@ -1927 +1927 @@
             if( pit->type == OT_INTEGER )
             {
-                orPick( cres, pit->integer - 1, result );
+                orPick( cres, orInt(pit) - 1, result );
             }
             else if( pit->type == OT_GETWORD )
@@ -1935 +1935 @@
                 if( wval->type != OT_INTEGER )
                     goto invalid;
-                orPick( cres, wval->integer - 1, result );
+                orPick( cres, orInt(wval) - 1, result );
             }
             else
@@ -1967 +1967 @@
             if( pit->type == OT_INTEGER )
             {
-                orPick( cres, pit->integer - 1, result );
+                orPick( cres, orInt(pit) - 1, result );
                 cres = result;
             }
@@ -2036 +2036 @@
             if( end->type == OT_INTEGER )
             {
-                result->series.it = end->integer - 1;
+                result->series.it = orInt(end) - 1;
             }
             else if( end->type == OT_GETWORD )
@@ -2045 +2045 @@
                 if( val->type != OT_INTEGER )
                     goto invalid;
-                result->series.it = val->integer - 1;
+                result->series.it = orInt(val) - 1;
             }
             else if( end->type == OT_WORD )
@@ -2103 +2103 @@
                 int index = ser->series.it;
                 if( index < str->used )
-                    str->charArray[ index ] = val->integer;
+                    str->charArray[ index ] = orInt(val);
             }
             break;
@@ -2781 +2781 @@
     it = DATA_TOP + (count - funcv->argc - refc);
     it->type    = OT_LOGIC;
-    it->integer = 1;
+    orLogic(it) = 1;
 
     if( si->LAST_ARG )
@@ -2995 +2995 @@
         if( res->type != OT_NONE )
         {
-            if( (res->type != OT_LOGIC) || (res->integer != 0) )
+            if( (res->type != OT_LOGIC) || (orLogic(res) != 0) )
             {
                 return;
@@ -3028 +3028 @@
 
         res = orRESULT;
-        if( res->type == OT_NONE )
+        if( orIs(res, OT_NONE) )
             goto fail;
-        if( (res->type == OT_LOGIC) && (res->integer == 0) )
+        if( orIs(res, OT_LOGIC) && (orLogic(res) == 0) )
             goto fail;
     }
@@ -3110 +3110 @@
             else if( it->type == OT_DATATYPE )
             {
-                dprint( " %s\n", orDatatypeName(it->integer) );
+                dprint( " %s\n", orDatatypeName(orInt(it)) );
             }
             else if( (it->type == OT_OBJECT) ||
@@ -3812 +3812 @@
 
                 case OT_CHAR:
-                    orSetBit( bin->byteArray, it->integer );
-                    range = it->integer;
+                    orSetBit( bin->byteArray, orInt(it) );
+                    range = orInt(it);
                     break;
 
@@ -3823 +3823 @@
                         if( (rend != end) && (rend->type == OT_CHAR) )
                         {
-                            r2 = rend->integer;
+                            r2 = orInt(rend);
                             while( range < r2 )
                             {
@@ -3981 +3981 @@
 
     orSetTF( val, OT_DECIMAL );
-    val->num.decimal = n;
+    orDecimal(val) = n;
     return val;
 }
@@ -4061 +4061 @@
             orWordVal( it, ctxBlk, val );
             if( val->type == OT_DATATYPE )
-                it->integer = val->integer;
+                orInt(it) = orInt(val);
             else
-                it->integer = val->type;
+                orInt(it) = val->type;
         }
         else
         {
-            it->integer = it->type;
+            orInt(it) = it->type;
         }
         it->type = OT_DATATYPE;