Factorise EMIT_COMMON calls, mostly into emit_pass1.

1 files changed, 18 insertions, 70 deletions

diff --git a/py/emitcommon.c b/py/emitcommon.c
index 95a00543a..6d4c07141 100644
--- a/py/emitcommon.c
+++ b/py/emitcommon.c
@@ -14,85 +14,31 @@
 
 #define EMIT(fun, arg...) (emit_method_table->fun(emit, ##arg))
 
-void emit_common_load_id(pass_kind_t pass, scope_t *scope, emit_t *emit, const emit_method_table_t *emit_method_table, qstr qstr___class__, qstr qstr) {
-    id_info_t *id_info = NULL;
-    if (pass == PASS_1) {
-        // name adding/lookup
-        bool added;
-        id_info = scope_find_or_add_id(scope, qstr, &added);
-        if (added) {
-            if (strcmp(qstr_str(qstr), "AssertionError") == 0) {
-                id_info->kind = ID_INFO_KIND_GLOBAL_EXPLICIT;
-                // TODO how much of a hack is this?
-            } else if (strcmp(qstr_str(qstr), "super") == 0 && scope->kind == SCOPE_FUNCTION) {
-                // special case, super is a global, and also counts as use of __class__
-                id_info->kind = ID_INFO_KIND_GLOBAL_EXPLICIT;
-                id_info_t *id_info2 = scope_find_local_in_parent(scope, qstr___class__);
-                if (id_info2 != NULL) {
-                    id_info2 = scope_find_or_add_id(scope, qstr___class__, &added);
-                    if (added) {
-                        id_info2->kind = ID_INFO_KIND_FREE;
-                        scope_close_over_in_parents(scope, qstr___class__);
-                    }
-                }
-            } else {
-                id_info_t *id_info2 = scope_find_local_in_parent(scope, qstr);
-                if (id_info2 != NULL && (id_info2->kind == ID_INFO_KIND_LOCAL || id_info2->kind == ID_INFO_KIND_CELL || id_info2->kind == ID_INFO_KIND_FREE)) {
-                    id_info->kind = ID_INFO_KIND_FREE;
-                    scope_close_over_in_parents(scope, qstr);
-                } else {
-                    id_info->kind = ID_INFO_KIND_GLOBAL_IMPLICIT;
-                }
-            }
-        }
-    } else {
-        id_info = scope_find(scope, qstr);
-    }
+void emit_common_load_id(emit_t *emit, const emit_method_table_t *emit_method_table, scope_t *scope, qstr qstr) {
+    // assumes pass is greater than 1, ie that all identifiers are defined in the scope
 
-    assert(id_info != NULL); // TODO can this ever fail?
+    id_info_t *id = scope_find(scope, qstr);
+    assert(id != NULL); // TODO can this ever fail?
 
     // call the emit backend with the correct code
-    if (id_info == NULL || id_info->kind == ID_INFO_KIND_GLOBAL_IMPLICIT) {
+    if (id == NULL || id->kind == ID_INFO_KIND_GLOBAL_IMPLICIT) {
         EMIT(load_name, qstr);
-    } else if (id_info->kind == ID_INFO_KIND_GLOBAL_EXPLICIT) {
+    } else if (id->kind == ID_INFO_KIND_GLOBAL_EXPLICIT) {
         EMIT(load_global, qstr);
-    } else if (id_info->kind == ID_INFO_KIND_LOCAL) {
-        EMIT(load_fast, qstr, id_info->local_num);
-    } else if (id_info->kind == ID_INFO_KIND_CELL || id_info->kind == ID_INFO_KIND_FREE) {
+    } else if (id->kind == ID_INFO_KIND_LOCAL) {
+        EMIT(load_fast, qstr, id->local_num);
+    } else if (id->kind == ID_INFO_KIND_CELL || id->kind == ID_INFO_KIND_FREE) {
         EMIT(load_deref, qstr);
     } else {
         assert(0);
     }
 }
 
-static id_info_t *get_id_for_modification(pass_kind_t pass, scope_t *scope, qstr qstr) {
-    id_info_t *id_info = NULL;
-    if (pass == PASS_1) {
-        // name adding/lookup
-        bool added;
-        id_info = scope_find_or_add_id(scope, qstr, &added);
-        if (added) {
-            if (scope->kind == SCOPE_MODULE || scope->kind == SCOPE_CLASS) {
-                id_info->kind = ID_INFO_KIND_GLOBAL_IMPLICIT;
-            } else {
-                id_info->kind = ID_INFO_KIND_LOCAL;
-            }
-        } else if (scope->kind >= SCOPE_FUNCTION && scope->kind <= SCOPE_GEN_EXPR && id_info->kind == ID_INFO_KIND_GLOBAL_IMPLICIT) {
-            // rebind as a local variable
-            id_info->kind = ID_INFO_KIND_LOCAL;
-        }
-    } else {
-        id_info = scope_find(scope, qstr);
-    }
-
-    assert(id_info != NULL); // TODO can this ever fail?
+void emit_common_store_id(emit_t *emit, const emit_method_table_t *emit_method_table, scope_t *scope, qstr qstr) {
+    // assumes pass is greater than 1, ie that all identifiers are defined in the scope
 
-    return id_info;
-}
-
-void emit_common_store_id(pass_kind_t pass, scope_t *scope, emit_t *emit, const emit_method_table_t *emit_method_table, qstr qstr) {
-    // create/get the id info
-    id_info_t *id = get_id_for_modification(pass, scope, qstr);
+    id_info_t *id = scope_find(scope, qstr);
+    assert(id != NULL); // TODO can this ever fail?
 
     // call the emit backend with the correct code
     if (id == NULL || id->kind == ID_INFO_KIND_GLOBAL_IMPLICIT) {
@@ -108,9 +54,11 @@ void emit_common_store_id(pass_kind_t pass, scope_t *scope, emit_t *emit, const
     }
 }
 
-void emit_common_delete_id(pass_kind_t pass, scope_t *scope, emit_t *emit, const emit_method_table_t *emit_method_table, qstr qstr) {
-    // create/get the id info
-    id_info_t *id = get_id_for_modification(pass, scope, qstr);
+void emit_common_delete_id(emit_t *emit, const emit_method_table_t *emit_method_table, scope_t *scope, qstr qstr) {
+    // assumes pass is greater than 1, ie that all identifiers are defined in the scope
+
+    id_info_t *id = scope_find(scope, qstr);
+    assert(id != NULL); // TODO can this ever fail?
 
     // call the emit backend with the correct code
     if (id == NULL || id->kind == ID_INFO_KIND_GLOBAL_IMPLICIT) {