Changeset 505 for trunk/thune/math.c

Timestamp:

02/05/08 16:46:07 (10 months ago)

Author:

krobillard

Message:

Math functions no longer drop TOS when a datatype error occurs.

Files:

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

trunk/thune/math.c

@@ -244 +244 @@
 #define MATH_OPERATION_END \
         default: \
+            UR_S_GROW; \
             ur_throwErr( UR_ERR_DATATYPE, \
                          "Math operator requires int!/decimal!/vec3!" ); \
@@ -388 +389 @@
 
 
+static void logicError( UThread* ut, const char* name )
+{
+    ur_throwErr( UR_ERR_DATATYPE, "%s expected int!/logic!/char!", name );
+}
+
+
 // (number number -- and)
 UR_CALL( uc_and )
 {
-    UCell* res;
-    UR_S_DROP;
-    res = UR_TOS;
+    UCell* res = ur_s_prev(UR_TOS);
 
     if( UR_IS_ANY3(tos, UT_INT, UT_LOGIC, UT_CHAR) &&
         UR_IS_ANY3(res, UT_INT, UT_LOGIC, UT_CHAR) )
     {
+        UR_S_DROP;
         ur_initType(res, UT_INT);
         ur_int(res) &= ur_int(tos);
     }
+    else
+        logicError(ut,"and"); 
 }
 
@@ -407 +415 @@
 UR_CALL( uc_or )
 {
-    UCell* res;
-    UR_S_DROP;
-    res = UR_TOS;
+    UCell* res = ur_s_prev(UR_TOS);
 
     if( UR_IS_ANY3(tos, UT_INT, UT_LOGIC, UT_CHAR) &&
         UR_IS_ANY3(res, UT_INT, UT_LOGIC, UT_CHAR) )
     {
+        UR_S_DROP;
         ur_initType(res, UT_INT);
         ur_int(res) |= ur_int(tos);
     }
+    else
+        logicError(ut,"or"); 
 }
 
@@ -423 +432 @@
 UR_CALL( uc_xor )
 {
-    UCell* res;
-    UR_S_DROP;
-    res = UR_TOS;
+    UCell* res = ur_s_prev(UR_TOS);
 
     if( UR_IS_ANY3(tos, UT_INT, UT_LOGIC, UT_CHAR) &&
         UR_IS_ANY3(res, UT_INT, UT_LOGIC, UT_CHAR) )
     {
+        UR_S_DROP;
         ur_initType(res, UT_INT);
         ur_int(res) ^= ur_int(tos);
     }
+    else
+        logicError(ut,"xor"); 
 }
 
@@ -479 +489 @@
             break;
         default:
-            ur_throwErr( UR_ERR_DATATYPE,
-                         "Invalid type for 'minimum" );
+            UR_S_GROW;
+            ur_throwErr( UR_ERR_DATATYPE, "Invalid type for 'minimum" );
             break;
     }
@@ -529 +539 @@
             break;
         default:
+            UR_S_GROW;
             ur_throwErr( UR_ERR_DATATYPE, "Invalid type for 'maximum" );
             break;