Changeset fc638d2 for src/GenPoly

Timestamp:

Dec 13, 2016, 4:13:08 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

7933351

Parents:

f7e749f

Message:

fixed StmtExpr code in PolyMutator, added missing copy constructor, misc documentation

Location:

src/GenPoly

Files:

• CopyParams.cc (modified) (2 diffs)
• PolyMutator.cc (modified) (1 diff)

src/GenPoly/CopyParams.cc

@@ -38 +38 @@
         };
 
+        /// creates local copies of polymorphic function parameters
         void copyParams( std::list< Declaration* > &translationUnit ) {
                 CopyParams copier;
@@ -53 +54 @@
                         if ( ! modVars.empty() ) {
                                 std::map< std::string, DeclarationWithType* > assignOps;
+                                // xxx - this needs to use constructors, not assignment operators
                                 // assume the assignment operator is the first assert param after any "type" parameter
                                 for ( Type::ForallList::const_iterator tyVar = funcDecl->get_functionType()->get_forall().begin(); tyVar != funcDecl->get_functionType()->get_forall().end(); ++tyVar ) {

src/GenPoly/PolyMutator.cc

@@ -149 +149 @@
                 ValueGuard< std::list< Statement* > > oldStmtsToAdd( stmtsToAdd );
                 ValueGuard< std::list< Statement* > > oldStmtsToAddAfter( stmtsToAddAfter );
+                ValueGuard< TypeSubstitution * > oldEnv( env );
 
-                // xxx - not sure if these are needed, along with appropriate assignments, but I don't think so...
-                // ValueGuard< TyVarMap > oldScopeTyVars;
-                // ValueGuard< TypeSubstitution * > oldEnv;
+                // xxx - not sure if this is needed, along with appropriate reset, but I don't think so...
+                // ValueGuard< TyVarMap > oldScopeTyVars( scopeTyVars );
 
                 stmtsToAdd.clear();
                 stmtsToAddAfter.clear();
+                // scopeTyVars.clear();
 
-                stmtExpr->set_result( maybeMutate( stmtExpr->get_result(), *this ) );
-                stmtExpr->set_statements( maybeMutate( stmtExpr->get_statements(), *this ) );
-                return stmtExpr;
+                return Parent::mutate( stmtExpr );
         }