Changes in src/ResolvExpr/Resolver.cc [d286cf68:cdb990a]

File:

• src/ResolvExpr/Resolver.cc (modified) (4 diffs)

src/ResolvExpr/Resolver.cc

@@ -207 +207 @@
                         Alternative & choice = winners.front();
                         if ( findDeletedExpr( choice.expr ) ) {
-                                SemanticError( untyped->location, choice.expr, "Unique best alternative includes deleted identifier in " );
+                                SemanticError( choice.expr, "Unique best alternative includes deleted identifier in " );
                         }
                         alt = std::move( choice );
@@ -242 +242 @@
 
                 static CastExpr untyped( nullptr ); // cast to void
-                untyped.location = expr->location;
 
                 // set up and resolve expression cast to void
@@ -275 +274 @@
         void findSingleExpression( Expression *& untyped, Type * type, const SymTab::Indexer & indexer ) {
                 assert( untyped && type );
-                // transfer location to generated cast for error purposes
-                CodeLocation location = untyped->location;
                 untyped = new CastExpr( untyped, type );
-                untyped->location = location;
                 findSingleExpression( untyped, indexer );
                 removeExtraneousCast( untyped, indexer );
@@ -582 +578 @@
 
                                                         // Make sure we don't widen any existing bindings
-                                                        resultEnv.forbidWidening();
-                                                        
+                                                        for ( auto & i : resultEnv ) {
+                                                                i.allowWidening = false;
+                                                        }
+
                                                         // Find any unbound type variables
                                                         resultEnv.extractOpenVars( openVars );