Skip to content

Fix scoping issue #2161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ubaidsk merged 10 commits into from
Jul 16, 2023
Merged

Fix scoping issue #2161

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fd38017
Provide __main__ as default module_name
ubaidsk Jul 15, 2023
de361b5
Process main_module as every other module
ubaidsk Jul 15, 2023
65dac71
Move import_from_module() to CommonVisitor
ubaidsk Jul 15, 2023
f47d3dd
Add module dependency in import_from_module()
ubaidsk Jul 15, 2023
11e44cb
Prepend module name to global_stmts(), global_init()
ubaidsk Jul 15, 2023
67c1c30
Do not allow redeclaration in global scope
ubaidsk Jul 15, 2023
6b270c0
Fix tests for variable redeclaration
ubaidsk Jul 15, 2023
aea2a6f
Remove unused passes global_stmts_program, global_symbols
ubaidsk Jul 15, 2023
d7b4db0
TEST: Add test for scoping issue
ubaidsk Jul 15, 2023
a43632e
TEST: Update reference tests
ubaidsk Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Prepend module name to global_stmts(), global_init() 
This makes global_init() and global_stmts() unique across modules
  • Loading branch information
@ubaidsk
ubaidsk committed Jul 16, 2023
commit 11e44cb313f80fb86369b1097f9d32adab6bcd01
16 changes: 8 additions & 8 deletions src/lpython/semantics/python_ast_to_asr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,26 +426,26 @@ void get_calls_to_global_init_and_stmts(Allocator &al, const Location &loc, Symb
ASR::Module_t* mod, std::vector<ASR::asr_t *> &tmp_vec) {

std::string mod_name = mod->m_name;
std::string g_func_name = mod_name + "@global_initializer";
ASR::symbol_t *g_func = mod->m_symtab->get_symbol("global_initializer");
std::string g_func_name = mod_name + "__global_initializer";
ASR::symbol_t *g_func = mod->m_symtab->get_symbol(g_func_name);
if (g_func && !scope->get_symbol(g_func_name)) {
ASR::symbol_t *es = ASR::down_cast<ASR::symbol_t>(
ASR::make_ExternalSymbol_t(al, mod->base.base.loc,
scope, s2c(al, g_func_name), g_func,
s2c(al, mod_name), nullptr, 0, s2c(al, "global_initializer"),
s2c(al, mod_name), nullptr, 0, s2c(al, g_func_name),
ASR::accessType::Public));
scope->add_symbol(g_func_name, es);
tmp_vec.push_back(ASRUtils::make_SubroutineCall_t_util(al, loc,
es, g_func, nullptr, 0, nullptr, nullptr, false));
}

g_func_name = mod_name + "@global_statements";
g_func = mod->m_symtab->get_symbol("global_statements");
g_func_name = mod_name + "__global_statements";
g_func = mod->m_symtab->get_symbol(g_func_name);
if (g_func && !scope->get_symbol(g_func_name)) {
ASR::symbol_t *es = ASR::down_cast<ASR::symbol_t>(
ASR::make_ExternalSymbol_t(al, mod->base.base.loc,
scope, s2c(al, g_func_name), g_func,
s2c(al, mod_name), nullptr, 0, s2c(al, "global_statements"),
s2c(al, mod_name), nullptr, 0, s2c(al, g_func_name),
ASR::accessType::Public));
scope->add_symbol(g_func_name, es);
tmp_vec.push_back(ASRUtils::make_SubroutineCall_t_util(al, loc,
Expand Down Expand Up @@ -4784,7 +4784,7 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
// `pass_wrap_global_stmts_into_function` pass
unit->m_items = global_init.p;
unit->n_items = global_init.size();
std::string func_name = "global_initializer";
std::string func_name = module_name + "__global_initializer";
LCompilers::PassOptions pass_options;
pass_options.run_fun = func_name;
pass_wrap_global_stmts(al, *unit, pass_options);
Expand All @@ -4807,7 +4807,7 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
if (items.n > 0) {
unit->m_items = items.p;
unit->n_items = items.size();
std::string func_name = "global_statements";
std::string func_name = module_name + "__global_statements";
// Wrap all the global statements into a Function
LCompilers::PassOptions pass_options;
pass_options.run_fun = func_name;
Expand Down