Skip to content

Fix ExternalSymbol location #1906

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
certik merged 2 commits into from
Jun 14, 2023
Merged

Fix ExternalSymbol location #1906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8222482
Fix ExternalSymbol location
certik Jun 14, 2023
abd8709
Update reference results
certik Jun 14, 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
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 @@ -445,7 +445,7 @@ ASR::symbol_t* import_from_module(Allocator &al, ASR::Module_t *m, SymbolTable *
name.from_str(al, new_sym_name);
char *cname = name.c_str(al);
ASR::asr_t *fn = ASR::make_ExternalSymbol_t(
al, mfn->base.base.loc,
al, loc,
/* a_symtab */ current_scope,
/* a_name */ cname,
(ASR::symbol_t*)mfn,
Expand All @@ -461,7 +461,7 @@ ASR::symbol_t* import_from_module(Allocator &al, ASR::Module_t *m, SymbolTable *
name.from_str(al, new_sym_name);
char *cname = name.c_str(al);
ASR::asr_t *est = ASR::make_ExternalSymbol_t(
al, st->base.base.loc,
al, loc,
/* a_symtab */ current_scope,
/* a_name */ cname,
(ASR::symbol_t*)st,
Expand All @@ -475,7 +475,7 @@ ASR::symbol_t* import_from_module(Allocator &al, ASR::Module_t *m, SymbolTable *
name.from_str(al, new_sym_name);
char *cname = name.c_str(al);
ASR::asr_t *est = ASR::make_ExternalSymbol_t(
al, et->base.base.loc,
al, loc,
/* a_symtab */ current_scope,
/* a_name */ cname,
(ASR::symbol_t*)et,
Expand All @@ -491,7 +491,7 @@ ASR::symbol_t* import_from_module(Allocator &al, ASR::Module_t *m, SymbolTable *
name.from_str(al, new_sym_name);
char *cname = name.c_str(al);
ASR::asr_t *v = ASR::make_ExternalSymbol_t(
al, mv->base.base.loc,
al, loc,
/* a_symtab */ current_scope,
/* a_name */ cname,
(ASR::symbol_t*)mv,
Expand All @@ -505,7 +505,7 @@ ASR::symbol_t* import_from_module(Allocator &al, ASR::Module_t *m, SymbolTable *
name.from_str(al, new_sym_name);
char *cname = name.c_str(al);
ASR::asr_t *v = ASR::make_ExternalSymbol_t(
al, gt->base.base.loc,
al, loc,
/* a_symtab */ current_scope,
/* a_name */ cname,
(ASR::symbol_t*)gt,
Expand Down Expand Up @@ -4253,14 +4253,14 @@ class SymbolTableVisitor : public CommonVisitor<SymbolTableVisitor> {
}
std::string new_sym_name = ASRUtils::get_mangled_name(m, remote_sym);
ASR::symbol_t *t = import_from_module(al, m, current_scope, msym,
remote_sym, new_sym_name, x.base.base.loc, true);
remote_sym, new_sym_name, x.m_names[i].loc, true);
if (current_scope->get_scope().find(new_sym_name) != current_scope->get_scope().end()) {
ASR::symbol_t *old_sym = current_scope->get_scope().find(new_sym_name)->second;
diag.add(diag::Diagnostic(
"The symbol '" + new_sym_name + "' imported from " + std::string(m->m_name) +" will shadow the existing symbol '" + new_sym_name + "'",
diag::Level::Warning, diag::Stage::Semantic, {
diag::Label("new symbol", {x.m_names[i].loc}),
diag::Label("old symbol implementation", {old_sym->base.loc}),
diag::Label("old symbol", {old_sym->base.loc}),
diag::Label("new symbol", {t->base.loc}),
})
);
current_scope->overwrite_symbol(new_sym_name, t);
Expand Down
2 changes: 1 addition & 1 deletion tests/reference/asr-modules_02-ec92e6f.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"stdout": "asr-modules_02-ec92e6f.stdout",
"stdout_hash": "2b9767d477601b562ca13e1d770d84bafad8f2647fb778d52fc20d0d",
"stderr": "asr-modules_02-ec92e6f.stderr",
"stderr_hash": "910bed77716460a8f8712eac5e5818c55b7744f45a4a36aa257f3527",
"stderr_hash": "132af04271d3bfd523848990e734bfa3c0aed6e4b85ec4eb87e66720",
"returncode": 0
}
14 changes: 4 additions & 10 deletions tests/reference/asr-modules_02-ec92e6f.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
warning: The symbol 'f' imported from modules_02b will shadow the existing symbol 'f'
--> tests/../integration_tests/modules_02.py:1:28
--> tests/../integration_tests/modules_02.py:1:25
|
1 | from modules_02b import f, f
| ^ new symbol

--> tests/../integration_tests/modules_02b.py:3:1 - 5:16
|
3 | def f():
| ^^^^^^^^...
...
| ^ old symbol
|
5 | print("f()")
| ...^^^^^^^^^^^^^^^^ old symbol implementation
1 | from modules_02b import f, f
| ^ new symbol
4 changes: 2 additions & 2 deletions tests/reference/asr_json-modules_02-70a491a.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"outfile": null,
"outfile_hash": null,
"stdout": "asr_json-modules_02-70a491a.stdout",
"stdout_hash": "baae33b908a2ae0da9c7dd50b6307a768b0360e514987d70d3e37dc4",
"stdout_hash": "a2e97444a1e8cb6a623037d104f24628adeea2d3af9cae5d680a5423",
"stderr": "asr_json-modules_02-70a491a.stderr",
"stderr_hash": "67b8bf471b878cb687ed200fe5d207b6b4acb9d1e1096a930576fba9",
"stderr_hash": "074c73dfbd40f5246b5f400ebe4b1597683344d0c6353cbffc6f32c8",
"returncode": 0
}
14 changes: 4 additions & 10 deletions tests/reference/asr_json-modules_02-70a491a.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
warning: The symbol 'f' imported from modules_02b will shadow the existing symbol 'f'
--> tests/../integration_tests/modules_02.py:1:28
--> tests/../integration_tests/modules_02.py:1:25
|
1 | from modules_02b import f, f
| ^ new symbol

--> tests/../integration_tests/modules_02b.py:3:1 - 5:16
|
3 | def f():
| ^^^^^^^^...
...
| ^ old symbol
|
5 | print("f()")
| ...^^^^^^^^^^^^^^^^ old symbol implementation
1 | from modules_02b import f, f
| ^ new symbol
30 changes: 15 additions & 15 deletions tests/reference/asr_json-modules_02-70a491a.stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,14 @@
"access": "Public"
},
"loc": {
"first": 157,
"last": 189,
"first_filename": "tests/../integration_tests/modules_02b.py",
"first_line": 3,
"first_column": 1,
"last_filename": "tests/../integration_tests/modules_02b.py",
"last_line": 5,
"last_column": 16
"first": 27,
"last": 27,
"first_filename": "tests/../integration_tests/modules_02.py",
"first_line": 1,
"first_column": 28,
"last_filename": "tests/../integration_tests/modules_02.py",
"last_line": 1,
"last_column": 28
}
},
"main0": {
Expand Down Expand Up @@ -822,14 +822,14 @@
"access": "Public"
},
"loc": {
"first": 191,
"last": 215,
"first_filename": "tests/../integration_tests/modules_02c.py",
"first": 154,
"last": 154,
"first_filename": "tests/../integration_tests/modules_02b.py",
"first_line": 1,
"first_column": 1,
"last_filename": "tests/../integration_tests/modules_02c.py",
"last_line": 2,
"last_column": 16
"first_column": 25,
"last_filename": "tests/../integration_tests/modules_02b.py",
"last_line": 1,
"last_column": 25
}
}
}
Expand Down