Changeset 2a301ff for src/AST/SymbolTable.cpp

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.cpp (modified) (4 diffs)

src/AST/SymbolTable.cpp

@@ -19 +19 @@
 
 #include "Copy.hpp"
-#include <iostream>
-#include <algorithm>
-
 #include "Decl.hpp"
 #include "Expr.hpp"
@@ -206 +203 @@
                         out.push_back(decl.second);
                 }
-
-                // std::cerr << otypeKey << ' ' << out.size() << std::endl;
         }
 
@@ -328 +323 @@
 }
 
-void SymbolTable::addStruct( const std::string &id ) {
+void SymbolTable::addStructId( const std::string &id ) {
         addStruct( new StructDecl( CodeLocation(), id ) );
 }
@@ -370 +365 @@
 }
 
-void SymbolTable::addUnion( const std::string &id ) {
+void SymbolTable::addUnionId( const std::string &id ) {
         addUnion( new UnionDecl( CodeLocation(), id ) );
 }