Changeset 17fc7a5

Timestamp:

Feb 26, 2018, 11:03:13 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

45c43e5

Parents:

df7a162

Message:

Expand VISIT/MUTATE_BODY for BasicType?, PointerType?, ArrayType?, ReferenceType?, FunctionType?

File:

• src/Common/PassVisitor.impl.h (modified) (3 diffs)

src/Common/PassVisitor.impl.h

@@ -2013 +2013 @@
 }
 
-
+//--------------------------------------------------------------------------
+// VoidType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( VoidType * node ) {
@@ -2032 +2033 @@
 }
 
+//--------------------------------------------------------------------------
+// BasicType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( BasicType * node ) {
-        VISIT_BODY( node );
-}
-
+        VISIT_START( node );
+
+        maybeAccept_impl( node->forall, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( BasicType * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->forall, *this );
+
+        MUTATE_END( Type, node );
+}
+
+//--------------------------------------------------------------------------
+// PointerType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( PointerType * node ) {
-        VISIT_BODY( node );
-}
-
+        VISIT_START( node );
+
+        maybeAccept_impl( node->forall, *this );
+        maybeAccept_impl( node->base, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( PointerType * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->forall, *this );
+        maybeMutate_impl( node->base, *this );
+
+        MUTATE_END( Type, node );
+}
+
+//--------------------------------------------------------------------------
+// ArrayType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ArrayType * node ) {
-        VISIT_BODY( node );
-}
-
+        VISIT_START( node );
+
+        maybeAccept_impl( node->forall, *this );
+        maybeAccept_impl( node->dimension, *this );
+        maybeAccept_impl( node->base, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( ArrayType * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->forall, *this );
+        maybeMutate_impl( node->dimension, *this );
+        maybeMutate_impl( node->base, *this );
+
+        MUTATE_END( Type, node );
+}
+
+//--------------------------------------------------------------------------
+// ReferenceType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ReferenceType * node ) {
-        VISIT_BODY( node );
-}
-
+        VISIT_START( node );
+
+        maybeAccept_impl( node->forall, *this );
+        maybeAccept_impl( node->base, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( ReferenceType * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->forall, *this );
+        maybeMutate_impl( node->base, *this );
+
+        MUTATE_END( Type, node );
+}
+
+//--------------------------------------------------------------------------
+// FunctionType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( FunctionType * node ) {
-        VISIT_BODY( node );
+        VISIT_START( node );
+
+        maybeAccept_impl( node->forall, *this );
+        maybeAccept_impl( node->returnVals, *this );
+        maybeAccept_impl( node->parameters, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( FunctionType * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->forall, *this );
+        maybeMutate_impl( node->returnVals, *this );
+        maybeMutate_impl( node->parameters, *this );
+
+        MUTATE_END( Type, node );
 }
 
@@ -2258 +2346 @@
 
 template< typename pass_type >
-Type * PassVisitor< pass_type >::mutate( BasicType * node ) {
-        MUTATE_BODY( Type, node );
-}
-
-template< typename pass_type >
-Type * PassVisitor< pass_type >::mutate( PointerType * node ) {
-        MUTATE_BODY( Type, node );
-}
-
-template< typename pass_type >
-Type * PassVisitor< pass_type >::mutate( ArrayType * node ) {
-        MUTATE_BODY( Type, node );
-}
-
-template< typename pass_type >
-Type * PassVisitor< pass_type >::mutate( ReferenceType * node ) {
-        MUTATE_BODY( Type, node );
-}
-
-template< typename pass_type >
-Type * PassVisitor< pass_type >::mutate( FunctionType * node ) {
-        MUTATE_BODY( Type, node );
-}
-
-template< typename pass_type >
 Type * PassVisitor< pass_type >::mutate( TypeInstType * node ) {
         MUTATE_BODY( Type, node );