Changeset 30 for trunk/orca/op.c

Timestamp:

02/08/06 00:06:15 (3 years ago)

Author:

jvargas

Message:

Added tuple support to orOpAdd

Files:

• trunk/orca/op.c (modified) (1 diff)

trunk/orca/op.c

@@ -59 +59 @@
         a = b;
     }
+    else if( a->type == OT_TUPLE )
+    {
+        if( b->type == OT_TUPLE )
+        {
+                        int tmp;
+                        OValue* res;
+                        
+                        res = orRESULT;
+                        orSetTF( res, OT_TUPLE );
+
+                        res->argc = a->argc > b->argc ? a->argc : b->argc;
+                        
+                        for( uint8_t i = 0; i < OR_TUPLE_MAX; i++ )
+                        {
+                                tmp = a->tuple[i] + b->tuple[i];
+                                res->tuple[i] = tmp > 255 ? 255 : tmp;
+                        }
+                        
+                        return;
+        }
 #if 0
-    else if( a->type == OT_TUPLE )
-    {
-        if( b->type == OT_TUPLE )
-        {
-        }
         else if( b->type == OT_INTEGER )
         {
-        }
-    }
+                        orResult( OT_TUPLE, b->integer );
+                        return;
+        }
+                else if( b->type == OT_INTEGER )
+        {
+                        orResult( OT_TUPLE, b->integer );
+                        return;
+        }
 #endif
+                a = b;
+    }
     else if( a->type == OT_TIME )
     {