Changeset 4d2d45f for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Apr 9, 2019, 1:50:13 PM (4 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

arm-eh, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c41c18a6

Parents:

5806745

Message:

Improve assertion error messages

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -258 +258 @@
                         // - necessary pre-requisite to pruning
                         AltList candidates;
+                        std::list<std::string> errors;
                         for ( unsigned i = 0; i < alternatives.size(); ++i ) {
-                                resolveAssertions( alternatives[i], indexer, candidates );
+                                resolveAssertions( alternatives[i], indexer, candidates, errors );
                         }
                         // fail early if none such
                         if ( mode.failFast && candidates.empty() ) {
                                 std::ostringstream stream;
-                                stream << "No resolvable alternatives for expression " << expr << "\n"
-                                       << "Alternatives with failing assertions are:\n";
-                                printAlts( alternatives, stream, 1 );
+                                stream << "No alternatives with satisfiable assertions for " << expr << "\n";
+                                //        << "Alternatives with failing assertions are:\n";
+                                // printAlts( alternatives, stream, 1 );
+                                for ( const auto& err : errors ) {
+                                        stream << err;
+                                }
                                 SemanticError( expr->location, stream.str() );
                         }