commit 3dea8c9e926d0c1b1049ff9d5abeedfb001fc201
author Damien George <damien.p.george@gmail.com> Fri Sep 30 12:34:05 2016 +1000
committer Damien George <damien.p.george@gmail.com> Fri Sep 30 12:34:05 2016 +1000
tree f99592adff2bf9563e214e0f985d83e3d1226a61
parent 6ab2c5e6cc6359c3419a9d8ee61b4e586864d048

py/scope: Use lookup-table to determine a scope's simple name.

Generates slightly smaller and more efficient code.

py/emitcommon.c

diff --git a/py/emitcommon.c b/py/emitcommon.c
index 435188f..2925f4c 100644
--- a/py/emitcommon.c
+++ b/py/emitcommon.c
@@ -50,12 +50,12 @@
     bool added;
     id_info_t *id = scope_find_or_add_id(scope, qst, &added);
     if (added) {
-        if (scope->kind == SCOPE_MODULE || scope->kind == SCOPE_CLASS) {
-            id->kind = ID_INFO_KIND_GLOBAL_IMPLICIT;
-        } else {
+        if (SCOPE_IS_FUNC_LIKE(scope->kind)) {
             id->kind = ID_INFO_KIND_LOCAL;
+        } else {
+            id->kind = ID_INFO_KIND_GLOBAL_IMPLICIT;
         }
-    } else if (scope->kind >= SCOPE_FUNCTION && scope->kind <= SCOPE_GEN_EXPR && id->kind == ID_INFO_KIND_GLOBAL_IMPLICIT) {
+    } else if (SCOPE_IS_FUNC_LIKE(scope->kind) && id->kind == ID_INFO_KIND_GLOBAL_IMPLICIT) {
         // rebind as a local variable
         id->kind = ID_INFO_KIND_LOCAL;
     }