Changeset 2a301ff for src/AST/SymbolTable.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/SymbolTable.hpp (modified) (2 diffs)

src/AST/SymbolTable.hpp

@@ -150 +150 @@
         void addType( const NamedTypeDecl * decl );
         /// Adds a struct declaration to the symbol table by name
-        void addStruct( const std::string & id );
+        void addStructId( const std::string & id );
         /// Adds a struct declaration to the symbol table
         void addStruct( const StructDecl * decl );
@@ -156 +156 @@
         void addEnum( const EnumDecl * decl );
         /// Adds a union declaration to the symbol table by name
-        void addUnion( const std::string & id );
+        void addUnionId( const std::string & id );
         /// Adds a union declaration to the symbol table
         void addUnion( const UnionDecl * decl );