Changes in src/GenPoly/PolyMutator.cc [8688ce1:09f800b]

File:

• src/GenPoly/PolyMutator.cc (modified) (6 diffs)

src/GenPoly/PolyMutator.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PolyMutator.cc --
+// PolyMutator.cc -- 
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:26:22 2016
-// Update Count     : 16
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri Aug 14 15:28:50 2015
+// Update Count     : 11
 //
 
@@ -27 +27 @@
         }
 
-        PolyMutator::PolyMutator() : scopeTyVars( (TypeDecl::Kind)-1 ), env( 0 ) {}
+        PolyMutator::PolyMutator() : env( 0 ) {
+        }
 
         void PolyMutator::mutateStatementList( std::list< Statement* > &statements ) {
@@ -63 +64 @@
                                 env = expr->get_env();
                         }
-                        // xxx - should env be cloned (or moved) onto the result of the mutate?
                         return expr->acceptMutator( *this );
                 } else {
@@ -99 +99 @@
 
         Statement * PolyMutator::mutate(SwitchStmt *switchStmt) {
-                mutateStatementList( switchStmt->get_statements() );
+                mutateStatementList( switchStmt->get_branches() );
+                switchStmt->set_condition( mutateExpression( switchStmt->get_condition() ) );
+                return switchStmt;
+        }
+
+        Statement * PolyMutator::mutate(ChooseStmt *switchStmt) {
+                mutateStatementList( switchStmt->get_branches() );
                 switchStmt->set_condition( mutateExpression( switchStmt->get_condition() ) );
                 return switchStmt;
@@ -139 +145 @@
                 return untypedExpr;
         }
-
-
+ 
+ 
         Initializer *PolyMutator::mutate( SingleInit *singleInit ) {
                 singleInit->set_value( mutateExpression( singleInit->get_value() ) );
@@ -146 +152 @@
         }
 
+
+        /* static class method */
+        void PolyMutator::makeTyVarMap( Type *type, TyVarMap &tyVarMap ) {
+                for ( std::list< TypeDecl* >::const_iterator tyVar = type->get_forall().begin(); tyVar != type->get_forall().end(); ++tyVar ) {
+                        assert( *tyVar );
+                        tyVarMap[ (*tyVar)->get_name() ] = (*tyVar)->get_kind();
+                }
+                if ( PointerType *pointer = dynamic_cast< PointerType* >( type ) ) {
+                        makeTyVarMap( pointer->get_base(), tyVarMap );
+                }
+        }
 } // namespace GenPoly