Skip to content

refactor (asr): rename symbol StructType to Struct and ttype Struct to StructType #2740

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 14 commits into from
Jun 20, 2024
Merged

refactor (asr): rename symbol StructType to Struct and ttype Struct to StructType #2740

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f237729
refactor: rename symbol `StructType` to `Struct` and ttype `Struct` t…
kmr-srbh Jun 19, 2024
15328eb
tests: update test references
kmr-srbh Jun 19, 2024
9fc429a
Undo change in comment
kmr-srbh Jun 19, 2024
b3beefa
Undo minor case-based renaming
kmr-srbh Jun 19, 2024
36f2c83
Undo renaming in messages
kmr-srbh Jun 19, 2024
c2c5fdf
Undo renaming in messages
kmr-srbh Jun 19, 2024
a639914
Undo renaming in message
kmr-srbh Jun 19, 2024
2c036f7
dev: fix typo
kmr-srbh Jun 20, 2024
980b999
tests: update test references
kmr-srbh Jun 20, 2024
d7e50b7
revert changes related to `asr.h`
kmr-srbh Jun 20, 2024
a201563
dev: revert changes related to `asr.h`
kmr-srbh Jun 20, 2024
c71e9aa
revert unnecesary changes in `wasm_instructions_visitor.py`
kmr-srbh Jun 20, 2024
18e2d70
fixed conflicting name issue
tanay-man Jun 20, 2024
894920f
Merge pull request #1 from tanay-man/refactor-struct
kmr-srbh Jun 20, 2024
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
dev: revert changes related to asr.h
  • Loading branch information
