1 files changed, 18 insertions, 18 deletions

diff --git a/py/emitcommon.c b/py/emitcommon.c
index 464979313..e199bc6e9 100644
--- a/py/emitcommon.c
+++ b/py/emitcommon.c
@@ -41,61 +41,61 @@
 
 #define EMIT(fun, ...) (emit_method_table->fun(emit, __VA_ARGS__))
 
-void emit_common_load_id(emit_t *emit, const emit_method_table_t *emit_method_table, scope_t *scope, qstr qstr) {
+void emit_common_load_id(emit_t *emit, const emit_method_table_t *emit_method_table, scope_t *scope, qstr qst) {
     // assumes pass is greater than 1, ie that all identifiers are defined in the scope
 
-    id_info_t *id = scope_find(scope, qstr);
+    id_info_t *id = scope_find(scope, qst);
     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) {
-        EMIT(load_name, qstr);
+        EMIT(load_name, qst);
     } else if (id->kind == ID_INFO_KIND_GLOBAL_EXPLICIT) {
-        EMIT(load_global, qstr);
+        EMIT(load_global, qst);
     } else if (id->kind == ID_INFO_KIND_LOCAL) {
-        EMIT(load_fast, qstr, id->flags, id->local_num);
+        EMIT(load_fast, qst, id->flags, id->local_num);
     } else if (id->kind == ID_INFO_KIND_CELL || id->kind == ID_INFO_KIND_FREE) {
-        EMIT(load_deref, qstr, id->local_num);
+        EMIT(load_deref, qst, id->local_num);
     } else {
         assert(0);
     }
 }
 
-void emit_common_store_id(emit_t *emit, const emit_method_table_t *emit_method_table, scope_t *scope, qstr qstr) {
+void emit_common_store_id(emit_t *emit, const emit_method_table_t *emit_method_table, scope_t *scope, qstr qst) {
     // assumes pass is greater than 1, ie that all identifiers are defined in the scope
 
-    id_info_t *id = scope_find(scope, qstr);
+    id_info_t *id = scope_find(scope, qst);
     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) {
-        EMIT(store_name, qstr);
+        EMIT(store_name, qst);
     } else if (id->kind == ID_INFO_KIND_GLOBAL_EXPLICIT) {
-        EMIT(store_global, qstr);
+        EMIT(store_global, qst);
     } else if (id->kind == ID_INFO_KIND_LOCAL) {
-        EMIT(store_fast, qstr, id->local_num);
+        EMIT(store_fast, qst, id->local_num);
     } else if (id->kind == ID_INFO_KIND_CELL || id->kind == ID_INFO_KIND_FREE) {
-        EMIT(store_deref, qstr, id->local_num);
+        EMIT(store_deref, qst, id->local_num);
     } else {
         assert(0);
     }
 }
 
-void emit_common_delete_id(emit_t *emit, const emit_method_table_t *emit_method_table, scope_t *scope, qstr qstr) {
+void emit_common_delete_id(emit_t *emit, const emit_method_table_t *emit_method_table, scope_t *scope, qstr qst) {
     // assumes pass is greater than 1, ie that all identifiers are defined in the scope
 
-    id_info_t *id = scope_find(scope, qstr);
+    id_info_t *id = scope_find(scope, qst);
     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) {
-        EMIT(delete_name, qstr);
+        EMIT(delete_name, qst);
     } else if (id->kind == ID_INFO_KIND_GLOBAL_EXPLICIT) {
-        EMIT(delete_global, qstr);
+        EMIT(delete_global, qst);
     } else if (id->kind == ID_INFO_KIND_LOCAL) {
-        EMIT(delete_fast, qstr, id->local_num);
+        EMIT(delete_fast, qst, id->local_num);
     } else if (id->kind == ID_INFO_KIND_CELL || id->kind == ID_INFO_KIND_FREE) {
-        EMIT(delete_deref, qstr, id->local_num);
+        EMIT(delete_deref, qst, id->local_num);
     } else {
         assert(0);
     }