[SCM] grounding tools for (disjunctive) logic programs branch, master, updated. 1e6fb0b2f4dd9b044fa7d28f1f152c9d0f3f9706

[Thomas Krennwallner]

The following commit has been merged in the master branch:
commit 1e6fb0b2f4dd9b044fa7d28f1f152c9d0f3f9706
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Thu Nov 22 10:48:11 2012 +0100

    Apply upstream patches for fixing potassco bugs 75 and 76.

diff --git a/debian/changelog b/debian/changelog
index 8ca556c..55c1b5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gringo (3.0.4-4) unstable; urgency=low
+
+  * Apply upstream patches from subversion r6200 and r6237 for fixing
+    potassco bugs 75 and 76, resp.
+  * debian/patches/gringo-cond.patch: New file originally from
+    http://sourceforge.net/p/potassco/code/6291/tree/tags/gringo-3.0.4/patches/patch-cond.diff?format=raw.
+  * debian/patches/gringo-unpool-pred.patch: New file originally from
+    http://sourceforge.net/p/potassco/code/6291/tree/tags/gringo-3.0.4/patches/patch-unpool-pred.diff?format=raw.
+  * debian/control: Bump Standards-Version to 3.9.4.
+
+ -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Thu, 22 Nov 2012 10:40:56 +0100
+
 gringo (3.0.4-3) unstable; urgency=low
 
   * Bug fix: "please build-depend on unversionend boost libraries", thanks
diff --git a/debian/control b/debian/control
index 461343e..a9d5428 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 8.0.0),
  libboost-filesystem-dev,
  libboost-system-dev,
  liblua5.1-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/debian-science/packages/gringo.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/gringo.git
 Homepage: http://potassco.sourceforge.net/
diff --git a/debian/patches/gringo-cond.patch b/debian/patches/gringo-cond.patch
new file mode 100644
index 0000000..03467ec
--- /dev/null
+++ b/debian/patches/gringo-cond.patch
@@ -0,0 +1,46 @@
+Description: Fixes segfault with conditionals.
+Origin: upstream, http://sourceforge.net/p/potassco/code/6291/tree/tags/gringo-3.0.4/patches/patch-cond.diff?format=raw
+Bug: http://sourceforge.net/p/potassco/bugs/75/
+Author: Roland Kaminski <kaminski at cs.uni-potsdam.de>
+Last-Update: 2012-11-04
+
+Index: gringo-3.0.4-source/libgringo/gringo/predlit.h
+===================================================================
+--- gringo-3.0.4-source.orig/libgringo/gringo/predlit.h	2012-11-22 10:29:40.000000000 +0100
++++ gringo-3.0.4-source/libgringo/gringo/predlit.h	2012-11-22 10:30:04.000000000 +0100
+@@ -35,6 +35,7 @@
+ 	typedef boost::unordered_set<PredSig, PredCmp, PredCmp> PredSet;
+ public:
+ 	PredLitSet();
++	PredLitSet(PredLitSet const &other);
+ 	bool insert(PredLit *pred, size_t pos, Val &val);
+ 	void clear();
+ private:
+Index: gringo-3.0.4-source/libgringo/src/predlit.cpp
+===================================================================
+--- gringo-3.0.4-source.orig/libgringo/src/predlit.cpp	2012-11-22 10:29:44.000000000 +0100
++++ gringo-3.0.4-source/libgringo/src/predlit.cpp	2012-11-22 10:30:04.000000000 +0100
+@@ -53,6 +53,12 @@
+ {
+ }
+ 
++PredLitSet::PredLitSet(PredLitSet const &other)
++	: set_(0, PredCmp(vals_), PredCmp(vals_))
++{
++    assert(other.vals_.empty());
++}
++
+ bool PredLitSet::insert(PredLit *pred, size_t pos, Val &val)
+ {
+ 	ValRng rng = pred->vals(pos);
+@@ -133,6 +139,10 @@
+ void PredLit::push()
+ {
+ 	top_ = vals_.size();
++    for (size_t i = vals_.size() - terms_.size(), end = vals_.size(); i != end; ++i)
++    {
++        vals_.push_back(vals_[i]);
++    }
+ }
+ 
+ bool PredLit::testUnique(PredLitSet &set, Val val)
diff --git a/debian/patches/gringo-unpool-pred.patch b/debian/patches/gringo-unpool-pred.patch
new file mode 100644
index 0000000..d0b0b6f
--- /dev/null
+++ b/debian/patches/gringo-unpool-pred.patch
@@ -0,0 +1,21 @@
+Description: Fixes grounding bug.
+Origin: upstream, http://sourceforge.net/p/potassco/code/6291/tree/tags/gringo-3.0.4/patches/patch-unpool-pred.diff?format=raw.
+Bug: http://sourceforge.net/p/potassco/bugs/76/
+Author: Roland Kaminski <kaminski at cs.uni-potsdam.de>
+Last-Update: 2012-11-12
+
+Index: gringo-3.0.4-source/libgringo/src/predlit.cpp
+===================================================================
+--- gringo-3.0.4-source.orig/libgringo/src/predlit.cpp	2012-11-22 10:29:41.000000000 +0100
++++ gringo-3.0.4-source/libgringo/src/predlit.cpp	2012-11-22 10:29:44.000000000 +0100
+@@ -233,7 +233,9 @@
+ 	{
+ 		for(Term::Split s = i->split(); s.first; s = i->split())
+ 		{
+-			expander->expand(new PredLit(loc(), g->domain(dom_->nameId(), s.second->size()), *s.second), Expander::POOL);
++			PredLit *p = new PredLit(loc(), g->domain(dom_->nameId(), s.second->size()), *s.second);
++			p->sign(sign());
++			expander->expand(p, Expander::POOL);
+ 			terms_.replace(i, s.first);
+ 		}
+ 		i->normalize(this, Term::VecRef(terms_, i), g, expander, !head() && !sign());
diff --git a/debian/patches/series b/debian/patches/series
index 41c5775..e94a319 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 gringo-domain-fwd-decl.patch
 gringo-manpages.patch
 gringo-clang-gcc.patch
+gringo-unpool-pred.patch
+gringo-cond.patch

-- 
grounding tools for (disjunctive) logic programs