bdbe8c9ae2
Fixes #1684 and makes "not" match Python semantics. The code is also simplified (the separate MP_BC_NOT opcode is removed) and the patch saves 68 bytes for bare-arm/ and 52 bytes for minimal/. Previously "not x" was implemented as !mp_unary_op(x, MP_UNARY_OP_BOOL), so any given object only needs to implement MP_UNARY_OP_BOOL (and the VM had a special opcode to do the ! bit). With this patch "not x" is implemented as mp_unary_op(x, MP_UNARY_OP_NOT), but this operation is caught at the start of mp_unary_op and dispatched as !mp_obj_is_true(x). mp_obj_is_true has special logic to test for truthness, and is the correct way to handle the not operation.
97 lines
3.4 KiB
C
97 lines
3.4 KiB
C
/*
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include "py/obj.h"
|
|
#include "py/runtime0.h"
|
|
#include "py/runtime.h"
|
|
|
|
typedef struct _mp_obj_bool_t {
|
|
mp_obj_base_t base;
|
|
bool value;
|
|
} mp_obj_bool_t;
|
|
|
|
STATIC void bool_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
|
|
mp_obj_bool_t *self = MP_OBJ_TO_PTR(self_in);
|
|
if (MICROPY_PY_UJSON && kind == PRINT_JSON) {
|
|
if (self->value) {
|
|
mp_print_str(print, "true");
|
|
} else {
|
|
mp_print_str(print, "false");
|
|
}
|
|
} else {
|
|
if (self->value) {
|
|
mp_print_str(print, "True");
|
|
} else {
|
|
mp_print_str(print, "False");
|
|
}
|
|
}
|
|
}
|
|
|
|
STATIC mp_obj_t bool_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
|
|
(void)type_in;
|
|
mp_arg_check_num(n_args, n_kw, 0, 1, false);
|
|
|
|
switch (n_args) {
|
|
case 0:
|
|
return mp_const_false;
|
|
case 1:
|
|
default: // must be 0 or 1
|
|
if (mp_obj_is_true(args[0])) { return mp_const_true; } else { return mp_const_false; }
|
|
}
|
|
}
|
|
|
|
STATIC mp_obj_t bool_unary_op(mp_uint_t op, mp_obj_t o_in) {
|
|
mp_int_t value = ((mp_obj_bool_t*)MP_OBJ_TO_PTR(o_in))->value;
|
|
switch (op) {
|
|
case MP_UNARY_OP_BOOL: return o_in;
|
|
// needs to hash to the same value as if converting to an integer
|
|
case MP_UNARY_OP_HASH: return MP_OBJ_NEW_SMALL_INT(value);
|
|
case MP_UNARY_OP_POSITIVE: return MP_OBJ_NEW_SMALL_INT(value);
|
|
case MP_UNARY_OP_NEGATIVE: return MP_OBJ_NEW_SMALL_INT(-value);
|
|
case MP_UNARY_OP_INVERT: return MP_OBJ_NEW_SMALL_INT(~value);
|
|
default: return MP_OBJ_NULL; // op not supported
|
|
}
|
|
}
|
|
|
|
STATIC mp_obj_t bool_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
|
|
mp_obj_bool_t *self = MP_OBJ_TO_PTR(lhs_in);
|
|
return mp_binary_op(op, MP_OBJ_NEW_SMALL_INT(self->value), rhs_in);
|
|
}
|
|
|
|
const mp_obj_type_t mp_type_bool = {
|
|
{ &mp_type_type },
|
|
.name = MP_QSTR_bool,
|
|
.print = bool_print,
|
|
.make_new = bool_make_new,
|
|
.unary_op = bool_unary_op,
|
|
.binary_op = bool_binary_op,
|
|
};
|
|
|
|
const mp_obj_bool_t mp_const_false_obj = {{&mp_type_bool}, false};
|
|
const mp_obj_bool_t mp_const_true_obj = {{&mp_type_bool}, true};
|