Changeset 2a301ff for src/AST/Pass.proto.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/Pass.proto.hpp (modified) (1 diff)

src/AST/Pass.proto.hpp

@@ -488 +488 @@
 
         template<typename core_t>
-        static inline auto addStruct( core_t & core, int, const std::string & str ) -> decltype( core.symtab.addStruct( str ), void() ) {
+        static inline auto addStructId( core_t & core, int, const std::string & str ) -> decltype( core.symtab.addStructId( str ), void() ) {
                 if ( ! core.symtab.lookupStruct( str ) ) {
-                        core.symtab.addStruct( str );
-                }
-        }
-
-        template<typename core_t>
-        static inline void addStruct( core_t &, long, const std::string & ) {}
-
-        template<typename core_t>
-        static inline auto addUnion( core_t & core, int, const std::string & str ) -> decltype( core.symtab.addUnion( str ), void() ) {
+                        core.symtab.addStructId( str );
+                }
+        }
+
+        template<typename core_t>
+        static inline void addStructId( core_t &, long, const std::string & ) {}
+
+        template<typename core_t>
+        static inline auto addUnionId( core_t & core, int, const std::string & str ) -> decltype( core.symtab.addUnionId( str ), void() ) {
                 if ( ! core.symtab.lookupUnion( str ) ) {
-                        core.symtab.addUnion( str );
-                }
-        }
-
-        template<typename core_t>
-        static inline void addUnion( core_t &, long, const std::string & ) {}
+                        core.symtab.addUnionId( str );
+                }
+        }
+
+        template<typename core_t>
+        static inline void addUnionId( core_t &, long, const std::string & ) {}
 
         #undef SYMTAB_FUNC1