[gringo] 02/04: drop upstream applied gringo-remove-wrong-assertion.patch

[Thomas Krennwallner]

This is an automated email from the git hooks/post-receive script.

tkren-guest pushed a commit to branch devel
in repository gringo.

commit b5099701ed7a542db660f8d033536af6d0653341
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Fri Nov 10 06:16:05 2017 +0000

    drop upstream applied gringo-remove-wrong-assertion.patch
---
 debian/patches/gringo-remove-wrong-assertion.patch | 48 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 49 deletions(-)

diff --git a/debian/patches/gringo-remove-wrong-assertion.patch b/debian/patches/gringo-remove-wrong-assertion.patch
deleted file mode 100644
index 56caec4..0000000
--- a/debian/patches/gringo-remove-wrong-assertion.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Benjamin Kaufmann <kaufmann at cs.uni-potsdam.de>
-Origin: upstream, https://github.com/potassco/clasp/commit/02c6d85573f2372342035239223acbbe4f4991e0.patch
-Bug: https://github.com/potassco/clasp/issues/13
-Date: Fri, 3 Nov 2017 19:14:27 +0100
-Subject: Remove wrong assertion
-
-  * The assertion failed to consider the case where
-    a disjunction was eq to some atom that itself
-    was part of a disjunction.
-
-Fixes #13
----
- clasp/src/logic_program.cpp      | 1 -
- clasp/tests/dlp_builder_test.cpp | 9 +++++++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/clasp/src/logic_program.cpp b/clasp/src/logic_program.cpp
-index 059cd89..08a0224 100644
---- a/clasp/src/logic_program.cpp
-+++ b/clasp/src/logic_program.cpp
-@@ -1277,7 +1277,6 @@ void LogicProgram::finalizeDisjunctions(Preprocessor& p, uint32 numSccs) {
- 		d->destroy();
- 		// create shortcut for supports to avoid duplications during shifting
- 		Literal supportLit = dx != bot ? getEqAtomLit(dx, supports, p, sccMap) : dx;
--		POTASSCO_ASSERT(dx == bot || getRootAtom(supportLit.var())->var() == dx.var());
- 		// create shifted rules and split disjunctions into non-hcf components
- 		for (VarVec::iterator hIt = head.begin(), hEnd = head.end(); hIt != hEnd; ++hIt) {
- 			uint32 scc = getAtom(*hIt)->scc();
-diff --git a/clasp/tests/dlp_builder_test.cpp b/clasp/tests/dlp_builder_test.cpp
-index 88f01a3..68cb772 100644
---- a/clasp/tests/dlp_builder_test.cpp
-+++ b/clasp/tests/dlp_builder_test.cpp
-@@ -171,6 +171,15 @@ TEST_CASE("Disjunctive logic programs", "[asp][dlp]") {
- 		REQUIRE(ctx.master()->isTrue(lp.getLiteral(b)));
- 	}
- 
-+	SECTION("testOddLoop") {
-+		lpAdd(lp.start(ctx),
-+			"a|b :- not c.\n"
-+			"c|d :- not a.\n");
-+		REQUIRE((lp.endProgram() && ctx.endInit()));
-+		REQUIRE(lp.stats.disjunctions[0] == 2);
-+		REQUIRE(lp.stats.disjunctions[1] == 0);
-+	}
-+
- 	SECTION("testNoEqRegression") {
- 		lpAdd(lp.start(ctx, LogicProgram::AspOptions().noEq()),
- 			"{c}.\n"
diff --git a/debian/patches/series b/debian/patches/series
index 5458570..95843bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 gringo-manpages.patch
-gringo-remove-wrong-assertion.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gringo.git