From b767e4de25a5f62591140a0c25153dc4959805d9 Mon Sep 17 00:00:00 2001 From: Dan Rose Date: Tue, 13 May 2025 15:00:00 -0500 Subject: [PATCH] xor is not a standard operator --- src/lib/ops_and_meta_predicates.pl | 1 - src/tests/arithmetic.pl | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib/ops_and_meta_predicates.pl b/src/lib/ops_and_meta_predicates.pl index 8f904d63..8ffdfb03 100644 --- a/src/lib/ops_and_meta_predicates.pl +++ b/src/lib/ops_and_meta_predicates.pl @@ -26,7 +26,6 @@ :- op(200, xfy, ^). :- op(500, yfx, /\). :- op(500, yfx, \/). -:- op(500, yfx, xor). :- op(400, yfx, div). :- op(400, yfx, //). :- op(400, yfx, rdiv). diff --git a/src/tests/arithmetic.pl b/src/tests/arithmetic.pl index 2e4872d4..eea4b3ac 100644 --- a/src/tests/arithmetic.pl +++ b/src/tests/arithmetic.pl @@ -258,14 +258,14 @@ test_and_or_xor(X, Y, AndExpected, OrExpected, XorExpected) :- Or2 is Y \/ X, Or == OrExpected, Or == Or2, - Xor is X xor Y, - Xor2 is Y xor X, + Xor is xor(X, Y), + Xor2 is xor(Y, X), Xor == XorExpected, Xor2 == Xor, call(is, And3, X /\ Y), call(is, Or3, X \/ Y), - call(is, Xor3, X xor Y), + call(is, Xor3, xor(X, Y)), And3 == And, Or3 == Or, Xor3 == Xor. @@ -613,7 +613,7 @@ test("and_or_xor", ( ]), 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 xor 2.0, _, false) + \+ catch(_ is xor(1, 2.0), _, false) )). test("mod_rem", ( -- 2.54.0