Changeset a16764a6 for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Feb 28, 2018, 4:48:22 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

446ffa3

Parents:

6a8df56

Message:

Changed warning system to prepare for toggling warnings

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -240 +240 @@
                                 std::cerr << "No reasonable alternatives for expression " << expr << std::endl;
                         )
-                        throw SemanticError( expr, "No reasonable alternatives for expression " );
+                        SemanticError( expr, "No reasonable alternatives for expression " );
                 }
                 if ( prune ) {
@@ -258 +258 @@
                                 stream << " Alternatives are:\n";
                                 printAlts( winners, stream, 1 );
-                                throw SemanticError( expr->location, stream.str() );
+                                SemanticError( expr->location, stream.str() );
                         }
                         alternatives = move(pruned);
@@ -495 +495 @@
                                 return;
                         } else if ( level >= recursionLimit ) {
-                                throw SemanticError( newAlt.expr->location, "Too many recursive assertions" );
+                                SemanticError( newAlt.expr->location, "Too many recursive assertions" );
                         } else {
                                 AssertionSet newerNeed;
@@ -1112 +1112 @@
 
                 AltList candidates;
-                SemanticError errors;
+                SemanticErrorException errors;
                 for ( AltList::iterator func = funcFinder.alternatives.begin(); func != funcFinder.alternatives.end(); ++func ) {
                         try {
@@ -1138 +1138 @@
                                         } // if
                                 }
-                        } catch ( SemanticError &e ) {
+                        } catch ( SemanticErrorException &e ) {
                                 errors.append( e );
                         }
@@ -1167 +1167 @@
                                                 }
                                         }
-                                } catch ( SemanticError &e ) {
+                                } catch ( SemanticErrorException &e ) {
                                         errors.append( e );
                                 }
@@ -1409 +1409 @@
                         findMinCost( finder.alternatives.begin(), finder.alternatives.end(), back_inserter( winners ) );
                         if ( winners.size() != 1 ) {
-                                throw SemanticError( sizeofExpr->get_expr(), "Ambiguous expression in sizeof operand: " );
+                                SemanticError( sizeofExpr->get_expr(), "Ambiguous expression in sizeof operand: " );
                         } // if
                         // return the lowest cost alternative for the argument
@@ -1430 +1430 @@
                         findMinCost( finder.alternatives.begin(), finder.alternatives.end(), back_inserter( winners ) );
                         if ( winners.size() != 1 ) {
-                                throw SemanticError( alignofExpr->get_expr(), "Ambiguous expression in alignof operand: " );
+                                SemanticError( alignofExpr->get_expr(), "Ambiguous expression in alignof operand: " );
                         } // if
                         // return the lowest cost alternative for the argument