From 81913a598721c2d7994e3b96ff72977fb0528f18 Mon Sep 17 00:00:00 2001
From: Markus Triska <triska@metalevel.at>
Date: Fri, 5 Feb 2021 20:59:47 +0100
Subject: [PATCH 1/2] Revert "preliminary workaround for #788"

This reverts commit 164b9930640656700505188eab684b3575ab1fe8,
which was made obsolete by 75a52f032b95fc74c1c3fa93996fd0f61775c28f.
---
 src/lib/clpz.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/clpz.pl b/src/lib/clpz.pl
index b687354e..b7fa0ea7 100644
--- a/src/lib/clpz.pl
+++ b/src/lib/clpz.pl
@@ -6090,7 +6090,7 @@ distinct_goals_([flow_to(F,To)|Es], V) -->
               get_attr(To, lowlink, L2),
               L1 =\= L2 } ->
             { get_attr(To, value, N) },
-            [clpz:neq_num(V, N)]
+            [neq_num(V, N)]
         ;   []
         ),
         distinct_goals_(Es, V).
@@ -6611,7 +6611,7 @@ gcc_edge_goal(arc_to(_,_,V,F), Val) -->
               get_attr(Val, lowlink, L2),
               L1 =\= L2,
               get_attr(Val, value, Value) } ->
-            [clpz:neq_num(V, Value)]
+            [neq_num(V, Value)]
         ;   []
         ).
 

From a228e46a393015546d6993e59bf178739c028aa6 Mon Sep 17 00:00:00 2001
From: Markus Triska <triska@metalevel.at>
Date: Fri, 5 Feb 2021 21:06:08 +0100
Subject: [PATCH 2/2] =?UTF-8?q?ENHANCED:=20Enable=20goal=20expansion=20for?=
 =?UTF-8?q?=20CLP(=E2=84=A4).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is now possible since #445 is resolved.
---
 src/lib/clpz.pl | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/lib/clpz.pl b/src/lib/clpz.pl
index b7fa0ea7..ead80546 100644
--- a/src/lib/clpz.pl
+++ b/src/lib/clpz.pl
@@ -3068,12 +3068,10 @@ is_false(var(X)) :- nonvar(X).
 
 :- dynamic(goal_expansion/1).
 
-% goal expansion is disabled for now, until #445 is resolved
-%
-% user:goal_expansion(Goal0, Goal) :-
-%         \+ goal_expansion(false),
-%         clpz_expandable(Goal0),
-%         clpz_expansion(Goal0, Goal).
+user:goal_expansion(Goal0, Goal) :-
+        \+ goal_expansion(false),
+        clpz_expandable(Goal0),
+        clpz_expansion(Goal0, Goal).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%