Changeset 2a301ff for src/AST/Decl.hpp

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• src/AST/Decl.hpp (modified) (1 diff)

src/AST/Decl.hpp

@@ -69 +69 @@
 public:
         /// Represents the type with all types and typedefs expanded.
-        /// This field is generated by SymTab::Validate::Pass2
         std::string mangleName;
         /// Stores the scope level at which the variable was declared.