From: Markus Triska <triska@metalevel.at>
Date: Tue, 3 Oct 2023 17:15:17 +0000 (+0200)
Subject: Revert "FIXED: corrections to expansion_simpler/2"
X-Git-Tag: remove~56^2
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=7c10683e4628ab77f9ca7133d6f41f5f2a217d37;p=scryer-prolog.git

Revert "FIXED: corrections to expansion_simpler/2"

This reverts commit f3b848537aef601b13bd525df09ee74f5bbeeae9.

The root cause of this problem is a mistake in ground/1. See #2073.
---

diff --git a/src/lib/clpz.pl b/src/lib/clpz.pl
index c4ba62fa..f438043d 100644
--- a/src/lib/clpz.pl
+++ b/src/lib/clpz.pl
@@ -3099,13 +3099,13 @@ expansion_simpler(Var is Expr0, Goal) :-
         ground(Expr0), !,
         phrase(expr_conds(Expr0, Expr), Gs),
         (   maplist(call, Gs) -> Value is Expr, Goal = (Var = Value)
-        ;   Goal = (Var is Expr0)
+        ;   Goal = false
         ).
 expansion_simpler(Var =:= Expr0, Goal) :-
         ground(Expr0), !,
         phrase(expr_conds(Expr0, Expr), Gs),
         (   maplist(call, Gs) -> Value is Expr, Goal = (Var =:= Value)
-        ;   Goal = (Var =:= Expr0)
+        ;   Goal = false
         ).
 expansion_simpler(between:between(L,U,V), Goal) :-
         maplist(integer, [L,U,V]),