Changeset 47 for trunk/orca

Timestamp:

02/13/06 18:25:35 (3 years ago)

Author:

krobillard

Message:

tests/working/op_compare.r works again.

Files:

• trunk/orca/op.c (modified) (4 diffs)

trunk/orca/op.c

@@ -507 +507 @@
 static int compareValue( const OValue* a, const OValue* b )
 {
-    if( a->type == OT_INTEGER )
-    {
-        if( b->type == OT_INTEGER )
-        {
-            if( a->integer > b->integer )
+    if( orIs(a, OT_INTEGER) )
+    {
+        if( orIs(b, OT_INTEGER) )
+        {
+            if( orInt(a) > orInt(b) )
                 return CMP_GREATER;
-            if( a->integer < b->integer )
+            if( orInt(a) < orInt(b) )
                 return CMP_LESS;
             return CMP_EQUAL;
         }
-        else if( b->type == OT_DECIMAL )
-        {
-            double da = (double) a->integer;
-            if( da > b->num.decimal )
+        else if( orIs(b, OT_DECIMAL) )
+        {
+            double da = (double) orInt(a);
+            if( da > orDecimal(b) )
                 return CMP_GREATER;
-            if( da < b->num.decimal )
+            if( da < orDecimal(b) )
                 return CMP_LESS;
             return CMP_EQUAL;
@@ -528 +528 @@
         return CMP_ERROR_B;
     }
-    else if( a->type == OT_DECIMAL )
-    {
-        if( b->type == OT_INTEGER )
-        {
-            double db = (double) b->integer;
-            if( a->num.decimal > db )
+    else if( orIs(a, OT_DECIMAL) )
+    {
+        if( orIs(b, OT_INTEGER) )
+        {
+            double db = (double) orInt(b);
+            if( orDecimal(a) > db )
                 return CMP_GREATER;
-            if( a->num.decimal < db )
+            if( orDecimal(a) < db )
                 return CMP_LESS;
             return CMP_EQUAL;
         }
-        else if( b->type == OT_DECIMAL )
-        {
-            if( a->num.decimal > b->num.decimal )
+        else if( orIs(b, OT_DECIMAL) )
+        {
+            if( orDecimal(a) > orDecimal(b) )
                 return CMP_GREATER;
-            if( a->num.decimal < b->num.decimal )
+            if( orDecimal(a) < orDecimal(b) )
                 return CMP_LESS;
             return CMP_EQUAL;
@@ -549 +549 @@
         return CMP_ERROR_B;
     }
-    else if( a->type == OT_TUPLE )
-    {
-        if( b->type == OT_TUPLE )
-        {
-            int i, argc;            
-            argc = a->argc > b->argc ? a->argc : b->argc;
-            for( i = 0; i < argc; i++ )
-            {
-                if ( a->tuple[i] > b->tuple[i] )
+    else if( orIs(a, OT_TUPLE) )
+    {
+        if( orIs(b, OT_TUPLE) )
+        {
+            int i, len;            
+            len = orTupleLen(a);
+            if( len < orTupleLen(b) )
+                return CMP_LESS;
+            if( len > orTupleLen(b) )
+                return CMP_GREATER;
+            for( i = 0; i < len; i++ )
+            {
+                if( a->tuple[i] > b->tuple[i] )
                     return CMP_GREATER;
-                if ( a->tuple[i] < b->tuple[i] )
+                if( a->tuple[i] < b->tuple[i] )
                     return CMP_LESS;
             }
-            return CMP_EQUAL;;
+            return CMP_EQUAL;
         }
         return CMP_ERROR_B;
@@ -718 +722 @@
 
             case OT_TUPLE:
-                logic = compareValue( a, b ); // tupleSame( a, b );
+                logic = (compareValue( a, b ) == CMP_EQUAL) ? 1 : 0;
                 break;