Changeset 54 for trunk/orca/series.c

Timestamp:

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

Author:

krobillard

Message:

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

Files:

• trunk/orca/series.c (modified) (31 diffs)

trunk/orca/series.c

@@ -512 +512 @@
             else if( a2->type == OT_CHAR )
             {
-                char tmp = a2->integer;
+                char tmp = orInt(a2);
                 stringInsert( a1, &tmp, 1 );
             }
@@ -584 +584 @@
 
     if( orRefineSet(REF_RM_PART) )
-        len = (REF_RM_RANGE)->integer;
+        len = orInt(REF_RM_RANGE);
     else
         len = 1;
@@ -710 +710 @@
             {
                 orSetTF( result, OT_CHAR );
-                result->integer = str->charArray[ n ];
+                orInt(result) = str->charArray[ n ];
                 return 1;
             }
@@ -723 +723 @@
             {
                 orSetTF( result, OT_INTEGER );
-                result->integer = str->byteArray[ n ];
+                orInt(result) = str->byteArray[ n ];
                 return 1;
             }
@@ -733 +733 @@
             {
                 orSetTF( result, OT_INTEGER );
-                result->integer = ser->pair[ n ];
+                orInt(result) = ser->pair[ n ];
                 return 1;
             }
@@ -742 +742 @@
             {
                 orSetTF( result, OT_INTEGER );
-                result->integer = ser->tuple[ n ];
+                orInt(result) = ser->tuple[ n ];
                 return 1;
             }
@@ -773 +773 @@
                 const float* fp = &ser->vec3.x;
                 orSetTF( result, OT_DECIMAL );
-                result->num.decimal = (double) fp[ n ];
+                orDecimal(result) = (double) fp[ n ];
                 return 1;
             }
@@ -783 +783 @@
                 OArray* arr = orSTRING( ser );
                 orSetTF( result, OT_DECIMAL );
-                result->num.decimal = (double) arr->floats[ n ];
+                orDecimal(result) = (double) arr->floats[ n ];
                 return 1;
             }
@@ -797 +797 @@
             {
                 orSetTF( result, OT_DECIMAL );
-                result->num.decimal = arr->decimals[ n ];
+                orDecimal(result) = arr->decimals[ n ];
                 return 1;
             }
@@ -810 +810 @@
             {
                 orSetTF( result, OT_INTEGER );
-                result->integer = arr->integers[ n ];
+                orInt(result) = arr->integers[ n ];
                 return 1;
             }
@@ -876 +876 @@
                 break;
             orSetTF( result, OT_CHAR );
-            result->integer = str->charArray[ str->used - 1 ];
+            orInt(result) = str->charArray[ str->used - 1 ];
         }
             return;
@@ -908 +908 @@
                 break;
             orSetTF( result, OT_DECIMAL );
-            result->num.decimal = arr->decimals[ arr->used - 1 ];
+            orDecimal(result) = arr->decimals[ arr->used - 1 ];
         }
             return;
@@ -918 +918 @@
                 break;
             orSetTF( result, OT_INTEGER );
-            result->integer = arr->integers[ arr->used - 1 ];
+            orInt(result) = arr->integers[ arr->used - 1 ];
         }
             return;
@@ -964 +964 @@
         OValue* rval = REF_REV_RANGE;
         if( rval->type == OT_INTEGER )
-            range = rval->integer;
+            range = orInt(rval);
         else
             range = rval->series.it;
