Changeset b067d9b for src/Common/PassVisitor.proto.h

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Common/PassVisitor.proto.h (modified) (7 diffs)

src/Common/PassVisitor.proto.h

@@ -118 +118 @@
 static inline void postvisit_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) node_type * node, __attribute__((unused)) long unused ) {}
 
+template<typename pass_type, typename node_type>
+static inline auto previsit_impl( pass_type& pass, const node_type * node, __attribute__((unused)) int unused ) -> decltype( pass.previsit( node ), void() ) {
+        pass.previsit( node );
+}
+
+template<typename pass_type, typename node_type>
+static inline void previsit_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) const node_type * node, __attribute__((unused)) long unused ) {}
+
+
+template<typename pass_type, typename node_type>
+static inline auto postvisit_impl( pass_type& pass, const node_type * node, __attribute__((unused)) int unused ) -> decltype( pass.postvisit( node ), void() ) {
+        pass.postvisit( node );
+}
+
+template<typename pass_type, typename node_type>
+static inline void postvisit_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) const node_type * node, __attribute__((unused)) long unused ) {}
+
 //---------------------------------------------------------
 // Mutate
@@ -165 +182 @@
 static inline type * name##_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) long unused ) { return nullptr;}    \
 
-FIELD_PTR( TypeSubstitution *, env )
+FIELD_PTR( const TypeSubstitution *, env )
 FIELD_PTR( std::list< Statement* >, stmtsToAddBefore )
 FIELD_PTR( std::list< Statement* >, stmtsToAddAfter  )
@@ -174 +191 @@
 FIELD_PTR( PassVisitor<pass_type> * const, visitor )
 
+#undef FIELD_PTR
+
 //---------------------------------------------------------
 // Indexer
@@ -198 +217 @@
         pass.indexer.func( arg );                                                                                                \
 }                                                                                                                              \
-                                                                                                                               \
-template<typename pass_type>                                                                                                   \
-static inline void indexer_impl_##func ( pass_type &, long, type ) { }                                                          \
+template<typename pass_type>                                                                                                   \
+static inline void indexer_impl_##func ( pass_type &, long, type ) { }
 
 #define INDEXER_FUNC2( func, type1, type2 )                                                                                             \
@@ -207 +225 @@
         pass.indexer.func( arg1, arg2 );                                                                                                \
 }                                                                                                                              \
-                                                                                                                               \
 template<typename pass_type>                                                                                                   \
 static inline void indexer_impl_##func ( pass_type &, long, type1, type2 ) { }
 
 
-INDEXER_FUNC1( addId     , DeclarationWithType *       );
-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 * > &, BaseSyntaxNode * );
-
-
-template<typename pass_type>
-static inline auto indexer_impl_addStructFwd( pass_type & pass, int, StructDecl * decl ) -> decltype( pass.indexer.addStruct( decl ), void() ) {
+INDEXER_FUNC1( addId     , const DeclarationWithType *       );
+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 Declaration * );
+
+#undef INDEXER_FUNC1
+#undef INDEXER_FUNC2
+
+template<typename pass_type>
+static inline auto indexer_impl_addStructFwd( pass_type & pass, int, const StructDecl * decl ) -> decltype( pass.indexer.addStruct( decl ), void() ) {
         StructDecl * fwd = new StructDecl( decl->name );
         cloneAll( decl->parameters, fwd->parameters );
@@ -229 +248 @@
 
 template<typename pass_type>
-static inline auto indexer_impl_addStructFwd( pass_type &, long, StructDecl * ) {}
-
-template<typename pass_type>
-static inline auto indexer_impl_addUnionFwd( pass_type & pass, int, UnionDecl * decl ) -> decltype( pass.indexer.addUnion( decl ), void() ) {
+static inline auto indexer_impl_addStructFwd( pass_type &, long, const StructDecl * ) {}
+
+template<typename pass_type>
+static inline auto indexer_impl_addUnionFwd( pass_type & pass, int, const UnionDecl * decl ) -> decltype( pass.indexer.addUnion( decl ), void() ) {
         UnionDecl * fwd = new UnionDecl( decl->name );
         cloneAll( decl->parameters, fwd->parameters );
@@ -239 +258 @@
 
 template<typename pass_type>
-static inline auto indexer_impl_addUnionFwd( pass_type &, long, UnionDecl * ) {}
+static inline auto indexer_impl_addUnionFwd( pass_type &, long, const UnionDecl * ) {}
 
 template<typename pass_type>