@kmr-srbh
kmr-srbh committed Jun 20, 2024
commit a20156328b156ad8469430737d7e8aad890dc610
64 changes: 32 additions & 32 deletions src/libasr/asdl_cpp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,11 +308,11 @@ def visitModule(self, mod):
self.emit("/" + "*"*78 + "/")
self.emit("// Visitor base class")
self.emit("")
self.emit("template <class StructType>")
self.emit("template <class Struct>")
self.emit("class BaseVisitor")
self.emit("{")
self.emit("private:")
self.emit(" StructType& self() { return static_cast<StructType&>(*this); }")
self.emit(" Struct& self() { return static_cast<Struct&>(*this); }")
self.emit("public:")
self.emit( "void visit_%(mod)s(const %(mod)s_t &b) { visit_%(mod)s_t(b, self()); }" % subs, 1)
super(ASTVisitorVisitor2, self).visitModule(mod)
Expand All @@ -336,11 +336,11 @@ def visitModule(self, mod):
self.emit("/" + "*"*78 + "/")
self.emit("// Walk Visitor base class")
self.emit("")
self.emit("template <class StructType>")
self.emit("class BaseWalkVisitor : public BaseVisitor<StructType>")
self.emit("template <class Struct>")
self.emit("class BaseWalkVisitor : public BaseVisitor<Struct>")
self.emit("{")
self.emit("private:")
self.emit(" StructType& self() { return static_cast<StructType&>(*this); }")
self.emit(" Struct& self() { return static_cast<Struct&>(*this); }")
self.emit("public:")
super(ASTWalkVisitorVisitor, self).visitModule(mod)
self.emit("};")
Expand Down Expand Up @@ -411,11 +411,11 @@ def visitModule(self, mod):
self.emit("/" + "*"*78 + "/")
self.emit("// Walk Visitor base class")
self.emit("")
self.emit("template <class StructType>")
self.emit("class ASRPassBaseWalkVisitor : public BaseVisitor<StructType>")
self.emit("template <class Struct>")
self.emit("class ASRPassBaseWalkVisitor : public BaseVisitor<Struct>")
self.emit("{")
self.emit("private:")
self.emit(" StructType& self() { return static_cast<StructType&>(*this); }")
self.emit(" Struct& self() { return static_cast<Struct&>(*this); }")
self.emit("public:")
self.emit(" SymbolTable* current_scope=nullptr;")
self.emit(" void transform_stmts(ASR::stmt_t **&m_body, size_t &n_body) {")
Expand Down Expand Up @@ -520,11 +520,11 @@ def visitModule(self, mod):
self.emit("/" + "*"*78 + "/")
self.emit("// Walk Visitor base class")
self.emit("")
self.emit("template <class StructType>")
self.emit("class CallReplacerOnExpressionsVisitor : public BaseVisitor<StructType>")
self.emit("template <class Struct>")
self.emit("class CallReplacerOnExpressionsVisitor : public BaseVisitor<Struct>")
self.emit("{")
self.emit("private:")
self.emit(" StructType& self() { return static_cast<StructType&>(*this); }")
self.emit(" Struct& self() { return static_cast<Struct&>(*this); }")
self.emit("public:")
self.emit(" ASR::expr_t** current_expr;")
self.emit(" SymbolTable* current_scope=nullptr;")
Expand Down Expand Up @@ -650,11 +650,11 @@ def visitModule(self, mod):
self.emit("/" + "*"*78 + "/")
self.emit("// Tree Visitor base class")
self.emit("")
self.emit("template <class StructType>")
self.emit("class TreeBaseVisitor : public BaseVisitor<StructType>")
self.emit("template <class Struct>")
self.emit("class TreeBaseVisitor : public BaseVisitor<Struct>")
self.emit("{")
self.emit("private:")
self.emit( "StructType& self() { return static_cast<StructType&>(*this); }", 1)
self.emit( "Struct& self() { return static_cast<Struct&>(*this); }", 1)
self.emit("public:")
self.emit( "std::string s, indtd;", 1)
self.emit( "bool use_colors;", 1)
Expand Down Expand Up @@ -919,10 +919,10 @@ def visitModule(self, mod):
self.emit("/" + "*"*78 + "/")
self.emit("// Expression and statement Duplicator class")
self.emit("")
self.emit("template <class StructType>")
self.emit("template <class Struct>")
self.emit("class BaseExprStmtDuplicator {")
self.emit("public:")
self.emit(" StructType& self() { return static_cast<StructType&>(*this); }")
self.emit(" Struct& self() { return static_cast<Struct&>(*this); }")
self.emit("")
self.emit(" Allocator &al;")
self.emit(" bool success;")
Expand Down Expand Up @@ -1176,10 +1176,10 @@ def visitModule(self, mod):
self.emit("/" + "*"*78 + "/")
self.emit("// Expression Replacer Base class")
self.emit("")
self.emit("template <class StructType>")
self.emit("template <class Struct>")
self.emit("class BaseExprReplacer {")
self.emit("public:")
self.emit(" StructType& self() { return static_cast<StructType&>(*this); }")
self.emit(" Struct& self() { return static_cast<Struct&>(*this); }")
self.emit("")
self.emit(" ASR::expr_t** current_expr;")
self.emit("")
Expand Down Expand Up @@ -1324,10 +1324,10 @@ def visitModule(self, mod):
self.emit("/" + "*"*78 + "/")
self.emit("// Statement Replacer Base class")
self.emit("")
self.emit("template <class StructType>")
self.emit("template <class Struct>")
self.emit("class BaseStmtReplacer {")
self.emit("public:")
self.emit(" StructType& self() { return static_cast<StructType&>(*this); }")
self.emit(" Struct& self() { return static_cast<Struct&>(*this); }")
self.emit("")
self.emit(" ASR::stmt_t** current_stmt;")
self.emit(" ASR::stmt_t** current_stmt_copy;")
Expand Down Expand Up @@ -1409,11 +1409,11 @@ def visitModule(self, mod):
self.emit("/" + "*"*78 + "/")
self.emit("// Pickle Visitor base class")
self.emit("")
self.emit("template <class StructType>")
self.emit("class PickleBaseVisitor : public BaseVisitor<StructType>")
self.emit("template <class Struct>")
self.emit("class PickleBaseVisitor : public BaseVisitor<Struct>")
self.emit("{")
self.emit("private:")
self.emit( "StructType& self() { return static_cast<StructType&>(*this); }", 1)
self.emit( "Struct& self() { return static_cast<Struct&>(*this); }", 1)
self.emit("public:")
self.emit( "std::string s, indented = \"\";", 1)
self.emit( "bool use_colors;", 1)
Expand Down Expand Up @@ -1699,11 +1699,11 @@ def visitModule(self, mod):
self.emit("/" + "*"*78 + "/")
self.emit("// Json Visitor base class")
self.emit("")
self.emit("template <class StructType>")
self.emit("class JsonBaseVisitor : public BaseVisitor<StructType>")
self.emit("template <class Struct>")
self.emit("class JsonBaseVisitor : public BaseVisitor<Struct>")
self.emit("{")
self.emit("private:")
self.emit( "StructType& self() { return static_cast<StructType&>(*this); }", 1)
self.emit( "Struct& self() { return static_cast<Struct&>(*this); }", 1)
self.emit("public:")
self.emit( "std::string s, indtd = \"\";", 1)
self.emit( "bool no_loc = false;", 1)
Expand Down Expand Up @@ -1971,11 +1971,11 @@ def visitModule(self, mod):
self.emit("/" + "*"*78 + "/")
self.emit("// Serialization Visitor base class")
self.emit("")
self.emit("template <class StructType>")
self.emit("class SerializationBaseVisitor : public BaseVisitor<StructType>")
self.emit("template <class Struct>")
self.emit("class SerializationBaseVisitor : public BaseVisitor<Struct>")
self.emit("{")
self.emit("private:")
self.emit( "StructType& self() { return static_cast<StructType&>(*this); }", 1)
self.emit( "Struct& self() { return static_cast<Struct&>(*this); }", 1)
self.emit("public:")
self.mod = mod
super(SerializationVisitorVisitor, self).visitModule(mod)
Expand Down Expand Up @@ -2154,11 +2154,11 @@ def visitModule(self, mod):
self.emit("/" + "*"*78 + "/")
self.emit("// Deserialization Visitor base class")
self.emit("")
self.emit("template <class StructType>")
self.emit("class DeserializationBaseVisitor : public BaseVisitor<StructType>")
self.emit("template <class Struct>")
self.emit("class DeserializationBaseVisitor : public BaseVisitor<Struct>")
self.emit("{")
self.emit("private:")
self.emit( "StructType& self() { return static_cast<StructType&>(*this); }", 1)
self.emit( "Struct& self() { return static_cast<Struct&>(*this); }", 1)
self.emit("public:")
self.emit( "Allocator &al;", 1)
self.emit( "bool load_symtab_id;", 1)
Expand Down