0
@@ -67,10 +67,9 @@ static inline OBJECT fixnum_mul(STATE, OBJECT a, OBJECT b) {
0
   }
0
 }
0
 
0
-static inline OBJECT fixnum_divmod(STATE, OBJECT a, OBJECT b) {
0
-  OBJECT ary;
0
-  long div, mod;
0
+static inline long fixnum_div(STATE, OBJECT a, OBJECT b, long *mod) {
0
   native_int x, y;
0
+  long div;
0
 
0
   x = N2I(a);
0
   y = N2I(b);
0
@@ -87,12 +86,22 @@ static inline OBJECT fixnum_divmod(STATE, OBJECT a, OBJECT b) {
0
     else
0
       div = x / y;
0
   }
0
-  mod = x - div*y;
0
-  if ((mod < 0 && y > 0) || (mod > 0 && y < 0)) {
0
-    mod += y;
0
+
0
+  *mod = x - div*y;
0
+  if ((*mod < 0 && y > 0) || (*mod > 0 && y < 0)) {
0
+    *mod += y;
0
     div -= 1;
0
   }
0
   
0
+  return div;
0
+}
0
+
0
+static inline OBJECT fixnum_divmod(STATE, OBJECT a, OBJECT b) {
0
+  OBJECT ary;
0
+  long div, mod;
0
+  
0
+  div = fixnum_div(state, a, b, &mod);
0
+  
0
   ary = array_new(state, 2);
0
   array_set(state, ary, 0, I2N(div));
0
   array_set(state, ary, 1, I2N(mod));

0
@@ -94,56 +94,82 @@ class ShotgunPrimitives
0
 
0
   def add
0
     <<-CODE
0
-    OBJECT t1;
0
-    
0
     GUARD(FIXNUM_P(msg->recv));
0
-    POP(t1, FIXNUM);
0
-    
0
-    RET(fixnum_add(state, msg->recv, t1));
0
+    OBJECT t1 = stack_pop();
0
+    if(FIXNUM_P(t1)) {
0
+      RET(fixnum_add(state, msg->recv, t1));
0
+    } else if(BIGNUM_P(t1)) {
0
+      RET(bignum_add(state, bignum_new(state, N2I(msg->recv)), t1));
0
+    } else if(FLOAT_P(t1)) {
0
+      OBJECT t2 = float_coerce(state, msg->recv);
0
+      RET(float_new(state, FLOAT_TO_DOUBLE(t2) + FLOAT_TO_DOUBLE(t1)));
0
+    } else {
0
+      FAIL();
0
+    }
0
     CODE
0
   end
0
   
0
   def bignum_add
0
     <<-CODE
0
-    OBJECT t1;
0
-    
0
     GUARD(BIGNUM_P(msg->recv));
0
-    POP(t1, BIGNUM);
0
-    
0
-    RET(bignum_add(state, msg->recv, t1));
0
+    OBJECT t1 = stack_pop();
0
+    if(BIGNUM_P(t1) || FIXNUM_P(t1)) {
0
+      RET(bignum_add(state, msg->recv, t1));
0
+    } else if(FLOAT_P(t1)) {
0
+      double a = bignum_to_double(state, msg->recv);
0
+      RET(float_new(state, a + FLOAT_TO_DOUBLE(t1)));
0
+    } else {
0
+      FAIL();
0
+    }
0
     CODE
0
   end
0
   
0
   def sub
0
     <<-CODE
0
-    OBJECT t1;
0
-    
0
     GUARD(FIXNUM_P(msg->recv));
0
-    POP(t1, FIXNUM);
0
-
0
-    RET(fixnum_sub(state, msg->recv, t1));
0
+    OBJECT t1 = stack_pop();
0
+    if(FIXNUM_P(t1)) {
0
+      RET(fixnum_sub(state, msg->recv, t1));
0
+    } else if(BIGNUM_P(t1)) {
0
+      RET(bignum_sub(state, bignum_new(state, N2I(msg->recv)), t1));
0
+    } else if(FLOAT_P(t1)) {
0
+      OBJECT t2 = float_coerce(state, msg->recv);
0
+      RET(float_new(state, FLOAT_TO_DOUBLE(t2) - FLOAT_TO_DOUBLE(t1)));
0
+    } else {
0
+      FAIL();
0
+    }
0
     CODE
0
   end
0
   
0
   def bignum_sub
0
     <<-CODE
0
-    OBJECT t1;
0
-
0
     GUARD(BIGNUM_P(msg->recv));
0
-    POP(t1, INTEGER);
0
-
0
-    RET(bignum_sub(state, msg->recv, t1));
0
+    OBJECT t1 = stack_pop();
0
+    if(BIGNUM_P(t1) || FIXNUM_P(t1)) {
0
+      RET(bignum_sub(state, msg->recv, t1));
0
+    } else if(FLOAT_P(t1)) {
0
+      double a = bignum_to_double(state, msg->recv);
0
+      RET(float_new(state, a - FLOAT_TO_DOUBLE(t1)));
0
+    } else {
0
+      FAIL();
0
+    }
0
     CODE
0
   end
0
   
0
   def fixnum_mul
0
     <<-CODE
0
-    OBJECT t1;
0
-
0
     GUARD(FIXNUM_P(msg->recv));
0
-    POP(t1, FIXNUM);
0
-
0
-    RET(fixnum_mul(state, msg->recv, t1));
0
+    OBJECT t1 = stack_pop();
0
+    if(FIXNUM_P(t1)) {
0
+      RET(fixnum_mul(state, msg->recv, t1));
0
+    } else if(BIGNUM_P(t1)) {
0
+      RET(bignum_mul(state, bignum_new(state, N2I(msg->recv)), t1));
0
+    } else if(FLOAT_P(t1)) {
0
+      OBJECT t2 = float_coerce(state, msg->recv);
0
+      RET(float_new(state, FLOAT_TO_DOUBLE(t2) * FLOAT_TO_DOUBLE(t1)));
0
+    } else {
0
+      FAIL();
0
+    }
0
     CODE
0
   end
0
   
0
@@ -155,39 +181,55 @@ class ShotgunPrimitives
0
 
0
   def bignum_mul
0
     <<-CODE
0
-    OBJECT t1;
0
-
0
     GUARD(BIGNUM_P(msg->recv));
0
-    POP(t1, INTEGER);
0
-
0
-    RET(bignum_mul(state, msg->recv, t1));
0
+    OBJECT t1 = stack_pop();
0
+    if(BIGNUM_P(t1) || FIXNUM_P(t1)) {
0
+      RET(bignum_mul(state, msg->recv, t1));
0
+    } else if(FLOAT_P(t1)) {
0
+      double a = bignum_to_double(state, msg->recv);
0
+      RET(float_new(state, a * FLOAT_TO_DOUBLE(t1)));
0
+    } else {
0
+      FAIL();
0
+    }
0
     CODE
0
   end
0
   
0
   def fixnum_div
0
     <<-CODE
0
-    OBJECT t1, t3;
0
-
0
     GUARD(FIXNUM_P(msg->recv));
0
-    POP(t1, FIXNUM);
0
-
0
-    GUARD( N2I(t1) != 0 ) // no divide by zero
0
-
0
-    t3 = fixnum_divmod(state, msg->recv, t1);
0
-    RET(array_get(state, t3, 0));
0
+    OBJECT t1 = stack_pop();
0
+    if(FIXNUM_P(t1)) {
0
+      long mod;
0
+      GUARD(N2I(t1) != 0) // no divide by zero
0
+      RET(I2N(fixnum_div(state, msg->recv, t1, &mod)));
0
+    } else if(BIGNUM_P(t1)) {
0
+      GUARD(!bignum_is_zero(state, t1));    
0
+      RET(bignum_div(state, bignum_new(state, N2I(msg->recv)), t1));
0
+    } else if(FLOAT_P(t1)) {
0
+      OBJECT t2 = float_coerce(state, msg->recv);
0
+      RET(float_new(state, FLOAT_TO_DOUBLE(t2) / FLOAT_TO_DOUBLE(t1)));
0
+    } else {
0
+      FAIL();
0
+    }
0
     CODE
0
   end
0
   
0
   def bignum_div
0
     <<-CODE
0
-    OBJECT t1;
0
-
0
     GUARD(BIGNUM_P(msg->recv));
0
-    POP(t1, BIGNUM);
0
-
0
-    // Can this ever happen since bignum will always be > zero?
0
-    GUARD(!bignum_is_zero(state, t1));    
0
-    RET(bignum_div(state, msg->recv, t1));
0
+    OBJECT t1 = stack_pop();
0
+    if(BIGNUM_P(t1)) {
0
+      GUARD(!bignum_is_zero(state, t1));    
0
+      RET(bignum_div(state, msg->recv, t1));
0
+    } else if(FIXNUM_P(t1)) {
0
+      GUARD(N2I(t1) != 0) // no divide by zero
0
+      RET(bignum_div(state, msg->recv, t1));
0
+    } else if(FLOAT_P(t1)) {
0
+      double a = bignum_to_double(state, msg->recv);
0
+      RET(float_new(state, a / FLOAT_TO_DOUBLE(t1)));
0
+    } else {
0
+      FAIL();
0
+    }
0
     CODE
0
   end
0
 
0
@@ -1696,15 +1738,15 @@ class ShotgunPrimitives
0
 
0
   def fixnum_modulo
0
     <<-CODE
0
-    OBJECT t1, t3;
0
+    OBJECT t1;
0
 
0
     GUARD(FIXNUM_P(msg->recv));
0
     POP(t1, FIXNUM);
0
 
0
-    GUARD( N2I(t1) != 0 ) // no divide by zero
0
-
0
-    t3 = fixnum_divmod(state, msg->recv, t1);
0
-    RET(array_get(state, t3, 1));
0
+    GUARD(N2I(t1) != 0) // no divide by zero
0
+    long mod;
0
+    fixnum_div(state, msg->recv, t1, &mod);
0
+    RET(I2N(mod));
0
     CODE
0
   end
0