Changeset bc92bee for src

Timestamp:

Jun 18, 2019, 9:44:23 AM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c8e4d2f8

Parents:

07ca4dd

Message:

Implemented Tuples::maybeImpure while it was fresh in my mind.

Location:

src/Tuples

Files:

• Tuples.cc (modified) (3 diffs)
• Tuples.h (modified) (2 diffs)

src/Tuples/Tuples.cc

@@ -10 +10 @@
 // Created On       : Mon Jun 17 14:41:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jun 12 15:43:00 2019
-// Update Count     : 0
+// Last Modified On : Tue Jun 18  9:31:00 2019
+// Update Count     : 1
 //
 
@@ -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;
+                        maybeImpure = true; visit_children = false;
                 }
                 void previsit( ast::UntypedExpr const * ) {
                         maybeImpure = true; visit_children = false;
                 }
+        };
+        struct ImpurityDetectorIgnoreUnique : public ImpurityDetector {
                 void previsit( ast::UniqueExpr const * ) {
-                        if ( ignoreUnique ) {
-                                visit_children = false;
-                        }
+                        visit_children = false;
                 }
         };
 
-        bool detectImpurity( const ast::Expr * expr, bool ignoreUnique ) {
-                ast::Pass<ImpurityDetector> detector( ignoreUnique );
+        template<typename Detector>
+        bool detectImpurity( const ast::Expr * expr ) {
+                ast::Pass<Detector> detector;
                 expr->accept( detector );
                 return detector.pass.maybeImpure;
@@ -59 +56 @@
 } // namespace
 
+bool maybeImpure( const ast::Expr * expr ) {
+        return detectImpurity<ImpurityDetector>( expr );
+}
+
 bool maybeImpureIgnoreUnique( const ast::Expr * expr ) {
-        return detectImpurity( expr, true );
+        return detectImpurity<ImpurityDetectorIgnoreUnique>( expr );
 }
 

src/Tuples/Tuples.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jun 12 10:39:00 2017
-// Update Count     : 17
+// Last Modified On : Tue Jun 18 09:36:00 2019
+// Update Count     : 18
 //
 
@@ -56 +56 @@
         /// returns true if the expression may contain side-effects.
         bool maybeImpure( Expression * expr );
+        bool maybeImpure( const ast::Expr * expr );
 
         /// Returns true if the expression may contain side-effect,