forked from Lephenixnoir/PythonExtra
9201f46cc8
This ensures that implicit variables are only converted to implicit closed-over variables (nonlocals) at the very end of the function scope. If variables are closed-over when first used (read from, as was done prior to this commit) then this can be incorrect because the variable may be assigned to later on in the function which means they are just a plain local, not closed over. Fixes issue #4272.
78 lines
3 KiB
C
78 lines
3 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <assert.h>
|
|
|
|
#include "py/emit.h"
|
|
|
|
#if MICROPY_ENABLE_COMPILER
|
|
|
|
void mp_emit_common_get_id_for_load(scope_t *scope, qstr qst) {
|
|
// name adding/lookup
|
|
bool added;
|
|
id_info_t *id = scope_find_or_add_id(scope, qst, &added);
|
|
if (added) {
|
|
id->kind = ID_INFO_KIND_GLOBAL_IMPLICIT;
|
|
}
|
|
}
|
|
|
|
void mp_emit_common_get_id_for_modification(scope_t *scope, qstr qst) {
|
|
// name adding/lookup
|
|
bool added;
|
|
id_info_t *id = scope_find_or_add_id(scope, qst, &added);
|
|
if (added) {
|
|
if (SCOPE_IS_FUNC_LIKE(scope->kind)) {
|
|
id->kind = ID_INFO_KIND_LOCAL;
|
|
} else {
|
|
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;
|
|
}
|
|
}
|
|
|
|
void mp_emit_common_id_op(emit_t *emit, const mp_emit_method_table_id_ops_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, qst);
|
|
assert(id != NULL);
|
|
|
|
// call the emit backend with the correct code
|
|
if (id->kind == ID_INFO_KIND_GLOBAL_IMPLICIT) {
|
|
emit_method_table->global(emit, qst, MP_EMIT_IDOP_GLOBAL_NAME);
|
|
} else if (id->kind == ID_INFO_KIND_GLOBAL_EXPLICIT) {
|
|
emit_method_table->global(emit, qst, MP_EMIT_IDOP_GLOBAL_GLOBAL);
|
|
} else if (id->kind == ID_INFO_KIND_LOCAL) {
|
|
emit_method_table->local(emit, qst, id->local_num, MP_EMIT_IDOP_LOCAL_FAST);
|
|
} else {
|
|
assert(id->kind == ID_INFO_KIND_CELL || id->kind == ID_INFO_KIND_FREE);
|
|
emit_method_table->local(emit, qst, id->local_num, MP_EMIT_IDOP_LOCAL_DEREF);
|
|
}
|
|
}
|
|
|
|
#endif // MICROPY_ENABLE_COMPILER
|