Changeset c6a1e8a for src/AST/Pass.proto.hpp

Timestamp:

Jun 5, 2019, 8:36:48 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

866545b

Parents:

67130fe (diff), 3cd5fdd (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:

fix conflicit

File:

• src/AST/Pass.proto.hpp (modified) (9 diffs)

src/AST/Pass.proto.hpp

@@ -265 +265 @@
         };
 
-        // Finally certain pass desire an up to date indexer automatically
-        // detect the presence of a member name indexer and call all the members appropriately
-        namespace indexer {
+        // Finally certain pass desire an up to date symbol table automatically
+        // detect the presence of a member name `symtab` and call all the members appropriately
+        namespace symtab {
                 // Some simple scoping rules
                 template<typename pass_t>
-                static inline auto enter( pass_t & pass, int ) -> decltype( pass.indexer.enterScope(), void() ) {
-                        pass.indexer.enterScope();
+                static inline auto enter( pass_t & pass, int ) -> decltype( pass.symtab.enterScope(), void() ) {
+                        pass.symtab.enterScope();
                 }
 
@@ -278 +278 @@
 
                 template<typename pass_t>
-                static inline auto leave( pass_t & pass, int ) -> decltype( pass.indexer.leaveScope(), void() ) {
-                        pass.indexer.leaveScope();
+                static inline auto leave( pass_t & pass, int ) -> decltype( pass.symtab.leaveScope(), void() ) {
+                        pass.symtab.leaveScope();
                 }
 
@@ -285 +285 @@
                 static inline auto leave( pass_t &, long ) {}
 
-                // The indexer has 2 kind of functions mostly, 1 argument and 2 arguments
+                // The symbol table has 2 kind of functions mostly, 1 argument and 2 arguments
                 // Create macro to condense these common patterns
-                #define INDEXER_FUNC1( func, type ) \
+                #define SYMTAB_FUNC1( func, type ) \
                 template<typename pass_t> \
-                static inline auto func( pass_t & pass, int, type arg ) -> decltype( pass.indexer.func( arg ), void() ) {\
-                        pass.indexer.func( arg ); \
+                static inline auto func( pass_t & pass, int, type arg ) -> decltype( pass.symtab.func( arg ), void() ) {\
+                        pass.symtab.func( arg ); \
                 } \
                 \
@@ -296 +296 @@
                 static inline void func( pass_t &, long, type ) {}
 
-                #define INDEXER_FUNC2( func, type1, type2 ) \
+                #define SYMTAB_FUNC2( func, type1, type2 ) \
                 template<typename pass_t> \
-                static inline auto func( pass_t & pass, int, type1 arg1, type2 arg2 ) -> decltype( pass.indexer.func( arg1, arg2 ), void () ) {\
-                        pass.indexer.func( arg1, arg2 ); \
+                static inline auto func( pass_t & pass, int, type1 arg1, type2 arg2 ) -> decltype( pass.symtab.func( arg1, arg2 ), void () ) {\
+                        pass.symtab.func( arg1, arg2 ); \
                 } \
                         \
@@ -305 +305 @@
                 static inline void func( pass_t &, long, type1, type2 ) {}
 
-                INDEXER_FUNC1( addId     , const DeclWithType *  );
-                INDEXER_FUNC1( addType   , const NamedTypeDecl * );
-                INDEXER_FUNC1( addStruct , const StructDecl *    );
-                INDEXER_FUNC1( addEnum   , const EnumDecl *      );
-                INDEXER_FUNC1( addUnion  , const UnionDecl *     );
-                INDEXER_FUNC1( addTrait  , const TraitDecl *     );
-                INDEXER_FUNC2( addWith   , const std::vector< ptr<Expr> > &, const Node * );
+                SYMTAB_FUNC1( addId     , const DeclWithType *  );
+                SYMTAB_FUNC1( addType   , const NamedTypeDecl * );
+                SYMTAB_FUNC1( addStruct , const StructDecl *    );
+                SYMTAB_FUNC1( addEnum   , const EnumDecl *      );
+                SYMTAB_FUNC1( addUnion  , const UnionDecl *     );
+                SYMTAB_FUNC1( addTrait  , const TraitDecl *     );
+                SYMTAB_FUNC2( addWith   , const std::vector< ptr<Expr> > &, const Node * );
 
                 // A few extra functions have more complicated behaviour, they are hand written
                 template<typename pass_t>
-                static inline auto addStructFwd( pass_t & pass, int, const ast::StructDecl * decl ) -> decltype( pass.indexer.addStruct( decl ), void() ) {
+                static inline auto addStructFwd( pass_t & pass, int, const ast::StructDecl * decl ) -> decltype( pass.symtab.addStruct( decl ), void() ) {
                         ast::StructDecl * fwd = new ast::StructDecl( decl->location, decl->name );
                         fwd->params = decl->params;
-                        pass.indexer.addStruct( fwd );
+                        pass.symtab.addStruct( fwd );
                 }
 
@@ -325 +325 @@
 
                 template<typename pass_t>
-                static inline auto addUnionFwd( pass_t & pass, int, const ast::UnionDecl * decl ) -> decltype( pass.indexer.addUnion( decl ), void() ) {
+                static inline auto addUnionFwd( pass_t & pass, int, const ast::UnionDecl * decl ) -> decltype( pass.symtab.addUnion( decl ), void() ) {
                         UnionDecl * fwd = new UnionDecl( decl->location, decl->name );
                         fwd->params = decl->params;
-                        pass.indexer.addUnion( fwd );
+                        pass.symtab.addUnion( fwd );
                 }
 
@@ -335 +335 @@
 
                 template<typename pass_t>
-                static inline auto addStruct( pass_t & pass, int, const std::string & str ) -> decltype( pass.indexer.addStruct( str ), void() ) {
-                        if ( ! pass.indexer.lookupStruct( str ) ) {
-                                pass.indexer.addStruct( str );
+                static inline auto addStruct( pass_t & pass, int, const std::string & str ) -> decltype( pass.symtab.addStruct( str ), void() ) {
+                        if ( ! pass.symtab.lookupStruct( str ) ) {
+                                pass.symtab.addStruct( str );
                         }
                 }
@@ -345 +345 @@
 
                 template<typename pass_t>
-                static inline auto addUnion( pass_t & pass, int, const std::string & str ) -> decltype( pass.indexer.addUnion( str ), void() ) {
-                        if ( ! pass.indexer.lookupUnion( str ) ) {
-                                pass.indexer.addUnion( str );
+                static inline auto addUnion( pass_t & pass, int, const std::string & str ) -> decltype( pass.symtab.addUnion( str ), void() ) {
+                        if ( ! pass.symtab.lookupUnion( str ) ) {
+                                pass.symtab.addUnion( str );
                         }
                 }
@@ -354 +354 @@
                 static inline void addUnion( pass_t &, long, const std::string & ) {}
 
-                #undef INDEXER_FUNC1
-                #undef INDEXER_FUNC2
+                #undef SYMTAB_FUNC1
+                #undef SYMTAB_FUNC2
         };
 };