Changeset a8a2b0a for src/Common

Timestamp:

Mar 1, 2018, 4:58:03 PM (7 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:

2ec65ad

Parents:

babeeda

git-author:

Rob Schluntz <rschlunt@…> (03/01/18 15:17:24)

git-committer:

Rob Schluntz <rschlunt@…> (03/01/18 16:58:03)

Message:

Expand VISIT/MUTATE_BODY for remaining node types

File:

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

src/Common/PassVisitor.impl.h

@@ -2277 +2277 @@
 }
 
-
+//--------------------------------------------------------------------------
+// TupleType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TupleType * node ) {
-        VISIT_BODY( node );
-}
-
+        VISIT_START( node );
+
+        maybeAccept_impl( node->forall, *this );
+        maybeAccept_impl( node->types, *this );
+        maybeAccept_impl( node->members, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( TupleType * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->forall, *this );
+        maybeMutate_impl( node->types, *this );
+        maybeMutate_impl( node->members, *this );
+
+        MUTATE_END( Type, node );
+}
+
+//--------------------------------------------------------------------------
+// TypeofType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TypeofType * node ) {
-        VISIT_BODY( node );
-}
-
+        VISIT_START( node );
+
+        assert( node->expr );
+        maybeAccept_impl( node->expr, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( TypeofType * node ) {
+        MUTATE_START( node );
+
+        assert( node->expr );
+        maybeMutate_impl( node->expr, *this );
+
+        MUTATE_END( Type, node );
+}
+
+//--------------------------------------------------------------------------
+// AttrType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( AttrType * node ) {
-        VISIT_BODY( node );
-}
-
+        VISIT_START( node );
+
+        if ( node->isType ) {
+                assert( node->type );
+                maybeAccept_impl( node->type, *this );
+        } else {
+                assert( node->expr );
+                maybeAccept_impl( node->expr, *this );
+        } // if
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( AttrType * node ) {
+        MUTATE_START( node );
+
+        if ( node->isType ) {
+                assert( node->type );
+                maybeMutate_impl( node->type, *this );
+        } else {
+                assert( node->expr );
+                maybeMutate_impl( node->expr, *this );
+        } // if
+
+        MUTATE_END( Type, node );
+}
+
+//--------------------------------------------------------------------------
+// VarArgsType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( VarArgsType * node ) {
-        VISIT_BODY( node );
-}
-
+        VISIT_START( node );
+
+        maybeAccept_impl( node->forall, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( VarArgsType * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->forall, *this );
+
+        MUTATE_END( Type, node );
+}
+
+//--------------------------------------------------------------------------
+// ZeroType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ZeroType * node ) {
-        VISIT_BODY( node );
-}
-
+        VISIT_START( node );
+
+        maybeAccept_impl( node->forall, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( ZeroType * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->forall, *this );
+
+        MUTATE_END( Type, node );
+}
+
+//--------------------------------------------------------------------------
+// OneType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( OneType * node ) {
-        VISIT_BODY( node );
-}
-
+        VISIT_START( node );
+
+        maybeAccept_impl( node->forall, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( OneType * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->forall, *this );
+
+        MUTATE_END( Type, node );
+}
+
+//--------------------------------------------------------------------------
+// Designation
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( Designation * node ) {
         VISIT_START( node );
 
-        maybeAccept_impl( node->get_designators(), *this );
+        maybeAccept_impl( node->designators, *this );
 
         VISIT_END( node );
@@ -2321 +2430 @@
         MUTATE_START( node );
 
-        maybeMutate_impl( node->get_designators(), *this );
+        maybeMutate_impl( node->designators, *this );
 
         MUTATE_END( Designation, node );
@@ -2332 +2441 @@
         VISIT_START( node );
 
-        visitExpression( node->get_value() );
+        visitExpression( node->value );
 
         VISIT_END( node );
@@ -2341 +2450 @@
         MUTATE_START( node );
 
-        node->set_value( mutateExpression( node->get_value() ) );
+        node->value = mutateExpression( node->value );
 
         MUTATE_END( Initializer, node );
 }
 
