diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-05-24 23:03:12 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-05-24 23:03:12 +0100 |
| commit | ee3fd46f1383e984c968c4a82d634d7b0cea49b8 (patch) | |
| tree | 76eb38f9015df5d003f646ce019745426365021c /py/objset.c | |
| parent | d0ceb04b90ca7edd7e45b8eff1cdebdfa20a0cf8 (diff) | |
| download | micropython-ee3fd46f1383e984c968c4a82d634d7b0cea49b8.tar.gz micropython-ee3fd46f1383e984c968c4a82d634d7b0cea49b8.zip | |
Rename configuration variables controling Python features.
Now of the form MICROPY_PY_*. See issue #35.
Diffstat (limited to 'py/objset.c')
| -rw-r--r-- | py/objset.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/py/objset.c b/py/objset.c index 32c194db12..6a6a375faa 100644 --- a/py/objset.c +++ b/py/objset.c @@ -52,13 +52,13 @@ STATIC mp_obj_t set_it_iternext(mp_obj_t self_in); STATIC bool is_set_or_frozenset(mp_obj_t o) { return MP_OBJ_IS_TYPE(o, &mp_type_set) -#if MICROPY_ENABLE_FROZENSET +#if MICROPY_PY_FROZENSET || MP_OBJ_IS_TYPE(o, &mp_type_frozenset) #endif ; } -#if MICROPY_ENABLE_FROZENSET +#if MICROPY_PY_FROZENSET STATIC void check_set_or_frozenset(mp_obj_t o) { if (!is_set_or_frozenset(o)) { nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'set' object required")); @@ -72,7 +72,7 @@ STATIC void check_set(mp_obj_t o) { if (!MP_OBJ_IS_TYPE(o, &mp_type_set)) { // Emulate CPython behavior // AttributeError: 'frozenset' object has no attribute 'add' - #if MICROPY_ENABLE_FROZENSET + #if MICROPY_PY_FROZENSET if (MP_OBJ_IS_TYPE(o, &mp_type_frozenset)) { nlr_raise(mp_obj_new_exception_msg(&mp_type_AttributeError, "'frozenset' has no such attribute")); } @@ -83,11 +83,11 @@ STATIC void check_set(mp_obj_t o) { STATIC void set_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { mp_obj_set_t *self = self_in; - #if MICROPY_ENABLE_FROZENSET + #if MICROPY_PY_FROZENSET bool is_frozen = MP_OBJ_IS_TYPE(self_in, &mp_type_frozenset); #endif if (self->set.used == 0) { - #if MICROPY_ENABLE_FROZENSET + #if MICROPY_PY_FROZENSET if (is_frozen) { print(env, "frozen"); } @@ -96,7 +96,7 @@ STATIC void set_print(void (*print)(void *env, const char *fmt, ...), void *env, return; } bool first = true; - #if MICROPY_ENABLE_FROZENSET + #if MICROPY_PY_FROZENSET if (is_frozen) { print(env, "frozenset("); } @@ -112,7 +112,7 @@ STATIC void set_print(void (*print)(void *env, const char *fmt, ...), void *env, } } print(env, "}"); - #if MICROPY_ENABLE_FROZENSET + #if MICROPY_PY_FROZENSET if (is_frozen) { print(env, ")"); } @@ -556,7 +556,7 @@ const mp_obj_type_t mp_type_set = { .locals_dict = (mp_obj_t)&set_locals_dict, }; -#if MICROPY_ENABLE_FROZENSET +#if MICROPY_PY_FROZENSET const mp_obj_type_t mp_type_frozenset = { { &mp_type_type }, .name = MP_QSTR_frozenset, |