diff options
| author | John R. Lenton <jlenton@gmail.com> | 2014-01-04 14:16:24 +0000 |
|---|---|---|
| committer | John R. Lenton <jlenton@gmail.com> | 2014-01-04 14:16:24 +0000 |
| commit | 505dd00f07f984abed50024df6f88820cceba7db (patch) | |
| tree | 4ef614d9811df3cdb814257d12a0b3b247a35de9 /py/compile.c | |
| parent | ff9a24f6f7c576e129685ce59cd9e0a87925cef8 (diff) | |
| parent | e67ed5d285bb2ae7b83eb8be3ee488ab08fa4db1 (diff) | |
| download | micropython-505dd00f07f984abed50024df6f88820cceba7db.tar.gz micropython-505dd00f07f984abed50024df6f88820cceba7db.zip | |
Merge remote-tracking branch 'upstream/master' into list_count
Diffstat (limited to 'py/compile.c')
| -rw-r--r-- | py/compile.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/py/compile.c b/py/compile.c index 68ac20804d..8db7c6d942 100644 --- a/py/compile.c +++ b/py/compile.c @@ -3083,11 +3083,13 @@ mp_obj_t mp_compile(mp_parse_node_t pn, bool is_repl) { // compile pass 2 and 3 #if !MICROPY_EMIT_CPYTHON emit_t *emit_bc = NULL; +#if MICROPY_EMIT_NATIVE emit_t *emit_native = NULL; #endif #if MICROPY_EMIT_INLINE_THUMB emit_inline_asm_t *emit_inline_thumb = NULL; #endif +#endif // !MICROPY_EMIT_CPYTHON for (scope_t *s = comp->scope_head; s != NULL && !comp->had_error; s = s->next) { if (false) { // dummy @@ -3115,6 +3117,8 @@ mp_obj_t mp_compile(mp_parse_node_t pn, bool is_repl) { comp->emit_method_table = &emit_cpython_method_table; #else switch (s->emit_options) { + +#if MICROPY_EMIT_NATIVE case EMIT_OPT_NATIVE_PYTHON: case EMIT_OPT_VIPER: #if MICROPY_EMIT_X64 @@ -3131,6 +3135,7 @@ mp_obj_t mp_compile(mp_parse_node_t pn, bool is_repl) { comp->emit = emit_native; comp->emit_method_table->set_native_types(comp->emit, s->emit_options == EMIT_OPT_VIPER); break; +#endif // MICROPY_EMIT_NATIVE default: if (emit_bc == NULL) { @@ -3140,7 +3145,7 @@ mp_obj_t mp_compile(mp_parse_node_t pn, bool is_repl) { comp->emit_method_table = &emit_bc_method_table; break; } -#endif +#endif // !MICROPY_EMIT_CPYTHON // compile pass 2 and pass 3 compile_scope(comp, s, PASS_2); |