+//--------------------------------------------------------------------------
+// ListInit
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ListInit * node ) {
-        VISIT_BODY( node );
-}
-
+        VISIT_START( node );
+
+        maybeAccept_impl( node->designations, *this );
+        maybeAccept_impl( node->initializers, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Initializer * PassVisitor< pass_type >::mutate( ListInit * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->designations, *this );
+        maybeMutate_impl( node->initializers, *this );
+
+        MUTATE_END( Initializer, node );
+}
+
+//--------------------------------------------------------------------------
+// ConstructorInit
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ConstructorInit * node ) {
-        VISIT_BODY( node );
-}
-
+        VISIT_START( node );
+
+        maybeAccept_impl( node->ctor, *this );
+        maybeAccept_impl( node->dtor, *this );
+        maybeAccept_impl( node->init, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Initializer * PassVisitor< pass_type >::mutate( ConstructorInit * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->ctor, *this );
+        maybeMutate_impl( node->dtor, *this );
+        maybeMutate_impl( node->init, *this );
+
+        MUTATE_END( Initializer, node );
+}
+
+//--------------------------------------------------------------------------
+// Subrange
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( Subrange * node ) {
-        VISIT_BODY( node );
-}
-
+        VISIT_START( node );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Subrange * PassVisitor< pass_type >::mutate( Subrange * node  )  {
+        MUTATE_START( node );
+
+        MUTATE_END( Subrange, node );
+}
+
+//--------------------------------------------------------------------------
+// Attribute
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( Constant * node ) {
-        VISIT_BODY( node );
-}
-
+        VISIT_START( node );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Constant * PassVisitor< pass_type >::mutate( Constant * node  )  {
+        MUTATE_START( node );
+
+        MUTATE_END( Constant, node );
+}
+
+//--------------------------------------------------------------------------
+// Attribute
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( Attribute * node ) {
-        VISIT_BODY( node );
-}
-
-//---------------------------------------------------------------------------------------------------------------
-
-template< typename pass_type >
-Type * PassVisitor< pass_type >::mutate( TupleType * node ) {
-        MUTATE_BODY( Type, node );
-}
-
-template< typename pass_type >
-Type * PassVisitor< pass_type >::mutate( TypeofType * node ) {
-        MUTATE_BODY( Type, node );
-}
-
-template< typename pass_type >
-Type * PassVisitor< pass_type >::mutate( AttrType * node ) {
-        MUTATE_BODY( Type, node );
-}
-
-template< typename pass_type >
-Type * PassVisitor< pass_type >::mutate( VarArgsType * node ) {
-        MUTATE_BODY( Type, node );
-}
-
-template< typename pass_type >
-Type * PassVisitor< pass_type >::mutate( ZeroType * node ) {
-        MUTATE_BODY( Type, node );
-}
-
-template< typename pass_type >
-Type * PassVisitor< pass_type >::mutate( OneType * node ) {
-        MUTATE_BODY( Type, node );
-}
-
-template< typename pass_type >
-Initializer * PassVisitor< pass_type >::mutate( ListInit * node ) {
-        MUTATE_BODY( Initializer, node );
-}
-
-template< typename pass_type >
-Initializer * PassVisitor< pass_type >::mutate( ConstructorInit * node ) {
-        MUTATE_BODY( Initializer, node );
-}
-
-template< typename pass_type >
-Subrange * PassVisitor< pass_type >::mutate( Subrange * node  )  {
-        MUTATE_BODY( Subrange, node );
-}
-
-template< typename pass_type >
-Constant * PassVisitor< pass_type >::mutate( Constant * node  )  {
-        MUTATE_BODY( Constant, node );
+        VISIT_START( node );
+
+        maybeAccept_impl( node->parameters, *this );
+
+        VISIT_END( node );
 }
 
 template< typename pass_type >
 Attribute * PassVisitor< pass_type >::mutate( Attribute * node  )  {
-        MUTATE_BODY( Attribute, node );
-}
-
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->parameters, *this );
+
+        MUTATE_END( Attribute, node );
+}
+
+//--------------------------------------------------------------------------
+// TypeSubstitution
 template< typename pass_type >
 TypeSubstitution * PassVisitor< pass_type >::mutate( TypeSubstitution * node ) {