py: Implement bool unary op; tidy up unary op dispatch.

dpgeorge · dpgeorge · commit 1e708fed188e · 2014-01-23T18:27:51.000Z
diff --git a/py/objbool.c b/py/objbool.c
@@ -6,6 +6,7 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
+#include "runtime0.h"
 #include "runtime.h"
 
 typedef struct _mp_obj_bool_t {
@@ -32,11 +33,24 @@ static mp_obj_t bool_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp
     }
 }
 
+static mp_obj_t bool_unary_op(int op, mp_obj_t o_in) {
+    machine_int_t value = ((mp_obj_bool_t*)o_in)->value;
+    switch (op) {
+        case RT_UNARY_OP_NOT: if (value) { return mp_const_false; } else { return mp_const_true; }
+        case RT_UNARY_OP_POSITIVE: return MP_OBJ_NEW_SMALL_INT(value);
+        case RT_UNARY_OP_NEGATIVE: return MP_OBJ_NEW_SMALL_INT(-value);
+        case RT_UNARY_OP_INVERT:
+        default: // no other cases
+            return MP_OBJ_NEW_SMALL_INT(~value);
+    }
+}
+
 const mp_obj_type_t bool_type = {
     { &mp_const_type },
     "bool",
     .print = bool_print,
     .make_new = bool_make_new,
+    .unary_op = bool_unary_op,
 };
 
 static const mp_obj_bool_t false_obj = {{&bool_type}, false};
diff --git a/py/objstr.c b/py/objstr.c
@@ -447,7 +447,7 @@ bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) {
         if (l1 != l2) {
             return false;
         }
-        return strncmp((const char*)d1, (const char*)d2, l1) == 0;
+        return memcmp(d1, d2, l1) == 0;
     }
 }
 
diff --git a/py/qstr.c b/py/qstr.c
@@ -106,7 +106,7 @@ qstr qstr_find_strn(const byte *str, uint str_len) {
     // search pools for the data
     for (qstr_pool_t *pool = last_pool; pool != NULL; pool = pool->prev) {
         for (const byte **q = pool->qstrs, **q_top = pool->qstrs + pool->len; q < q_top; q++) {
-            if (Q_GET_HASH(*q) == str_hash && Q_GET_LENGTH(*q) == str_len && strncmp((const char*)Q_GET_DATA(*q), (const char*)str, str_len) == 0) {
+            if (Q_GET_HASH(*q) == str_hash && Q_GET_LENGTH(*q) == str_len && memcmp(Q_GET_DATA(*q), str, str_len) == 0) {
                 return pool->total_prev_len + (q - pool->qstrs);
             }
         }
diff --git a/py/runtime.c b/py/runtime.c
@@ -479,16 +479,16 @@ mp_obj_t rt_unary_op(int op, mp_obj_t arg) {
             return MP_OBJ_NEW_SMALL_INT(val);
         }
         return mp_obj_new_int(val);
-    } else { // will be an object (small ints are caught in previous if)
-        mp_obj_base_t *o = arg;
-        if (o->type->unary_op != NULL) {
-            mp_obj_t result = o->type->unary_op(op, arg);
+    } else {
+        mp_obj_type_t *type = mp_obj_get_type(arg);
+        if (type->unary_op != NULL) {
+            mp_obj_t result = type->unary_op(op, arg);
             if (result != NULL) {
                 return result;
             }
         }
         // TODO specify in error message what the operator is
-        nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "bad operand type for unary operator: '%s'", o->type->name));
+        nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "bad operand type for unary operator: '%s'", type->name));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) {`
`447`	`447`	`if (l1 != l2) {`
`448`	`448`	`return false;`
`449`	`449`	`}`
`450`		`- return strncmp((const char)d1, (const char)d2, l1) == 0;`
	`450`	`+ return memcmp(d1, d2, l1) == 0;`
`451`	`451`	`}`
`452`	`452`	`}`
`453`	`453`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ qstr qstr_find_strn(const byte *str, uint str_len) {`
`106`	`106`	`// search pools for the data`
`107`	`107`	`for (qstr_pool_t *pool = last_pool; pool != NULL; pool = pool->prev) {`
`108`	`108`	`for (const byte q = pool->qstrs, q_top = pool->qstrs + pool->len; q < q_top; q++) {`
`109`		`- if (Q_GET_HASH(q) == str_hash && Q_GET_LENGTH(q) == str_len && strncmp((const char)Q_GET_DATA(q), (const char*)str, str_len) == 0) {`
	`109`	`+ if (Q_GET_HASH(q) == str_hash && Q_GET_LENGTH(q) == str_len && memcmp(Q_GET_DATA(*q), str, str_len) == 0) {`
`110`	`110`	`return pool->total_prev_len + (q - pool->qstrs);`
`111`	`111`	`}`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -479,16 +479,16 @@ mp_obj_t rt_unary_op(int op, mp_obj_t arg) {`
`479`	`479`	`return MP_OBJ_NEW_SMALL_INT(val);`
`480`	`480`	`}`
`481`	`481`	`return mp_obj_new_int(val);`
`482`		`- } else { // will be an object (small ints are caught in previous if)`
`483`		`- mp_obj_base_t *o = arg;`
`484`		`- if (o->type->unary_op != NULL) {`
`485`		`- mp_obj_t result = o->type->unary_op(op, arg);`
	`482`	`+ } else {`
	`483`	`+ mp_obj_type_t *type = mp_obj_get_type(arg);`
	`484`	`+ if (type->unary_op != NULL) {`
	`485`	`+ mp_obj_t result = type->unary_op(op, arg);`
`486`	`486`	`if (result != NULL) {`
`487`	`487`	`return result;`
`488`	`488`	`}`
`489`	`489`	`}`
`490`	`490`	`// TODO specify in error message what the operator is`
`491`		`- nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "bad operand type for unary operator: '%s'", o->type->name));`
	`491`	`+ nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "bad operand type for unary operator: '%s'", type->name));`
`492`	`492`	`}`
`493`	`493`	`}`
`494`	`494`