Skip to content

Refactor unique symbol pass #2251

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 6 commits into from
Aug 4, 2023
Merged

Refactor unique symbol pass #2251

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1af2280
Refactor symbols type 1
Smit-create Aug 3, 2023
da80ea6
Refactor symbols type 2
Smit-create Aug 3, 2023
4b7403b
Refactor symbols type 3
Smit-create Aug 3, 2023
c5b91ce
Refactor symbol updater with type 1
Smit-create Aug 3, 2023
03ef3bd
Refactor symbol updater with type 2
Smit-create Aug 3, 2023
12981c1
Refactor symbol update with type 3
Smit-create Aug 3, 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
Refactor symbol updater with type 1
  • Loading branch information
@Smit-create
Smit-create committed Aug 3, 2023
commit c5b91ced9b431a931f5e3b173e1ffeaf29f5e40e
61 changes: 9 additions & 52 deletions src/libasr/pass/unique_symbols.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,9 @@ class UniqueSymbolVisitor: public ASR::BaseWalkVisitor<UniqueSymbolVisitor> {
current_scope = current_scope_copy;
}

void visit_Program(const ASR::Program_t &x) {
ASR::Program_t& xx = const_cast<ASR::Program_t&>(x);
template <typename T>
void update_symbols_1(const T &x) {
T& xx = const_cast<T&>(x);
std::map<std::string, ASR::symbol_t*> current_scope_copy = current_scope;
ASR::symbol_t *sym = ASR::down_cast<ASR::symbol_t>((ASR::asr_t*)&x);
if (sym_to_new_name.find(sym) != sym_to_new_name.end()) {
Expand All @@ -250,60 +251,16 @@ class UniqueSymbolVisitor: public ASR::BaseWalkVisitor<UniqueSymbolVisitor> {
current_scope = current_scope_copy;
}

void visit_Program(const ASR::Program_t &x) {
update_symbols_1(x);
}

void visit_Module(const ASR::Module_t &x) {
ASR::Module_t& xx = const_cast<ASR::Module_t&>(x);
std::map<std::string, ASR::symbol_t*> current_scope_copy = current_scope;
ASR::symbol_t *sym = ASR::down_cast<ASR::symbol_t>((ASR::asr_t*)&x);
if (sym_to_new_name.find(sym) != sym_to_new_name.end()) {
xx.m_name = s2c(al, sym_to_new_name[sym]);
}
for (size_t i=0; i<xx.n_dependencies; i++) {
if (current_scope.find(xx.m_dependencies[i]) != current_scope.end()) {
sym = current_scope[xx.m_dependencies[i]];
if (sym_to_new_name.find(sym) != sym_to_new_name.end()) {
xx.m_dependencies[i] = s2c(al, sym_to_new_name[sym]);
}
}
}
current_scope = x.m_symtab->get_scope();
for (auto &a : x.m_symtab->get_scope()) {
visit_symbol(*a.second);
}
for (auto &a: current_scope) {
if (sym_to_new_name.find(a.second) != sym_to_new_name.end()) {
xx.m_symtab->erase_symbol(a.first);
xx.m_symtab->add_symbol(sym_to_new_name[a.second], a.second);
}
}
current_scope = current_scope_copy;
update_symbols_1(x);
}

void visit_Function(const ASR::Function_t &x) {
ASR::Function_t& xx = const_cast<ASR::Function_t&>(x);
std::map<std::string, ASR::symbol_t*> current_scope_copy = current_scope;
ASR::symbol_t *sym = ASR::down_cast<ASR::symbol_t>((ASR::asr_t*)&x);
if (sym_to_new_name.find(sym) != sym_to_new_name.end()) {
xx.m_name = s2c(al, sym_to_new_name[sym]);
}
for (size_t i=0; i<xx.n_dependencies; i++) {
if (current_scope.find(xx.m_dependencies[i]) != current_scope.end()) {
sym = current_scope[xx.m_dependencies[i]];
if (sym_to_new_name.find(sym) != sym_to_new_name.end()) {
xx.m_dependencies[i] = s2c(al, sym_to_new_name[sym]);
}
}
}
current_scope = x.m_symtab->get_scope();
for (auto &a : x.m_symtab->get_scope()) {
visit_symbol(*a.second);
}
for (auto &a: current_scope) {
if (sym_to_new_name.find(a.second) != sym_to_new_name.end()) {
xx.m_symtab->erase_symbol(a.first);
xx.m_symtab->add_symbol(sym_to_new_name[a.second], a.second);
}
}
current_scope = current_scope_copy;
update_symbols_1(x);
}

void visit_GenericProcedure(const ASR::GenericProcedure_t &x) {
Expand Down