Changeset 175 for trunk/thune/eval.c

Timestamp:

06/08/06 22:00:46 (3 years ago)

Author:

krobillard

Message:

Thune - Added 'div. Algebraic operators now accept int!/decimal!.

Files:

• trunk/thune/eval.c (modified) (4 diffs)

trunk/thune/eval.c

@@ -1193 +1193 @@
 
 
-// (number number -- number)
+#define MJ_INT_INT  0
+#define MJ_INT_DEC  1
+#define MJ_DEC_INT  2
+#define MJ_DEC_DEC  3
+#define MJ_NAN      4
+
+static int _mathJumpIndex( const UCell* a, const UCell* b )
+{
+    if( ur_is(a, UT_INT) )
+    {
+        if( ur_is(b, UT_INT) )
+            return MJ_INT_INT;
+        if( ur_is(b, UT_DECIMAL) )
+            return MJ_INT_DEC;
+    }
+    else if( ur_is(a, UT_DECIMAL) )
+    {
+        if( ur_is(b, UT_INT) )
+            return MJ_DEC_INT;
+        if( ur_is(b, UT_DECIMAL) )
+            return MJ_DEC_DEC;
+    }
+    return MJ_NAN;
+}
+
+
+#define MATH_OPERATION(OP) \
+    switch( _mathJumpIndex(res, tos) ) { \
+        case MJ_INT_INT: \
+            ur_int(res) = ur_int(res) OP ur_int(tos); \
+            break; \
+        case MJ_INT_DEC: \
+            ur_setType(res, UT_DECIMAL); \
+            ur_decimal(res) = ((double) ur_int(res)) OP ur_decimal(tos); \
+            break; \
+        case MJ_DEC_INT: \
+            ur_decimal(res) = ur_decimal(res) OP ((double) ur_int(tos)); \
+            break; \
+        case MJ_DEC_DEC: \
+            ur_decimal(res) = ur_decimal(res) OP ur_decimal(tos); \
+            break; \
+        case MJ_NAN: \
+            ur_throwErr( ur_thread, UR_EX_DATATYPE, \
+                         "Math operator requires int!/decimal!" ); \
+            break; \
+    }
+
+
+// (number number -- sum)
 UR_CALL( uc_add )
 {
@@ -1203 +1251 @@
     else
     {
-        ur_int(UR_TOS) += ur_int(tos);
-    }
-}
-
-
-// (number number -- diff)
+        UCell* res = UR_TOS;
+        MATH_OPERATION( + )
+    }
+}
+
+
+// (number number -- difference)
 UR_CALL( uc_sub )
 {
@@ -1218 +1267 @@
     else
     {
-        ur_int(UR_TOS) -= ur_int(tos);
-    }
-}
-
-
-// (number number -- number)
+        UCell* res = UR_TOS;
+        MATH_OPERATION( - )
+    }
+}
+
+
+// (number number -- product)
 UR_CALL( uc_mult )
 {
+    UCell* res;
+
     UR_S_DROP;
-    ur_int(UR_TOS) *= ur_int(tos);
+    res = UR_TOS;
+
+    MATH_OPERATION( * )
+}
+
+
+// (number number -- quotient)
+UR_CALL( uc_div )
+{
+    UCell* res;
+
+    UR_S_DROP;
+    res = UR_TOS;
+
+    MATH_OPERATION( / )
 }
 
@@ -1954 +2020 @@
     { uc_sub,          "sub" },
     { uc_mult,         "mult" },
+    { uc_div,          "div" },
     { uc_equal,        "eq?" },
     { uc_sameQ,        "same?" },