rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2955 from rotu/radical-cockroach

Browse Source 
Remove xor as a builtin infix operator
This commit is contained in:
Mark Thom
2025-05-19 22:47:41 -07:00
committed by GitHub
parent c790bbfce9 b767e4de25
commit 8f514ce419
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/ops_and_meta_predicates.pl
View File

@@ -26,7 +26,6 @@
:- op(200, xfy, ^). :- op(200, xfy, ^).
:- op(500, yfx, /\). :- op(500, yfx, /\).
:- op(500, yfx, \/). :- op(500, yfx, \/).
:- op(500, yfx, xor).
:- op(400, yfx, div). :- op(400, yfx, div).
:- op(400, yfx, //). :- op(400, yfx, //).
:- op(400, yfx, rdiv). :- op(400, yfx, rdiv).

8
src/tests/arithmetic.pl
View File

@@ -258,14 +258,14 @@ test_and_or_xor(X, Y, AndExpected, OrExpected, XorExpected) :-
Or2 is Y \/ X, Or2 is Y \/ X,
Or == OrExpected, Or == OrExpected,
Or == Or2, Or == Or2,
Xor is X xor Y, Xor is xor(X, Y),
Xor2 is Y xor X, Xor2 is xor(Y, X),
Xor == XorExpected, Xor == XorExpected,
Xor2 == Xor, Xor2 == Xor,
call(is, And3, X /\ Y), call(is, And3, X /\ Y),
call(is, Or3, X \/ Y), call(is, Or3, X \/ Y),
call(is, Xor3, X xor Y), call(is, Xor3, xor(X, Y)),
And3 == And, And3 == And,
Or3 == Or, Or3 == Or,
Xor3 == Xor. Xor3 == Xor.
@@ -613,7 +613,7 @@ test("and_or_xor", (
]), arithmetic_tests:test_and_or_xor(X, Y, AndExpected, OrExpected, XorExpected)), ]), arithmetic_tests:test_and_or_xor(X, Y, AndExpected, OrExpected, XorExpected)),
\+ catch(_ is 1 /\ 2.0, _, false), \+ catch(_ is 1 /\ 2.0, _, false),
\+ catch(_ is 1 \/ 2.0, _, false), \+ catch(_ is 1 \/ 2.0, _, false),
\+ catch(_ is 1 xor 2.0, _, false) \+ catch(_ is xor(1, 2.0), _, false)
)). )).
test("mod_rem", ( test("mod_rem", (