Changes in src/ResolvExpr/ResolveAssertions.cc [4d2d45f9:e1f7eef]

File:

• src/ResolvExpr/ResolveAssertions.cc (modified) (6 diffs)

src/ResolvExpr/ResolveAssertions.cc

@@ -20 +20 @@
 #include <list>                     // for list
 #include <memory>                   // for unique_ptr
-#include <sstream>                  // for ostringstream
-#include <string>                   // for string
+#include <string>
 #include <unordered_map>            // for unordered_map, unordered_multimap
 #include <utility>                  // for move
@@ -28 +27 @@
 #include "Alternative.h"            // for Alternative, AssertionItem, AssertionList
 #include "Common/FilterCombos.h"    // for filterCombos
-#include "Common/Indenter.h"        // for Indenter
 #include "Common/utility.h"         // for sort_mins
 #include "ResolvExpr/RenameVars.h"  // for renameTyVars
@@ -99 +97 @@
                         return { item, item.matches[i] };
                 }
-
-                const DeclarationWithType* get_decl() const { return cache->at(key).deferIds[0].decl; }
 
                 // sortable by key
@@ -368 +364 @@
         static const int recursionLimit = /* 10 */ 4;
 
-        void resolveAssertions( Alternative& alt, const SymTab::Indexer& indexer, AltList& out, std::list<std::string>& errors ) {
+        void resolveAssertions( Alternative& alt, const SymTab::Indexer& indexer, AltList& out ) {
                 // finish early if no assertions to resolve
                 if ( alt.need.empty() ) {
@@ -389 +385 @@
                                 for ( auto& assn : resn.need ) {
                                         // fail early if any assertion is not resolvable
-                                        if ( ! resolveAssertion( assn, resn, assnCache ) ) {
-                                                Indenter tabs{ Indenter::tabsize, 3 };
-                                                std::ostringstream ss;
-                                                ss << tabs << "Unsatisfiable alternative:\n";
-                                                resn.alt.print( ss, ++tabs );
-                                                ss << --tabs << "Could not satisfy assertion:\n";
-                                                assn.decl->print( ss, ++tabs );
-                                                
-                                                errors.emplace_back( ss.str() );
-                                                goto nextResn;
-                                        }
+                                        if ( ! resolveAssertion( assn, resn, assnCache ) ) goto nextResn;
                                 }
 
@@ -418 +404 @@
                                                 resn.deferred, 
                                                 CandidateEnvMerger{ resn.alt.env, resn.alt.openVars, resn.indexer } );
-                                        // fail early if no mutually-compatible assertion satisfaction
-                                        if ( compatible.empty() ) {
-                                                Indenter tabs{ Indenter::tabsize, 3 };
-                                                std::ostringstream ss;
-                                                ss << tabs << "Unsatisfiable alternative:\n";
-                                                resn.alt.print( ss, ++tabs );
-                                                ss << --tabs << "No mutually-compatible satisfaction for assertions:\n";
-                                                ++tabs;
-                                                for ( const auto& d : resn.deferred ) {
-                                                        d.get_decl()->print( ss, tabs );
-                                                }
-
-                                                errors.emplace_back( ss.str() );
-                                                goto nextResn;
-                                        }
                                         // sort by cost
                                         CandidateCost coster{ resn.indexer };