@@ -1046 +1046 @@
     {
         if( a2->type == OT_INTEGER )
-            n = a2->integer;
+            n = orInt(a2);
         else if( a2->type == OT_DECIMAL )
-            n = (int) a2->num.decimal;
+            n = (int) orDecimal(a2);
         else    // OT_LOGIC
-            n = a2->integer ? 0 : 1;
+            n = orInt(a2) ? 0 : 1;
 
         if( n )
@@ -1075 +1075 @@
     if( a2->type == OT_LOGIC )
     {
-        n = a2->integer ? 0 : 1;
+        n = orInt(a2) ? 0 : 1;
     }
     else
     {
         if( a2->type == OT_INTEGER )
-            n = a2->integer;
+            n = orInt(a2);
         else    // OT_DECIMAL
-            n = ((int) a2->num.decimal);
+            n = ((int) orDecimal(a2));
         if( n == 1 )
             n = 0;
@@ -1105 +1105 @@
     if( a2->type == OT_INTEGER )
     {
-        n = a2->integer;
+        n = orInt(a2);
         if( n > 0 )
             --n;
@@ -1113 +1113 @@
     else if( a2->type == OT_DECIMAL )
     {
-        n = (int) a2->num.decimal;
+        n = (int) orDecimal(a2);
         if( n > 0 )
             --n;
@@ -1121 +1121 @@
     else    // OT_LOGIC
     {
-        n = a2->integer ? 0 : 1;
+        n = orInt(a2) ? 0 : 1;
     }
 
@@ -1144 +1144 @@
 
     if( a2->type == OT_INTEGER )
-        n = a2->integer - 1;
+        n = orInt(a2) - 1;
     else if( a2->type == OT_DECIMAL )
-        n = ((int) a2->num.decimal) - 1;
+        n = ((int) orDecimal(a2)) - 1;
     else    // OT_LOGIC
-        n = a2->integer ? 0 : 1;
+        n = orInt(a2) ? 0 : 1;
 
     n += a1->series.it;
@@ -1185 +1185 @@
                 if( n < str->used )
                 {
-                    str->charArray[ n ] = a3->integer;
+                    str->charArray[ n ] = orInt(a3);
                     orResultCopy( *a3 );
                     return;
@@ -1199 +1199 @@
                 if( n < arr->used )
                 {
-                    arr->decimals[ n ] = a3->num.decimal;
+                    arr->decimals[ n ] = orDecimal(a3);
                     orResultCopy( *a3 );
                     return;
@@ -1212 +1212 @@
                 if( n < arr->used )
                 {
-                    arr->integers[ n ] = a3->integer;
+                    arr->integers[ n ] = orInt(a3);
                     orResultCopy( *a3 );
                     return;
@@ -1286 +1286 @@
             while( it != end )
             {
-                if( *it == a2->integer )
+                if( *it == orInt(a2) )
                 {
                     ++it;
@@ -1478 +1478 @@
             OValue* rng = REF_COPY_RANGE;
             if( rng->type == OT_INTEGER )
-                part = rng->integer;
+                part = orInt(rng);
             else if( orIsSeries(rng->type) && orIsSeries(a1->type) )
                 part = rng->series.it - a1->series.it;
@@ -1535 +1535 @@
                     if( orRefineSet(REF_CHANGE_PART) )
                     {
-                        int range = (REF_CHANGE_RANGE)->integer;
+                        int range = orInt(REF_CHANGE_RANGE);
                         if( range < len2 )
                         {
@@ -1610 +1610 @@
                     ++s1->used;
                 }
-                s1->charArray[ a1->series.it ] = a2->integer;
+                s1->charArray[ a1->series.it ] = orInt(a2);
                 a1->series.it += 1;
                 return;
@@ -1636 +1636 @@
 
                     if( rngVal->type == OT_INTEGER )
-                        range = rngVal->integer;
+                        range = orInt(rngVal);
                     else
                         range = rngVal->series.it - a1->series.it;
@@ -1840 +1840 @@
             {
                 if( orRefineSet(REF_FIND_LAST) )
-                    found = orFindByteRev( s1, a1->series.it, a2->integer );
+                    found = orFindByteRev( s1, a1->series.it, orInt(a2) );
                 else
-                    found = orFindByte( s1, a1->series.it, a2->integer );
+                    found = orFindByte( s1, a1->series.it, orInt(a2) );
                 if( found > -1 )
                 {
@@ -1905 +1905 @@
         char* pend;
         OValue* a3 = a1 + 2;
-        if( a3->integer < 0 )
+        if( orInt(a3) < 0 )
         {
             orError( "/part less than zero." );
             return;
         }
-        pend = cp + a3->integer;
+        pend = cp + orInt(a3);
         if( end > pend )
             end = pend;
@@ -1936 +1936 @@
         char* pend;
         OValue* a3 = a1 + 2;
-        if( a3->integer < 0 )
+        if( orInt(a3) < 0 )
         {
             orError( "/part less than zero." );
             return;
         }
-        pend = cp + a3->integer;
+        pend = cp + orInt(a3);
         if( end > pend )
             end = pend;