Changeset 6d51bd7 for src/AST/Pass.proto.hpp

Timestamp:

May 15, 2019, 10:15:44 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

be567e9

Parents:

712348a

Message:

Fixes to the new templated pass and started on conversions

File:

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

src/AST/Pass.proto.hpp

@@ -162 +162 @@
 
         // List of fields and their expected types
-        FIELD_PTR( env, const ast::TypeSubstitution )
+        FIELD_PTR( env, const ast::TypeSubstitution * )
         FIELD_PTR( stmtsToAddBefore, std::list< ast::ptr< ast::Stmt > > )
         FIELD_PTR( stmtsToAddAfter , std::list< ast::ptr< ast::Stmt > > )
@@ -235 +235 @@
                 static inline void func( pass_t &, long, type1, type2 ) {}
 
-                INDEXER_FUNC1( addId     , DeclWithType *  );
-                INDEXER_FUNC1( addType   , NamedTypeDecl * );
-                INDEXER_FUNC1( addStruct , StructDecl *    );
-                INDEXER_FUNC1( addEnum   , EnumDecl *      );
-                INDEXER_FUNC1( addUnion  , UnionDecl *     );
-                INDEXER_FUNC1( addTrait  , TraitDecl *     );
-                INDEXER_FUNC2( addWith   , std::list< Expression * > &, Node * );
+                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::list< Expression * > &, 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, ast::StructDecl * decl ) -> decltype( pass.indexer.addStruct( decl ), void() ) {
-                //      ast::StructDecl * fwd = new ast::StructDecl( decl->location, decl->name );
-                //      fwd->parameters = decl->parameters;
-                //      pass.indexer.addStruct( fwd );
-                // }
-
-                // template<typename pass_t>
-                // static inline void addStructFwd( pass_t &, long, ast::StructDecl * ) {}
-
-                // template<typename pass_t>
-                // static inline auto addUnionFwd( pass_t & pass, int, ast::UnionDecl * decl ) -> decltype( pass.indexer.addUnion( decl ), void() ) {
-                //      UnionDecl * fwd = new UnionDecl( decl->name );
-                //      fwd->parameters = decl->parameters;
-                //      pass.indexer.addUnion( fwd );
-                // }
-
-                // template<typename pass_t>
-                // static inline void addUnionFwd( pass_t &, long, ast::UnionDecl * ) {}
-
-                // 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 );
-                //      }
-                // }
-
-                // template<typename pass_t>
-                // static inline void addStruct( pass_t &, long, const std::string & ) {}
-
-                // 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 );
-                //      }
-                // }
-
-                // template<typename pass_t>
-                // static inline void addUnion( pass_t &, long, const std::string & ) {}
+                template<typename pass_t>
+                static inline auto addStructFwd( pass_t & pass, int, const ast::StructDecl * decl ) -> decltype( pass.indexer.addStruct( decl ), void() ) {
+                        ast::StructDecl * fwd = new ast::StructDecl( decl->location, decl->name );
+                        fwd->parameters = decl->parameters;
+                        pass.indexer.addStruct( fwd );
+                }
+
+                template<typename pass_t>
+                static inline void addStructFwd( pass_t &, long, const ast::StructDecl * ) {}
+
+                template<typename pass_t>
+                static inline auto addUnionFwd( pass_t & pass, int, const ast::UnionDecl * decl ) -> decltype( pass.indexer.addUnion( decl ), void() ) {
+                        UnionDecl * fwd = new UnionDecl( decl->location, decl->name );
+                        fwd->parameters = decl->parameters;
+                        pass.indexer.addUnion( fwd );
+                }
+
+                template<typename pass_t>
+                static inline void addUnionFwd( pass_t &, long, const ast::UnionDecl * ) {}
+
+                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 );
+                        }
+                }
+
+                template<typename pass_t>
+                static inline void addStruct( pass_t &, long, const std::string & ) {}
+
+                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 );
+                        }
+                }
+
+                template<typename pass_t>
+                static inline void addUnion( pass_t &, long, const std::string & ) {}
 
                 #undef INDEXER_FUNC1