Changeset 144 for trunk/orca/math.c

Timestamp:

05/11/06 14:23:03 (3 years ago)

Author:

krobillard

Message:

Native arguments are now kept on the stack until after the call and the
result is now always put into a1.

Files:

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

trunk/orca/math.c

@@ -170 +170 @@
 
 
-static void orOpPower( OValue* a )
+static void orOpPower( OValue* a1 )
 {
     double x, y;
-    OValue* b = a + 1;
-    if( a->type == OT_INTEGER )
+    OValue* b = a1 + 1;
+    if( a1->type == OT_INTEGER )
     {
         if( b->type == OT_INTEGER )
@@ -182 +182 @@
             if( n )
             {
-                sum = orInt(a);
+                sum = orInt(a1);
                 while( --n )
-                    sum *= orInt(a);
+                    sum *= orInt(a1);
             }
             else
@@ -195 +195 @@
         else if( b->type == OT_DECIMAL )
         {
-            x = (double) orInt(a);
+            x = (double) orInt(a1);
             y = orDecimal(b);
             goto fp;
         }
-        a = b;
-    }
-    else if( a->type == OT_DECIMAL )
-    {
-        x = orDecimal(a);
+        a1 = b;
+    }
+    else if( a1->type == OT_DECIMAL )
+    {
+        x = orDecimal(a1);
         if( b->type == OT_INTEGER )
         {
@@ -214 +214 @@
             goto fp;
         }
-        a = b;
-    }
-    orErrorOp( "**", a );
+        a1 = b;
+    }
+    orErrorOp( "**", a1 );
     return;
 
@@ -224 +224 @@
 
 
-static void orOpRemainder( OValue* a )
+static void orOpRemainder( OValue* a1 )
 {
     double x, y;
-    OValue* b = a + 1;
-    if( a->type == OT_INTEGER )
+    OValue* b = a1 + 1;
+    if( a1->type == OT_INTEGER )
     {
         if( b->type == OT_INTEGER )
         {
-            orResult( OT_INTEGER, orInt(a) % orInt(b) );
+            orResult( OT_INTEGER, orInt(a1) % orInt(b) );
             return;
         }
         else if( b->type == OT_DECIMAL )
         {
-            x = (double) orInt(a);
+            x = (double) orInt(a1);
             y = orDecimal(b);
             goto fp;
         }
-        a = b;
-    }
-    else if( a->type == OT_DECIMAL )
-    {
-        x = orDecimal(a);
+        a1 = b;
+    }
+    else if( a1->type == OT_DECIMAL )
+    {
+        x = orDecimal(a1);
         if( b->type == OT_INTEGER )
         {
@@ -256 +256 @@
             goto fp;
         }
-        a = b;
-    }
-    orErrorOp( "//", a );
+        a1 = b;
+    }
+    orErrorOp( "//", a1 );
     return;