py: Convert [u]int to mp_[u]int_t in emit.h and associated .c files.

Towards resolving issue #50.

1 files changed, 11 insertions, 11 deletions

diff --git a/py/emitpass1.c b/py/emitpass1.c
index b39597318..601feb7fd 100644
--- a/py/emitpass1.c
+++ b/py/emitpass1.c
@@ -67,13 +67,13 @@ STATIC bool emit_pass1_last_emit_was_return_value(emit_t *emit) {
     return false;
 }
 
-STATIC void emit_pass1_load_id(emit_t *emit, qstr qstr) {
+STATIC void emit_pass1_load_id(emit_t *emit, qstr qst) {
     // name adding/lookup
     bool added;
-    id_info_t *id = scope_find_or_add_id(emit->scope, qstr, &added);
+    id_info_t *id = scope_find_or_add_id(emit->scope, qst, &added);
     if (added) {
 #if MICROPY_EMIT_CPYTHON
-        if (qstr == MP_QSTR_super && emit->scope->kind == SCOPE_FUNCTION) {
+        if (qst == MP_QSTR_super && emit->scope->kind == SCOPE_FUNCTION) {
             // special case, super is a global, and also counts as use of __class__
             id->kind = ID_INFO_KIND_GLOBAL_EXPLICIT;
             id_info_t *id2 = scope_find_local_in_parent(emit->scope, MP_QSTR___class__);
@@ -87,10 +87,10 @@ STATIC void emit_pass1_load_id(emit_t *emit, qstr qstr) {
         } else
 #endif
         {
-            id_info_t *id2 = scope_find_local_in_parent(emit->scope, qstr);
+            id_info_t *id2 = scope_find_local_in_parent(emit->scope, qst);
             if (id2 != NULL && (id2->kind == ID_INFO_KIND_LOCAL || id2->kind == ID_INFO_KIND_CELL || id2->kind == ID_INFO_KIND_FREE)) {
                 id->kind = ID_INFO_KIND_FREE;
-                scope_close_over_in_parents(emit->scope, qstr);
+                scope_close_over_in_parents(emit->scope, qst);
             } else {
                 id->kind = ID_INFO_KIND_GLOBAL_IMPLICIT;
             }
@@ -98,10 +98,10 @@ STATIC void emit_pass1_load_id(emit_t *emit, qstr qstr) {
     }
 }
 
-STATIC id_info_t *get_id_for_modification(scope_t *scope, qstr qstr) {
+STATIC id_info_t *get_id_for_modification(scope_t *scope, qstr qst) {
     // name adding/lookup
     bool added;
-    id_info_t *id = scope_find_or_add_id(scope, qstr, &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;
@@ -118,12 +118,12 @@ STATIC id_info_t *get_id_for_modification(scope_t *scope, qstr qstr) {
     return id;
 }
 
-STATIC void emit_pass1_store_id(emit_t *emit, qstr qstr) {
-    get_id_for_modification(emit->scope, qstr);
+STATIC void emit_pass1_store_id(emit_t *emit, qstr qst) {
+    get_id_for_modification(emit->scope, qst);
 }
 
-STATIC void emit_pass1_delete_id(emit_t *emit, qstr qstr) {
-    id_info_t *id = get_id_for_modification(emit->scope, qstr);
+STATIC void emit_pass1_delete_id(emit_t *emit, qstr qst) {
+    id_info_t *id = get_id_for_modification(emit->scope, qst);
     // this flag is unused
     //id->flags |= ID_FLAG_IS_DELETED;
     (void)id; // suppress compiler warning