Changeset 32 for trunk/orca/op.c

Timestamp:

02/08/06 15:31:03 (3 years ago)

Author:

jvargas

Message:

orOpAdd now can handle expressions [tuple + integer]

Files:

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

trunk/orca/op.c

@@ -18 +18 @@
 ===========================================================================*/
 
-
+#include "os.h"
 #include "ovalue.h"
 
@@ -63 +63 @@
         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;
+            uint32_t tmp, i;
+            OValue* res;
+            
+            res = orRESULT;
+            orSetTF( res, OT_TUPLE );
+            
+            res->argc = a->argc > b->argc ? a->argc : b->argc;
+            for( i = 0; i < OR_TUPLE_MAX; i++ )
+            {
+                tmp = a->tuple[i] + b->tuple[i];
+                res->tuple[i] = tmp > 255 ? 255 : tmp;
+            }
+            
+            return;
+        }
+        else if( b->type == OT_INTEGER )
+        {
+            uint32_t tmp, i;
+            OValue *res, t;
+
+            memSet(&t, 0, sizeof(OValue));
+            orSetTF( &t, OT_TUPLE );
+            
+            t.argc = a->argc;
+            for( i = 0; i < t.argc; i++ )
+            {
+                tmp = a->tuple[i] + b->integer;
+                t.tuple[i] = tmp > 255 ? 255 : tmp;
+            }            
+
+            res = orRESULT;
+            memCpy(res, &t, sizeof(OValue));
+            return;
         }
 #if 0
-        else if( b->type == OT_INTEGER )
-        {
-                        orResult( OT_TUPLE, b->integer );
-                        return;
-        }
-                else if( b->type == OT_INTEGER )
-        {
-                        orResult( OT_TUPLE, b->integer );
-                        return;
+        else if( b->type == OT_DECIMAL)
+        {
+            orResult( OT_TUPLE, b->integer );
+            return;
         }
 #endif
-                a = b;
+        a = b;
     }
     else if( a->type == OT_TIME )