diff options
| author | Jeff Epler <jepler@gmail.com> | 2019-12-02 07:27:03 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-02 07:27:03 -0600 |
| commit | 899202aca7b0fcddd92e59ce2deb86a667972683 (patch) | |
| tree | 0580f846d63806fe3f3fc480d1f5cb1e0f34865f /py/compile.c | |
| parent | d843156a5e2018a8dd763dbcce325e62cca38cc2 (diff) | |
| parent | 83ecb1b65e24d970833d17d8322230ba05c5d527 (diff) | |
Merge branch 'master' into gcc9
Diffstat (limited to 'py/compile.c')
| -rw-r--r-- | py/compile.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/py/compile.c b/py/compile.c index 8b17935bd..77715d3fe 100644 --- a/py/compile.c +++ b/py/compile.c @@ -775,13 +775,22 @@ STATIC bool compile_built_in_decorator(compiler_t *comp, int name_len, mp_parse_ qstr attr = MP_PARSE_NODE_LEAF_ARG(name_nodes[1]); if (attr == MP_QSTR_bytecode) { *emit_options = MP_EMIT_OPT_BYTECODE; -#if MICROPY_EMIT_NATIVE + // @micropython.native decorator. } else if (attr == MP_QSTR_native) { + // Different from MicroPython: native doesn't raise SyntaxError if native support isn't + // compiled, it just passes through the function unmodified. + #if MICROPY_EMIT_NATIVE *emit_options = MP_EMIT_OPT_NATIVE_PYTHON; + #else + return true; + #endif + #if MICROPY_EMIT_NATIVE + // @micropython.viper decorator. } else if (attr == MP_QSTR_viper) { *emit_options = MP_EMIT_OPT_VIPER; -#endif + #endif #if MICROPY_EMIT_INLINE_ASM + // @micropython.asm_thumb decorator. } else if (attr == ASM_DECORATOR_QSTR) { *emit_options = MP_EMIT_OPT_ASM; #endif |