Changeset 58 for trunk/orca/op.c

Timestamp:

02/21/06 23:18:49 (3 years ago)

Author:

jvargas

Message:

- Regression op_math_tuples PASS when in using Rebol compatible mode

Files:

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

trunk/orca/op.c

@@ -671 +671 @@
 }
 
-#if 0
-static int tupleSame( const OValue* a, const OValue* b )
-{
-    if( a->argc == b->argc )
-    {
-        int i;
-        for( i = 0; i < a->argc; ++i )
-        {
-            if( a->tuple[i] != b->tuple[i] )
-                return 0;
-        }
-        return 1;
-    }
-    return 0;
-}
-#endif
-
 
 static int orTypeEqual( const OValue* a, const OValue* b )
@@ -826 +809 @@
     else if( orType(a) == orType(b) )
     {
-        if( orIs(a, OT_WORD) ) // Should it be orIsWord(a)
+        if( orIs(a, OT_WORD) )
         {
             if( (a->word.atom == b->word.atom) &&
@@ -837 +820 @@
                 logic = 1;
         }
-        else if( orIsSeries(a->type) )
+        else if( orIsSeries( orType(a) ) )
         {
             if( (a->series.n == b->series.n) &&
@@ -845 +828 @@
         else if( orIs(a, OT_TUPLE) )
         {
-            logic = compareValue( a, b ); // tupleSame( a, b );
+            logic = compareValue( a, b );
         }
     }
@@ -925 +908 @@
         if( orIs(b, OT_TUPLE) )
         {
-            int argc, i;            
-            argc = a->argc > b->argc ? a->argc : b->argc;
-            for( i = 0; i < argc; i++ )
+            int i;            
+            a->argc = a->argc > b->argc ? a->argc : b->argc;
+            for( i = 0; i < a->argc; i++ )
             {
                 a->tuple[i] = a->tuple[i] & b->tuple[i];
@@ -947 +930 @@
             for( i = 0; i < a->argc; i++ )
             {
-                a->tuple[i] = a->tuple[i] & (int) orDecimal(b);
+                a->tuple[i] = a->tuple[i] & (int) orDecimal(b);                     
             }            
             return;
@@ -982 +965 @@
         if( orIs(b, OT_TUPLE) )
         {
-            int argc, i;            
-            argc = a->argc > b->argc ? a->argc : b->argc;
-            for( i = 0; i < argc; i++ )
+            int i;            
+            a->argc = a->argc > b->argc ? a->argc : b->argc;
+            for( i = 0; i < a->argc; i++ )
             {
                 a->tuple[i] = a->tuple[i] | b->tuple[i];
@@ -993 +976 @@
         {
             int i;
+#ifndef LANG_ORCA
+            int tmp;
+#endif
             for( i = 0; i < a->argc; i++ )
             {
+#ifdef LANG_ORCA
                 a->tuple[i] = a->tuple[i] | orInt(b);
+#else
+                tmp =  orToByteRange( orInt(b) );
+                if ( tmp == 0)
+                    a->tuple[i] = 0;
+                else if ( tmp == 255 )
+                    a->tuple[i] = 255;
+                else
+                    a->tuple[i] = a->tuple[i] | orInt(b);
+#endif
             }            
             return;
@@ -1002 +998 @@
         {
             int i;
+#ifndef LANG_ORCA
+            int tmp;
+#endif
             for( i = 0; i < a->argc; i++ )
             {
+#ifdef LANG_ORCA
                 a->tuple[i] = a->tuple[i] | (int) orDecimal(b);
+#else
+                tmp =  orToByteRange( (int) orDecimal(b) );
+                if ( tmp == 0)
+                    a->tuple[i] = 0;
+                else if ( tmp == 255 )
+                    a->tuple[i] = 255;
+                else
+                    a->tuple[i] = a->tuple[i] | orToByteRange( (int) orDecimal(b) );
+#endif
             }            
             return;
@@ -1039 +1048 @@
         if( orIs(b, OT_TUPLE) )
         {
-            int argc, i;            
-            argc = a->argc > b->argc ? a->argc : b->argc;
-            for( i = 0; i < argc; i++ )
+            int i;            
+            a->argc = a->argc > b->argc ? a->argc : b->argc;
+            for( i = 0; i < a->argc; i++ )
             {
                 a->tuple[i] = a->tuple[i] ^ b->tuple[i];
@@ -1050 +1059 @@
         {
             int i;
+#ifndef LANG_ORCA
+            int tmp;
+#endif
             for( i = 0; i < a->argc; i++ )
             {
+#ifdef LANG_ORCA
                 a->tuple[i] = a->tuple[i] ^ orInt(b);
+#else
+                tmp =  orToByteRange( orInt(b) );
+                if ( tmp == 0)
+                    a->tuple[i] = 0;
+                else if ( tmp == 255 )
+                    a->tuple[i] = 255;
+                else
+                    a->tuple[i] = a->tuple[i] ^ orToByteRange( orInt(b) );
+#endif
             }            
             return;
@@ -1059 +1081 @@
         {
             int i;
+#ifndef LANG_ORCA
+            int tmp;
+#endif
             for( i = 0; i < a->argc; i++ )
             {
+#ifdef LANG_ORCA
                 a->tuple[i] = a->tuple[i] ^ (int) orDecimal(b);
+#else
+                tmp =  orToByteRange( (int) orDecimal(b) );
+                if ( tmp == 0)
+                    a->tuple[i] = 0;
+                else if ( tmp == 255 )
+                    a->tuple[i] = 255;
+                else
+                    a->tuple[i] = a->tuple[i] ^ orToByteRange( (int) orDecimal(b) );
+#endif
             }            
             return;