From 9de40b7e50c3131677cea30650a483a3f1e1c6c5 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 25 Feb 2023 09:05:21 -0600 Subject: [PATCH] namespaces.extras: rename ?xor to xor* and add inline --- extra/namespaces/extras/extras.factor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extra/namespaces/extras/extras.factor b/extra/namespaces/extras/extras.factor index d107c48ae7..42d55501f2 100644 --- a/extra/namespaces/extras/extras.factor +++ b/extra/namespaces/extras/extras.factor @@ -11,12 +11,12 @@ ERROR: variable-required variable ; : 2required ( symbol1 symbol2 -- obj1 obj2 ) [ required ] bi@ ; inline : 2get ( symbol1 symbol2 -- obj1 obj2 ) [ get ] bi@ ; inline -: ?xor ( obj1 obj2 -- xor first? ) +: xor* ( obj1 obj2 -- xor first? ) [ swap [ 2drop f f ] [ f ] if* ] - [ [ t ] [ f f ] if* ] if* ; + [ [ t ] [ f f ] if* ] if* ; inline ERROR: one-variable-only symbol1 symbol2 value1 value2 ; : one-of ( symbol1 symbol2 -- str/f first? ) - 2dup [ get ] bi@ 2dup ?xor over + 2dup [ get ] bi@ 2dup xor* over [ [ 4drop ] 2dip ] [ one-variable-only ] if ; -- 2.34.1