Changes in src/ResolvExpr/Resolver.cc [c71b256:93401f8]

File:

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

src/ResolvExpr/Resolver.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tus Aug  8 16:06:00 2017
-// Update Count     : 212
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Feb 17 11:19:40 2018
+// Update Count     : 213
 //
 
@@ -174 +174 @@
                         findMinCost( candidates.begin(), candidates.end(), back_inserter( winners ) );
                         if ( winners.size() == 0 ) {
-                                throw SemanticError( toString( "No reasonable alternatives for ", kindStr, (kindStr != "" ? " " : ""), "expression: "), untyped );
+                                throw SemanticError( untyped, toString( "No reasonable alternatives for ", kindStr, (kindStr != "" ? " " : ""), "expression: ") );
                         } else if ( winners.size() != 1 ) {
                                 std::ostringstream stream;
                                 stream << "Cannot choose between " << winners.size() << " alternatives for " << kindStr << (kindStr != "" ? " " : "") << "expression\n";
                                 untyped->print( stream );
-                                stream << "Alternatives are:\n";
+                                stream << " Alternatives are:\n";
                                 printAlts( winners, stream, 1 );
-                                throw SemanticError( stream.str() );
+                                throw SemanticError( untyped->location, stream.str() );
                         }
 
@@ -187 +187 @@
                         Alternative & choice = winners.front();
                         if ( findDeletedExpr( choice.expr ) ) {
-                                throw SemanticError( "Unique best alternative includes deleted identifier in ", choice.expr );
+                                throw SemanticError( choice.expr, "Unique best alternative includes deleted identifier in " );
                         }
                         alt = std::move( choice );
@@ -484 +484 @@
                                 ss << strict_dynamic_cast<NameExpr*>( clause.target.function )->name;
                                 ss << "' in call to waitfor";
-                                throw SemanticError( ss.str() );
+                                throw SemanticError( stmt->location, ss.str() );
                         }
 
@@ -506 +506 @@
                                         PointerType * pointer = dynamic_cast< PointerType* >( func.expr->get_result()->stripReferences() );
                                         if( !pointer ) {
-                                                throw SemanticError( "candidate not viable: not a pointer type\n", func.expr->get_result() );
+                                                throw SemanticError( func.expr->get_result(), "candidate not viable: not a pointer type\n" );
                                         }
 
                                         FunctionType * function = dynamic_cast< FunctionType* >( pointer->get_base() );
                                         if( !function ) {
-                                                throw SemanticError( "candidate not viable: not a function type\n", pointer->get_base() );
+                                                throw SemanticError( pointer->get_base(), "candidate not viable: not a function type\n" );
                                         }
 
@@ -520 +520 @@
 
                                                 if( !advance_to_mutex( param, param_end ) ) {
-                                                        throw SemanticError("candidate function not viable: no mutex parameters\n", function);
+                                                        throw SemanticError(function, "candidate function not viable: no mutex parameters\n");
                                                 }
                                         }
@@ -559 +559 @@
                                                                         // We ran out of parameters but still have arguments
                                                                         // this function doesn't match
-                                                                        throw SemanticError("candidate function not viable: too many mutex arguments\n", function);
+                                                                        throw SemanticError( function, "candidate function not viable: too many mutex arguments\n" );
                                                                 }
 
@@ -571 +571 @@
                                                                         (*param)->get_type()->print( ss );
                                                                         ss << "'\n";
-                                                                        throw SemanticError(ss.str(), function);
+                                                                        throw SemanticError( function, ss.str() );
                                                                 }
 
@@ -583 +583 @@
                                                                 // We ran out of arguments but still have parameters left
                                                                 // this function doesn't match
-                                                                throw SemanticError("candidate function not viable: too few mutex arguments\n", function);
+                                                                throw SemanticError( function, "candidate function not viable: too few mutex arguments\n" );
                                                         }
 
@@ -610 +610 @@
 
                         // Make sure we got the right number of arguments
-                        if( func_candidates.empty() )    { SemanticError top( "No alternatives for function in call to waitfor"  ); top.append( errors ); throw top; }
-                        if( args_candidates.empty() )    { SemanticError top( "No alternatives for arguments in call to waitfor" ); top.append( errors ); throw top; }
-                        if( func_candidates.size() > 1 ) { SemanticError top( "Ambiguous function in call to waitfor"            ); top.append( errors ); throw top; }
-                        if( args_candidates.size() > 1 ) { SemanticError top( "Ambiguous arguments in call to waitfor"           ); top.append( errors ); throw top; }
+                        if( func_candidates.empty() )    { SemanticError top( stmt->location, "No alternatives for function in call to waitfor"  ); top.append( errors ); throw top; }
+                        if( args_candidates.empty() )    { SemanticError top( stmt->location, "No alternatives for arguments in call to waitfor" ); top.append( errors ); throw top; }
+                        if( func_candidates.size() > 1 ) { SemanticError top( stmt->location, "Ambiguous function in call to waitfor"            ); top.append( errors ); throw top; }
+                        if( args_candidates.size() > 1 ) { SemanticError top( stmt->location, "Ambiguous arguments in call to waitfor"           ); top.append( errors ); throw top; }
                         // TODO: need to use findDeletedExpr to ensure no deleted identifiers are used.