Changes in src/Tuples/Tuples.cc [bc92bee:b910d15]

File:

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

src/Tuples/Tuples.cc

@@ -10 +10 @@
 // Created On       : Mon Jun 17 14:41:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Jun 18  9:31:00 2019
-// Update Count     : 1
+// Last Modified On : Wed Jun 12 15:43:00 2019
+// Update Count     : 0
 //
 
@@ -27 +27 @@
         /// impure.
     struct ImpurityDetector : public ast::WithShortCircuiting {
+                ImpurityDetector( bool ignoreUnique ) : ignoreUnique( ignoreUnique ) {}
                 bool maybeImpure = false;
+                bool ignoreUnique;
 
                 void previsit( ast::ApplicationExpr const * appExpr ) {
+                        visit_children = false;
                         if ( ast::DeclWithType const * function = InitTweak::getFunction( appExpr ) ) {
                                 if ( function->linkage == ast::Linkage::Intrinsic
                                                 && ( function->name == "*?" || function->name == "?[?]" ) ) {
+                                        visit_children = true;
                                         return;
                                 }
                         }
-                        maybeImpure = true; visit_children = false;
+                        maybeImpure = true;
                 }
                 void previsit( ast::UntypedExpr const * ) {
                         maybeImpure = true; visit_children = false;
                 }
-        };
-        struct ImpurityDetectorIgnoreUnique : public ImpurityDetector {
                 void previsit( ast::UniqueExpr const * ) {
-                        visit_children = false;
+                        if ( ignoreUnique ) {
+                                visit_children = false;
+                        }
                 }
         };
 
-        template<typename Detector>
-        bool detectImpurity( const ast::Expr * expr ) {
-                ast::Pass<Detector> detector;
+        bool detectImpurity( const ast::Expr * expr, bool ignoreUnique ) {
+                ast::Pass<ImpurityDetector> detector( ignoreUnique );
                 expr->accept( detector );
                 return detector.pass.maybeImpure;
@@ -56 +59 @@
 } // namespace
 
-bool maybeImpure( const ast::Expr * expr ) {
-        return detectImpurity<ImpurityDetector>( expr );
-}
-
 bool maybeImpureIgnoreUnique( const ast::Expr * expr ) {
-        return detectImpurity<ImpurityDetectorIgnoreUnique>( expr );
+        return detectImpurity( expr, true );
 }