Changeset 36 for trunk/orca/op.c

Timestamp:

02/09/06 11:18:55 (3 years ago)

Author:

jvargas

Message:

Finished support of tuples for all operator actions.
XOR OR and AND have slightly different behavior than REBOL when arguments are a tuple and a number. ie:

O> 1.2.1 xor 2015.345 ;== 222.221.222
R> 1.2.1 xor 2015.345 ;== 255.255.255

Files:

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

trunk/orca/op.c

@@ -546 +546 @@
                 return CMP_LESS;
             return CMP_EQUAL;
+        }
+        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] )
+                    return CMP_GREATER;
+                if ( a->tuple[i] < b->tuple[i] )
+                    return CMP_LESS;
+            }
+            return CMP_EQUAL;;
         }
         return CMP_ERROR_B;
@@ -700 +717 @@
 
             case OT_TUPLE:
-                logic = tupleSame( a, b );
+                logic = compareValue( a, b ); // tupleSame( a, b );
                 break;
 
@@ -822 +839 @@
         else if( a->type == OT_TUPLE )
         {
-            logic = tupleSame( a, b );
+            logic = compareValue( a, b ); // tupleSame( a, b );
         }
     }
@@ -898 +915 @@
         a = b;
     }
+    else if( a->type == OT_TUPLE )
+    {
+        if( b->type == OT_TUPLE )
+        {
+            int argc, i;            
+            argc = a->argc > b->argc ? a->argc : b->argc;
+            for( i = 0; i < argc; i++ )
+            {
+                a->tuple[i] = a->tuple[i] & b->tuple[i];
+            }
+            return;
+        }
+        else if( b->type == OT_INTEGER )
+        {
+            int i;
+            for( i = 0; i < a->argc; i++ )
+            {
+                a->tuple[i] = a->tuple[i] & b->integer;
+            }            
+            return;
+        }
+        else if( b->type == OT_DECIMAL)
+        {
+            int i;
+            for( i = 0; i < a->argc; i++ )
+            {
+                a->tuple[i] = a->tuple[i] & (int) b->num.decimal;
+            }            
+            return;
+        }
+        a = b;
+    }
     orErrorOp( "and", a );
 }
@@ -923 +972 @@
         a = b;
     }
+    else if( a->type == OT_TUPLE )
+    {
+        if( b->type == OT_TUPLE )
+        {
+            int argc, i;            
+            argc = a->argc > b->argc ? a->argc : b->argc;
+            for( i = 0; i < argc; i++ )
+            {
+                a->tuple[i] = a->tuple[i] | b->tuple[i];
+            }
+            return;
+        }
+        else if( b->type == OT_INTEGER )
+        {
+            int i;
+            for( i = 0; i < a->argc; i++ )
+            {
+                a->tuple[i] = a->tuple[i] | b->integer;
+            }            
+            return;
+        }
+        else if( b->type == OT_DECIMAL)
+        {
+            int i;
+            for( i = 0; i < a->argc; i++ )
+            {
+                a->tuple[i] = a->tuple[i] | (int) b->num.decimal;
+            }            
+            return;
+        }
+        a = b;
+    }
     orErrorOp( "or", a );
 }
@@ -944 +1025 @@
         {
             orResult( OT_LOGIC, a->integer ^ b->integer );
+            return;
+        }
+        a = b;
+    }
+    else if( a->type == OT_TUPLE )
+    {
+        if( b->type == OT_TUPLE )
+        {
+            int argc, i;            
+            argc = a->argc > b->argc ? a->argc : b->argc;
+            for( i = 0; i < argc; i++ )
+            {
+                a->tuple[i] = a->tuple[i] ^ b->tuple[i];
+            }
+            return;
+        }
+        else if( b->type == OT_INTEGER )
+        {
+            int i;
+            for( i = 0; i < a->argc; i++ )
+            {
+                a->tuple[i] = a->tuple[i] ^ b->integer;
+            }            
+            return;
+        }
+        else if( b->type == OT_DECIMAL)
+        {
+            int i;
+            for( i = 0; i < a->argc; i++ )
+            {
+                a->tuple[i] = a->tuple[i] ^ (int) b->num.decimal;
+            }            
             return;
         }