Changeset ab904dc for src/Tuples

Timestamp:

Jun 1, 2017, 11:00:46 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

296b2be, 4a58895

Parents:

7b15d7a

Message:

Added mutator capabilities to the pass visitor

File:

• src/Tuples/TupleExpansion.cc (modified) (4 diffs)

src/Tuples/TupleExpansion.cc ¶

@@ -18 +18 @@
 #include <cassert>
 #include "Tuples.h"
+#include "Common/PassVisitor.h"
+#include "Common/ScopedMap.h"
 #include "GenPoly/DeclMutator.h"
+#include "InitTweak/GenInit.h"
+#include "InitTweak/InitTweak.h"
+#include "ResolvExpr/typeops.h"
+#include "SymTab/Mangler.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Initializer.h"
 #include "SynTree/Mutator.h"
 #include "SynTree/Statement.h"
-#include "SynTree/Declaration.h"
 #include "SynTree/Type.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Initializer.h"
-#include "SymTab/Mangler.h"
-#include "Common/ScopedMap.h"
-#include "ResolvExpr/typeops.h"
-#include "InitTweak/GenInit.h"
-#include "InitTweak/InitTweak.h"
 
 namespace Tuples {
@@ -82 +83 @@
                 };
 
-                class TupleIndexExpander final : public Mutator {
-                public:
-                        typedef Mutator Parent;
-                        using Parent::mutate;
-
-                        virtual Expression * mutate( TupleIndexExpr * tupleExpr ) override;
+                class TupleIndexExpander {
+                public:
+                        Expression * postmutate( TupleIndexExpr * tupleExpr );
                 };
 
@@ -116 +114 @@
                 replacer.mutateDeclarationList( translationUnit );
 
-                TupleIndexExpander idxExpander;
+                PassVisitor<TupleIndexExpander> idxExpander;
                 mutateAll( translationUnit, idxExpander );
 
@@ -250 +248 @@
         }
 
-        Expression * TupleIndexExpander::mutate( TupleIndexExpr * tupleExpr ) {
-                Expression * tuple = maybeMutate( tupleExpr->get_tuple(), *this );
+        Expression * TupleIndexExpander::postmutate( TupleIndexExpr * tupleExpr ) {
+                Expression * tuple = tupleExpr->get_tuple();
                 assert( tuple );
                 tupleExpr->set_tuple( nullptr );