diff options
| author | Damien George <damien@micropython.org> | 2020-06-16 21:42:37 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2020-06-16 21:42:37 +1000 |
| commit | 0fd91e39b1711772c88cfe4e0aaf817fe3387ba6 (patch) | |
| tree | a4ac9f1fa69ff7700eff32d30269b634a8d68f86 | |
| parent | b4d0d7bf03a787237740b80d2ecdeb0a3ce1d4ff (diff) | |
| download | micropython-0fd91e39b1711772c88cfe4e0aaf817fe3387ba6.tar.gz micropython-0fd91e39b1711772c88cfe4e0aaf817fe3387ba6.zip | |
py/compile: Convert scope test to SCOPE_IS_COMP_LIKE macro.
This macro can be used elsewhere.
| -rw-r--r-- | py/compile.c | 2 | ||||
| -rw-r--r-- | py/scope.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/py/compile.c b/py/compile.c index 22f47ee0d2..8835ec2f8d 100644 --- a/py/compile.c +++ b/py/compile.c @@ -3083,7 +3083,7 @@ STATIC void compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) { EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE); } EMIT(return_value); - } else if (scope->kind == SCOPE_LIST_COMP || scope->kind == SCOPE_DICT_COMP || scope->kind == SCOPE_SET_COMP || scope->kind == SCOPE_GEN_EXPR) { + } else if (SCOPE_IS_COMP_LIKE(scope->kind)) { // a bit of a hack at the moment assert(MP_PARSE_NODE_IS_STRUCT(scope->pn)); diff --git a/py/scope.h b/py/scope.h index ba07c39498..b52d98ea1c 100644 --- a/py/scope.h +++ b/py/scope.h @@ -55,6 +55,7 @@ typedef struct _id_info_t { } id_info_t; #define SCOPE_IS_FUNC_LIKE(s) ((s) >= SCOPE_LAMBDA) +#define SCOPE_IS_COMP_LIKE(s) (SCOPE_LIST_COMP <= (s) && (s) <= SCOPE_GEN_EXPR) // scope is a "block" in Python parlance typedef enum { |