commit 9b00dad7bb0125a3459ca4f9c939c7510bd2f77f
author Paul Sokolovsky <pfalcon@users.sourceforge.net> Mon Jan 27 09:05:50 2014 +0200
committer Paul Sokolovsky <pfalcon@users.sourceforge.net> Mon Jan 27 12:25:23 2014 +0200
tree bef9918585abfaab1b9f777c2f2f03a331df3719
parent ddf1aa9223a2786c64df07ea686ecfe6ee83d1b2

long int: Implement more operations.

py/objint_longlong.c

diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index 7eaee3b..38a0183 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -32,6 +32,17 @@
     }
 }
 
+mp_obj_t int_unary_op(int op, mp_obj_t o_in) {
+    mp_obj_int_t *o = o_in;
+    switch (op) {
+        case RT_UNARY_OP_NOT: return MP_BOOL(o->val != 0); // TODO: implements RT_UNARY_OP_BOOL
+        case RT_UNARY_OP_POSITIVE: return o_in;
+        case RT_UNARY_OP_NEGATIVE: return mp_obj_new_int_from_ll(-o->val);
+        case RT_UNARY_OP_INVERT: return mp_obj_new_int_from_ll(~o->val);
+        default: return NULL; // op not supported
+    }
+}
+
 mp_obj_t int_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     mp_obj_int_t *lhs = lhs_in;
     mp_obj_int_t *rhs = rhs_in;
@@ -50,13 +61,23 @@
             return mp_obj_new_int_from_ll(lhs->val + rhs_val);
         case RT_BINARY_OP_SUBTRACT:
             return mp_obj_new_int_from_ll(lhs->val - rhs_val);
+        case RT_BINARY_OP_MULTIPLY:
+            return mp_obj_new_int_from_ll(lhs->val * rhs_val);
+        case RT_BINARY_OP_FLOOR_DIVIDE:
+            return mp_obj_new_int_from_ll(lhs->val / rhs_val);
+        case RT_BINARY_OP_MODULO:
+            return mp_obj_new_int_from_ll(lhs->val % rhs_val);
 
         case RT_BINARY_OP_INPLACE_ADD:
-            lhs->val += rhs_val;
-            return lhs;
+            lhs->val += rhs_val; return lhs;
         case RT_BINARY_OP_INPLACE_SUBTRACT:
-            lhs->val -= rhs_val;
-            return lhs;
+            lhs->val -= rhs_val; return lhs;
+        case RT_BINARY_OP_INPLACE_MULTIPLY:
+            lhs->val *= rhs_val; return lhs;
+        case RT_BINARY_OP_INPLACE_FLOOR_DIVIDE:
+            lhs->val /= rhs_val; return lhs;
+        case RT_BINARY_OP_INPLACE_MODULO:
+            lhs->val %= rhs_val; return lhs;
 
         case RT_BINARY_OP_AND:
             return mp_obj_new_int_from_ll(lhs->val & rhs_val);
@@ -65,11 +86,23 @@
         case RT_BINARY_OP_XOR:
             return mp_obj_new_int_from_ll(lhs->val ^ rhs_val);
 
+        case RT_BINARY_OP_INPLACE_AND:
+            lhs->val &= rhs_val; return lhs;
+        case RT_BINARY_OP_INPLACE_OR:
+            lhs->val |= rhs_val; return lhs;
+        case RT_BINARY_OP_INPLACE_XOR:
+            lhs->val ^= rhs_val; return lhs;
+
         case RT_BINARY_OP_LSHIFT:
             return mp_obj_new_int_from_ll(lhs->val << (int)rhs_val);
         case RT_BINARY_OP_RSHIFT:
             return mp_obj_new_int_from_ll(lhs->val >> (int)rhs_val);
 
+        case RT_BINARY_OP_INPLACE_LSHIFT:
+            lhs->val <<= (int)rhs_val; return lhs;
+        case RT_BINARY_OP_INPLACE_RSHIFT:
+            lhs->val >>= (int)rhs_val; return lhs;
+
         case RT_COMPARE_OP_LESS:
             return MP_BOOL(lhs->val < rhs_val);
         case RT_COMPARE_OP_MORE: