diff options
| author | Damien <damien.p.george@gmail.com> | 2013-12-21 18:17:45 +0000 |
|---|---|---|
| committer | Damien <damien.p.george@gmail.com> | 2013-12-21 18:17:45 +0000 |
| commit | d99b05282d14ceb0163cbcd059aa37bdb415af43 (patch) | |
| tree | 978135f9fe83d3c4d5b3c95f84cb104c0092936a /py/scope.c | |
| parent | e2880aa2fdc75298df487df7519d483acb03959c (diff) | |
Change object representation from 1 big union to individual structs.
A big change. Micro Python objects are allocated as individual structs
with the first element being a pointer to the type information (which
is itself an object). This scheme follows CPython. Much more flexible,
not necessarily slower, uses same heap memory, and can allocate objects
statically.
Also change name prefix, from py_ to mp_ (mp for Micro Python).
Diffstat (limited to 'py/scope.c')
| -rw-r--r-- | py/scope.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/py/scope.c b/py/scope.c index d72d130f2..7d55d3923 100644 --- a/py/scope.c +++ b/py/scope.c @@ -4,11 +4,11 @@ #include <assert.h> #include "misc.h" -#include "mpyconfig.h" +#include "mpconfig.h" #include "parse.h" #include "scope.h" -scope_t *scope_new(scope_kind_t kind, py_parse_node_t pn, uint unique_code_id, uint emit_options) { +scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, uint unique_code_id, uint emit_options) { scope_t *scope = m_new(scope_t, 1); scope->kind = kind; scope->parent = NULL; @@ -20,8 +20,8 @@ scope_t *scope_new(scope_kind_t kind, py_parse_node_t pn, uint unique_code_id, u break; case SCOPE_FUNCTION: case SCOPE_CLASS: - assert(PY_PARSE_NODE_IS_STRUCT(pn)); - scope->simple_name = PY_PARSE_NODE_LEAF_ARG(((py_parse_node_struct_t*)pn)->nodes[0]); + assert(MP_PARSE_NODE_IS_STRUCT(pn)); + scope->simple_name = MP_PARSE_NODE_LEAF_ARG(((mp_parse_node_struct_t*)pn)->nodes[0]); break; case SCOPE_LAMBDA: scope->simple_name = qstr_from_str_static("<lambda>"); |