Changes in src/ResolvExpr/AlternativeFinder.cc [624b722d:d55d7a6]

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (5 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -252 +252 @@
                                 std::cerr << "No reasonable alternatives for expression " << expr << std::endl;
                         )
-                        throw SemanticError( "No reasonable alternatives for expression ", expr );
+                        throw SemanticError( expr, "No reasonable alternatives for expression " );
                 }
                 if ( prune ) {
@@ -270 +270 @@
                                 stream << "Alternatives are:\n";
                                 printAlts( winners, stream, 1 );
-                                throw SemanticError( stream.str() );
+                                throw SemanticError( expr->location, stream.str() );
                         }
                         alternatives = move(pruned);
@@ -507 +507 @@
                                 return;
                         } else if ( level >= recursionLimit ) {
-                                throw SemanticError( "Too many recursive assertions" );
+                                throw SemanticError( newAlt.expr->location, "Too many recursive assertions" );
                         } else {
                                 AssertionSet newerNeed;
@@ -1421 +1421 @@
                         findMinCost( finder.alternatives.begin(), finder.alternatives.end(), back_inserter( winners ) );
                         if ( winners.size() != 1 ) {
-                                throw SemanticError( "Ambiguous expression in sizeof operand: ", sizeofExpr->get_expr() );
+                                throw SemanticError( sizeofExpr->get_expr(), "Ambiguous expression in sizeof operand: " );
                         } // if
                         // return the lowest cost alternative for the argument
@@ -1442 +1442 @@
                         findMinCost( finder.alternatives.begin(), finder.alternatives.end(), back_inserter( winners ) );
                         if ( winners.size() != 1 ) {
-                                throw SemanticError( "Ambiguous expression in alignof operand: ", alignofExpr->get_expr() );
+                                throw SemanticError( alignofExpr->get_expr(), "Ambiguous expression in alignof operand: " );
                         } // if
                         // return the lowest cost alternative for the argument