diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-04 15:57:35 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-04 15:57:35 +0000 |
| commit | eb7bfcb28697f6fb2d4d933bc39233aa15423a20 (patch) | |
| tree | 54b38d50cac986fba791fb0eb00804069c41e9c3 /py/objinstance.c | |
| parent | e67ed5d285bb2ae7b83eb8be3ee488ab08fa4db1 (diff) | |
Split qstr into pools, and put initial pool in ROM.
Qstr's are now split into a linked-list of qstr pools. This has 2
benefits: the first pool can be in ROM (huge benefit, since we no longer
use RAM for the core qstrs), and subsequent pools use m_new for the next
pool instead of m_renew (thus avoiding a huge single table for all the
qstrs).
Still would be better to use a hash table, but this scheme takes us part
of the way (eventually convert the pools to hash tables).
Also fixed bug with import.
Also improved the way the module code is referenced (not magic number 1
anymore).
Diffstat (limited to 'py/objinstance.c')
| -rw-r--r-- | py/objinstance.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/py/objinstance.c b/py/objinstance.c index e5d23af2d..6cfcdf6c1 100644 --- a/py/objinstance.c +++ b/py/objinstance.c @@ -6,6 +6,7 @@ #include "nlr.h" #include "misc.h" #include "mpconfig.h" +#include "mpqstr.h" #include "obj.h" #include "runtime.h" #include "map.h" @@ -44,7 +45,7 @@ mp_obj_t mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr) { return elem->value; } } - nlr_jump(mp_obj_new_exception_msg_2_args(rt_q_AttributeError, "'%s' object has no attribute '%s'", mp_obj_get_type_str(self_in), qstr_str(attr))); + nlr_jump(mp_obj_new_exception_msg_2_args(MP_QSTR_AttributeError, "'%s' object has no attribute '%s'", mp_obj_get_type_str(self_in), qstr_str(attr))); } void mp_obj_instance_load_method(mp_obj_t self_in, qstr attr, mp_obj_t *dest) { |