Changeset 7664fad

Timestamp:

Oct 4, 2017, 11:30:57 AM (7 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:

adb4a3a

Parents:

bb9d8e8

Message:

Update finishExpr so environment is not lost on multiple resolutions

Location:

src

Files:

• ResolvExpr/Resolver.cc (modified) (5 diffs)
• SymTab/Validate.cc (modified) (1 diff)

src/ResolvExpr/Resolver.cc

@@ -109 +109 @@
 
         namespace {
-                void finishExpr( Expression *expr, const TypeEnvironment &env ) {
-                        expr->set_env( new TypeSubstitution );
+                void finishExpr( Expression *expr, const TypeEnvironment &env, TypeSubstitution * oldenv = nullptr ) {
+                        expr->env = oldenv ? oldenv->clone() : new TypeSubstitution;
                         env.makeSubstitution( *expr->get_env() );
                 }
@@ -119 +119 @@
                 TypeEnvironment env;
                 Expression *newExpr = resolveInVoidContext( untyped, indexer, env );
-                finishExpr( newExpr, env );
+                finishExpr( newExpr, env, untyped->env );
                 return newExpr;
         }
@@ -129 +129 @@
                 #if 0
                 if ( finder.get_alternatives().size() != 1 ) {
-                        std::cout << "untyped expr is ";
-                        untyped->print( std::cout );
-                        std::cout << std::endl << "alternatives are:";
-                        for ( std::list< Alternative >::const_iterator i = finder.get_alternatives().begin(); i != finder.get_alternatives().end(); ++i ) {
-                                i->print( std::cout );
+                        std::cerr << "untyped expr is ";
+                        untyped->print( std::cerr );
+                        std::cerr << std::endl << "alternatives are:";
+                        for ( const Alternative & alt : finder.get_alternatives() ) {
+                                alt.print( std::cerr );
                         } // for
                 } // if
@@ -140 +140 @@
                 Alternative &choice = finder.get_alternatives().front();
                 Expression *newExpr = choice.expr->clone();
-                finishExpr( newExpr, choice.env );
+                finishExpr( newExpr, choice.env, untyped->env );
                 return newExpr;
         }
@@ -186 +186 @@
                                 throw SemanticError( "No interpretations for case control expression", untyped );
                         } // if
-                        finishExpr( newExpr, *newEnv );
+                        finishExpr( newExpr, *newEnv, untyped->env );
                         return newExpr;
                 }

src/SymTab/Validate.cc

@@ -276 +276 @@
                 ReturnChecker::checkFunctionReturns( translationUnit );
                 mutateAll( translationUnit, compoundliteral );
-                acceptAll( translationUnit, fpd );
+                acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines
                 ArrayLength::computeLength( translationUnit );
                 acceptAll( translationUnit, finder );