commit 7b0f9a7d9b8a119093ea31c78368b5314bbf23a7
author Paul Sokolovsky <pfalcon@users.sourceforge.net> Sat May 10 04:26:10 2014 +0300
committer Paul Sokolovsky <pfalcon@users.sourceforge.net> Sat May 10 04:45:02 2014 +0300
tree c516ed5e4f985f1dc9426fc29b65ad4c580c084c
parent 070c78af5da2d202cece21f0ec24f549aa0f52fb

bytes: Implement comparison and other binary operations.

Should support everything supported by strings.

py/objstr.c

diff --git a/py/objstr.c b/py/objstr.c
index f2f8063..7ca8afc 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -251,11 +251,13 @@
 
 STATIC mp_obj_t str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     GET_STR_DATA_LEN(lhs_in, lhs_data, lhs_len);
+    mp_obj_type_t *lhs_type = mp_obj_get_type(lhs_in);
+    mp_obj_type_t *rhs_type = mp_obj_get_type(rhs_in);
     switch (op) {
         case MP_BINARY_OP_ADD:
         case MP_BINARY_OP_INPLACE_ADD:
-            if (MP_OBJ_IS_STR(rhs_in)) {
-                // add 2 strings
+            if (lhs_type == rhs_type) {
+                // add 2 strings or bytes
 
                 GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
                 int alloc_len = lhs_len + rhs_len;
@@ -270,7 +272,7 @@
 
                 // code for non-qstr
                 byte *data;
-                mp_obj_t s = mp_obj_str_builder_start(mp_obj_get_type(lhs_in), alloc_len, &data);
+                mp_obj_t s = mp_obj_str_builder_start(lhs_type, alloc_len, &data);
                 memcpy(data, lhs_data, lhs_len);
                 memcpy(data + lhs_len, rhs_data, rhs_len);
                 return mp_obj_str_builder_end(s);
@@ -279,7 +281,7 @@
 
         case MP_BINARY_OP_IN:
             /* NOTE `a in b` is `b.__contains__(a)` */
-            if (MP_OBJ_IS_STR(rhs_in)) {
+            if (lhs_type == rhs_type) {
                 GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
                 return MP_BOOL(find_subbytes(lhs_data, lhs_len, rhs_data, rhs_len, 1) != NULL);
             }
@@ -292,7 +294,7 @@
             }
             int n = MP_OBJ_SMALL_INT_VALUE(rhs_in);
             byte *data;
-            mp_obj_t s = mp_obj_str_builder_start(mp_obj_get_type(lhs_in), lhs_len * n, &data);
+            mp_obj_t s = mp_obj_str_builder_start(lhs_type, lhs_len * n, &data);
             mp_seq_multiply(lhs_data, sizeof(*lhs_data), lhs_len, n, data);
             return mp_obj_str_builder_end(s);
         }
@@ -310,14 +312,13 @@
             return str_modulo_format(lhs_in, n_args, args);
         }
 
-        // These 2 are never passed here, dealt with as a special case in mp_binary_op().
-        //case MP_BINARY_OP_EQUAL:
-        //case MP_BINARY_OP_NOT_EQUAL:
+        //case MP_BINARY_OP_NOT_EQUAL: // This is never passed here
+        case MP_BINARY_OP_EQUAL: // This will be passed only for bytes, str is dealt with in mp_obj_equal()
         case MP_BINARY_OP_LESS:
         case MP_BINARY_OP_LESS_EQUAL:
         case MP_BINARY_OP_MORE:
         case MP_BINARY_OP_MORE_EQUAL:
-            if (MP_OBJ_IS_STR(rhs_in)) {
+            if (lhs_type == rhs_type) {
                 GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
                 return MP_BOOL(mp_seq_cmp_bytes(op, lhs_data, lhs_len, rhs_data, rhs_len));
             }