mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

py: Disable frozenset by default, enable on unix. 

Takes 416 text bytes on x86.
This commit is contained in:
Paul Sokolovsky 2014-05-10 16:11:04 +03:00
parent b181b581aa
commit d80e2476c7
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/mpconfig.h
View File

@ -237,7 +237,7 @@ typedef double mp_float_t;
// Whether to support frozenset object // Whether to support frozenset object
#ifndef MICROPY_ENABLE_FROZENSET #ifndef MICROPY_ENABLE_FROZENSET
#define MICROPY_ENABLE_FROZENSET (1) #define MICROPY_ENABLE_FROZENSET (0)
#endif #endif
// Whether to support the property object // Whether to support the property object

20
py/objset.c
View File

@ -51,40 +51,56 @@ typedef struct _mp_obj_set_it_t {
STATIC mp_obj_t set_it_iternext(mp_obj_t self_in); STATIC mp_obj_t set_it_iternext(mp_obj_t self_in);
STATIC bool is_set_or_frozenset(mp_obj_t o) { STATIC bool is_set_or_frozenset(mp_obj_t o) {
return MP_OBJ_IS_TYPE(o, &mp_type_set) || MP_OBJ_IS_TYPE(o, &mp_type_frozenset); return MP_OBJ_IS_TYPE(o, &mp_type_set)
#if MICROPY_ENABLE_FROZENSET
|| MP_OBJ_IS_TYPE(o, &mp_type_frozenset)
#endif
;
} }
#if MICROPY_ENABLE_FROZENSET
STATIC void check_set_or_frozenset(mp_obj_t o) { STATIC void check_set_or_frozenset(mp_obj_t o) {
if (!is_set_or_frozenset(o)) { if (!is_set_or_frozenset(o)) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'set' object required")); nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'set' object required"));
} }
} }
#else
#define check_set_or_frozenset(o) check_set(o)
#endif
STATIC void check_set(mp_obj_t o) { STATIC void check_set(mp_obj_t o) {
if (!MP_OBJ_IS_TYPE(o, &mp_type_set)) { if (!MP_OBJ_IS_TYPE(o, &mp_type_set)) {
// Emulate CPython behavior // Emulate CPython behavior
// AttributeError: 'frozenset' object has no attribute 'add' // AttributeError: 'frozenset' object has no attribute 'add'
#if MICROPY_ENABLE_FROZENSET
if (MP_OBJ_IS_TYPE(o, &mp_type_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")); nlr_raise(mp_obj_new_exception_msg(&mp_type_AttributeError, "'frozenset' has no such attribute"));
} }
#endif
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'set' object required")); nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'set' object required"));
} }
} }
STATIC void set_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { 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; mp_obj_set_t *self = self_in;
#if MICROPY_ENABLE_FROZENSET
bool is_frozen = MP_OBJ_IS_TYPE(self_in, &mp_type_frozenset); bool is_frozen = MP_OBJ_IS_TYPE(self_in, &mp_type_frozenset);
#endif
if (self->set.used == 0) { if (self->set.used == 0) {
#if MICROPY_ENABLE_FROZENSET
if (is_frozen) { if (is_frozen) {
print(env, "frozen"); print(env, "frozen");
} }
#endif
print(env, "set()"); print(env, "set()");
return; return;
} }
bool first = true; bool first = true;
#if MICROPY_ENABLE_FROZENSET
if (is_frozen) { if (is_frozen) {
print(env, "frozenset("); print(env, "frozenset(");
} }
#endif
print(env, "{"); print(env, "{");
for (int i = 0; i < self->set.alloc; i++) { for (int i = 0; i < self->set.alloc; i++) {
if (MP_SET_SLOT_IS_FILLED(&self->set, i)) { if (MP_SET_SLOT_IS_FILLED(&self->set, i)) {
@ -96,9 +112,11 @@ STATIC void set_print(void (*print)(void *env, const char *fmt, ...), void *env,
} }
} }
print(env, "}"); print(env, "}");
#if MICROPY_ENABLE_FROZENSET
if (is_frozen) { if (is_frozen) {
print(env, ")"); print(env, ")");
} }
#endif
} }

1
unix/mpconfigport.h
View File

@ -31,6 +31,7 @@
#define MICROPY_EMIT_INLINE_THUMB (0) #define MICROPY_EMIT_INLINE_THUMB (0)
#define MICROPY_ENABLE_GC (1) #define MICROPY_ENABLE_GC (1)
#define MICROPY_ENABLE_FINALISER (1) #define MICROPY_ENABLE_FINALISER (1)
#define MICROPY_ENABLE_FROZENSET (1)
#define MICROPY_MEM_STATS (1) #define MICROPY_MEM_STATS (1)
#define MICROPY_DEBUG_PRINTERS (1) #define MICROPY_DEBUG_PRINTERS (1)
#define MICROPY_ENABLE_REPL_HELPERS (1) #define MICROPY_ENABLE_REPL_HELPERS (1)