Changes in src/Tuples/TupleExpansion.cc [027c496:f0ecf9b]

File:

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

src/Tuples/TupleExpansion.cc

@@ -315 +315 @@
         namespace {
                 /// determines if impurity (read: side-effects) may exist in a piece of code. Currently gives a very crude approximation, wherein any function call expression means the code may be impure
-                struct ImpurityDetector : public WithShortCircuiting {
+                class ImpurityDetector : public Visitor {
+                public:
                         ImpurityDetector( bool ignoreUnique ) : ignoreUnique( ignoreUnique ) {}
 
-                        void previsit( ApplicationExpr * appExpr ) {
-                                visit_children = false;
+                        typedef Visitor Parent;
+                        virtual void visit( ApplicationExpr * appExpr ) {
                                 if ( DeclarationWithType * function = InitTweak::getFunction( appExpr ) ) {
                                         if ( function->get_linkage() == LinkageSpec::Intrinsic ) {
                                                 if ( function->get_name() == "*?" || function->get_name() == "?[?]" ) {
                                                         // intrinsic dereference, subscript are pure, but need to recursively look for impurity
-                                                        visit_children = true;
+                                                        Parent::visit( appExpr );
                                                         return;
                                                 }
@@ -331 +332 @@
                                 maybeImpure = true;
                         }
-                        void previsit( UntypedExpr * ) { maybeImpure = true; visit_children = false; }
-                        void previsit( UniqueExpr * ) {
+                        virtual void visit( UntypedExpr * ) { maybeImpure = true; }
+                        virtual void visit( UniqueExpr * unq ) {
                                 if ( ignoreUnique ) {
                                         // bottom out at unique expression.
                                         // The existence of a unique expression doesn't change the purity of an expression.
                                         // That is, even if the wrapped expression is impure, the wrapper protects the rest of the expression.
-                                        visit_children = false;
                                         return;
                                 }
+                                maybeAccept( unq->expr, *this );
                         }
 
@@ -348 +349 @@
 
         bool maybeImpure( Expression * expr ) {
-                PassVisitor<ImpurityDetector> detector( false );
+                ImpurityDetector detector( false );
                 expr->accept( detector );
-                return detector.pass.maybeImpure;
+                return detector.maybeImpure;
         }
 
         bool maybeImpureIgnoreUnique( Expression * expr ) {
-                PassVisitor<ImpurityDetector> detector( true );
+                ImpurityDetector detector( true );
                 expr->accept( detector );
-                return detector.pass.maybeImpure;
+                return detector.maybeImpure;
         }
 } // namespace Tuples