Remove "Following constraints are incompatible:" when no constraint

souffle-lang · Feb 28, 2023 · 2914f7b · 2914f7b
1 parent fb4a4f6
commit 2914f7b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 17 deletions.
diff --git a/src/ast/analysis/ErrorAnalyzer.h b/src/ast/analysis/ErrorAnalyzer.h
@@ -95,26 +95,33 @@ class ErrorAnalyzer {
     void explain(ErrorReport& report, const Argument* var, std::string message) {
         if (argumentIsExplained(var)) return;
         std::vector<DiagnosticMessage> additionalMessages;
+        bool doMarkAsExplained = true;
         if (auto it = unsatCores.find(var); it != unsatCores.end()) {
-            additionalMessages.emplace_back("Following constraints are incompatible:");
-            for (const auto& constraint : it->second) {
-                std::stringstream ss;
-                if (auto customMessage = constraint->customMessage(); customMessage) {
-                    ss << "   " << *customMessage;
-                } else {
-                    ss << "   " << *constraint;
-                }
-                if (auto it = constraintLocations.find(constraint); it != constraintLocations.end()) {
-                    additionalMessages.emplace_back(ss.str(), it->second);
-                } else {
-                    additionalMessages.emplace_back(ss.str());
+            if (!it->second.empty()) {
+                additionalMessages.emplace_back("Following constraints are incompatible:");
+                for (const auto& constraint : it->second) {
+                    std::stringstream ss;
+                    if (auto customMessage = constraint->customMessage(); customMessage) {
+                        ss << "   " << *customMessage;
+                    } else {
+                        ss << "   " << *constraint;
+                    }
+                    if (auto it = constraintLocations.find(constraint); it != constraintLocations.end()) {
+                        additionalMessages.emplace_back(ss.str(), it->second);
+                    } else {
+                        additionalMessages.emplace_back(ss.str());
+                    }
                 }
+            } else {
+                doMarkAsExplained = false;
             }
         }
         Diagnostic diag{Diagnostic::Type::ERROR, DiagnosticMessage{message, var->getSrcLoc()},
                 std::move(additionalMessages)};
         report.addDiagnostic(diag);
-        markArgumentAsExplained(var);
+        if (doMarkAsExplained) {
+            markArgumentAsExplained(var);
+        }
     }
 
 private:

diff --git a/tests/semantic/agg_checks/agg_checks.err b/tests/semantic/agg_checks/agg_checks.err
@@ -10,7 +10,9 @@ r("X",Y) :- Y = min X : { X != Y }.
 Error: Unable to deduce type for variable Y in file agg_checks.dl at line 11
 r("X",Y) :- Y = min X : { X != Y, !a(X,Y) }.
 ------^--------------------------------------
-Following constraints are incompatible:
+Error: Unable to deduce type for variable Y in file agg_checks.dl at line 11
+r("X",Y) :- Y = min X : { X != Y, !a(X,Y) }.
+------------^--------------------------------
 Error: Couldn't assign types to the aggregator in file agg_checks.dl at line 11
 r("X",Y) :- Y = min X : { X != Y, !a(X,Y) }.
 ----------------^----------------------------
@@ -26,10 +28,12 @@ r("X",Y) :- Y = min X : { X != Y, !a(X,Y) }.
 Error: Unable to deduce type for variable Y0 in file agg_checks.dl at line 11
 r("X",Y) :- Y = min X : { X != Y, !a(X,Y) }.
 -------------------------------^-------------
-Following constraints are incompatible:
 Error: Ungrounded variable Y0 in file agg_checks.dl at line 11
 r("X",Y) :- Y = min X : { X != Y, !a(X,Y) }.
 -------------------------------^-------------
+Error: Unable to deduce type for variable Y0 in file agg_checks.dl at line 11
+r("X",Y) :- Y = min X : { X != Y, !a(X,Y) }.
+---------------------------------------^-----
 Error: Ungrounded variable X in file agg_checks.dl at line 14
 r("X",Y) :- Y = min X : { a("A",2) }.
 --------------------^-----------------
@@ -42,7 +46,9 @@ r("X",Y) :- Y = min X : { a("A",Y), Y>X }.
 Error: Unable to deduce type for variable Y in file agg_checks.dl at line 20
 r("X",Y) :- Y = min X : a(X,_).
 ------^-------------------------
-Following constraints are incompatible:
+Error: Unable to deduce type for variable Y in file agg_checks.dl at line 20
+r("X",Y) :- Y = min X : a(X,_).
+------------^-------------------
 Error: Couldn't assign types to the aggregator in file agg_checks.dl at line 20
 r("X",Y) :- Y = min X : a(X,_).
 ----------------^---------------
@@ -67,4 +73,4 @@ Relation r in file agg_checks.dl at line 6
 has cyclic aggregation in file agg_checks.dl at line 28
 r("X",Y) :- Y = min Y : r("X",Y).
 ------------------------^---------
-16 errors generated, evaluation aborted
+19 errors generated, evaluation aborted