Changeset 28f3a19 for src/ResolvExpr/Resolver.cc

Timestamp:

Jun 27, 2018, 3:28:41 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

b21c77a

Parents:

0182bfa (diff), 63238a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into with_gc

File:

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

src/ResolvExpr/Resolver.cc

@@ -211 +211 @@
                         if ( findDeletedExpr( choice.expr ) ) {
                                 trace( choice.expr );
-                                SemanticError( choice.expr, "Unique best alternative includes deleted identifier in " );
+                                SemanticError( untyped->location, choice.expr, "Unique best alternative includes deleted identifier in " );
                         }
                         alt = std::move( choice );
@@ -246 +246 @@
 
                 auto untyped = new CastExpr{ expr }; // cast to void
+                untyped->location = expr->location;
 
                 // set up and resolve expression cast to void
@@ -271 +272 @@
         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 );
@@ -574 +578 @@
 
                                                         // Make sure we don't widen any existing bindings
-                                                        for ( auto & i : resultEnv ) {
-                                                                i.allowWidening = false;
-                                                        }
-
+                                                        resultEnv.forbidWidening();
+                                                        
                                                         // Find any unbound type variables
                                                         resultEnv.extractOpenVars( openVars );