From ac30bcff673d7664716f3689f83cc7bab03bba59 Mon Sep 17 00:00:00 2001
From: vsc <vsc@b08c6af1-5177-4d33-ba66-4b1c6b8b522a>
Date: Mon, 26 Nov 2001 19:34:27 +0000
Subject: [PATCH] fix previous patch to handle ! in disjunction

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@203 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
---
 pl/boot.yap | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pl/boot.yap b/pl/boot.yap
index e7398aea2..c39330d66 100644
--- a/pl/boot.yap
+++ b/pl/boot.yap
@@ -652,19 +652,14 @@ incore(G) :- '$execute'(G).
 	'$execute_within'(A),
 	'$last_execute_within'(B).
 
-';'((A->B),C) :- !,
-	( '$execute_within'(A) -> '$execute_within'(B) ;
-	  '$execute_within'(C) ).
-';'(A,B) :-
-	( '$execute_within'(A) ;
-	  '$execute_within'(B) ).
+';'(A,B) :- ((A = ( T->G) -> '$execute_within'(T), !, '$execute_within'(G) ;
+             '$execute_within'(A) );
+	     '$execute_within'(B) ).
+
+'|'(A,B) :- ((A = ( T->G) -> '$execute_within'(T), !, '$execute_within'(G) ;
+             '$execute_within'(A) );
+	     '$execute_within'(B) ).
 
-'|'((A->B),C) :- !,
-	( '$execute_within'(A) -> '$execute_within'(B) ;
-	  '$execute_within'(C) ).
-'|'(A,B) :-
-	( '$execute_within'(A) ;
-	  '$execute_within'(B) ).
 
 '->'(A,B) :-
 	( '$execute_within'(A) ->