[latex3-commits] [l3svn] r6216 - Move old bool_not and bool_xor back to l3prg
noreply at latex-project.org
noreply at latex-project.org
Mon Nov 2 00:32:43 CET 2015
Author: bruno
Date: 2015-11-02 00:32:43 +0100 (Mon, 02 Nov 2015)
New Revision: 6216
Modified:
trunk/l3kernel/l3candidates.dtx
trunk/l3kernel/l3prg.dtx
trunk/l3kernel/testfiles/m3expl001.luatex.tlg
trunk/l3kernel/testfiles/m3expl001.ptex.tlg
trunk/l3kernel/testfiles/m3expl001.tlg
trunk/l3kernel/testfiles/m3expl001.uptex.tlg
trunk/l3kernel/testfiles/m3expl001.xetex.tlg
trunk/l3kernel/testfiles/m3expl003.luatex.tlg
trunk/l3kernel/testfiles/m3expl003.ptex.tlg
trunk/l3kernel/testfiles/m3expl003.tlg
trunk/l3kernel/testfiles/m3expl003.uptex.tlg
trunk/l3kernel/testfiles/m3expl003.xetex.tlg
Log:
Move old bool_not and bool_xor back to l3prg
When moving the new bool_all, bool_and, bool_any,
bool_or from l3prg (where I mistakenly put them)
to l3candidates, the pre-existing bool_not and
bool_xor moved too.
Modified: trunk/l3kernel/l3candidates.dtx
===================================================================
--- trunk/l3kernel/l3candidates.dtx 2015-10-21 09:34:36 UTC (rev 6215)
+++ trunk/l3kernel/l3candidates.dtx 2015-11-01 23:32:43 UTC (rev 6216)
@@ -637,14 +637,6 @@
% when there are only two \meta{boolean expressions}.
% \end{function}
%
-% \begin{function}[EXP, updated = 2012-07-08]{\bool_not_p:n}
-% \begin{syntax}
-% \cs{bool_not_p:n} \Arg{boolean expression}
-% \end{syntax}
-% Function version of |!(|\meta{boolean expression}|)| within a boolean
-% expression.
-% \end{function}
-%
% \begin{function}[EXP, added = 2015-09-28]{\bool_or_p:nn}
% \begin{syntax}
% \cs{bool_or_p:nn} \Arg{boolexpr_1} \Arg{boolexpr_2}
@@ -657,17 +649,6 @@
% than two \meta{boolean expressions}.
% \end{function}
%
-% \begin{function}[EXP, updated = 2012-07-08]{\bool_xor_p:nn}
-% \begin{syntax}
-% \cs{bool_xor_p:nn} \Arg{boolexpr_1} \Arg{boolexpr_2}
-% \end{syntax}
-% Implements an \enquote{exclusive or} operation between two boolean
-% expressions. There is no infix operation for this logical
-% operator.
-% \end{function}
-%
-
-%
% \begin{function}[added = 2014-08-22, updated = 2015-08-03]{\bool_log:N, \bool_log:c}
% \begin{syntax}
% \cs{bool_log:N} \meta{boolean}
@@ -2622,17 +2603,6 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\bool_not_p:n}
-% \UnitTested
-% The Not variant just reverses the outcome of \cs{bool_if_p:n}. Can
-% be optimized but this is nice and simple and according to the
-% implementation plan. Not even particularly useful to have it when
-% the infix notation is easier to use.
-% \begin{macrocode}
-\cs_new:Npn \bool_not_p:n #1 { \bool_if_p:n { ! ( #1 ) } }
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}{\bool_or_p:nn}
% Only evaluate the second expression if the first is \texttt{false}.
% \begin{macrocode}
@@ -2641,21 +2611,6 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\bool_xor_p:nn}
-% \UnitTested
-% Exclusive or. If the boolean expressions have same truth value,
-% return false, otherwise return true.
-% \begin{macrocode}
-\cs_new:Npn \bool_xor_p:nn #1#2
- {
- \int_compare:nNnTF { \bool_if_p:n {#1} } = { \bool_if_p:n {#2} }
- \c_false_bool
- \c_true_bool
- }
-% \end{macrocode}
-% \end{macro}
-%
-%
% \begin{macro}{\bool_log:N, \bool_log:c, \bool_log:n}
% Redirect output of \cs{bool_show:N} to the log.
% \begin{macrocode}
Modified: trunk/l3kernel/l3prg.dtx
===================================================================
--- trunk/l3kernel/l3prg.dtx 2015-10-21 09:34:36 UTC (rev 6215)
+++ trunk/l3kernel/l3prg.dtx 2015-11-01 23:32:43 UTC (rev 6216)
@@ -391,6 +391,23 @@
% the next predicate or group.
% \end{function}
%
+% \begin{function}[EXP, updated = 2012-07-08]{\bool_not_p:n}
+% \begin{syntax}
+% \cs{bool_not_p:n} \Arg{boolean expression}
+% \end{syntax}
+% Function version of |!(|\meta{boolean expression}|)| within a boolean
+% expression.
+% \end{function}
+%
+% \begin{function}[EXP, updated = 2012-07-08]{\bool_xor_p:nn}
+% \begin{syntax}
+% \cs{bool_xor_p:nn} \Arg{boolexpr_1} \Arg{boolexpr_2}
+% \end{syntax}
+% Implements an \enquote{exclusive or} operation between two boolean
+% expressions. There is no infix operation for this logical
+% operator.
+% \end{function}
+%
% \section{Logical loops}
%
% Loops using either boolean expressions or stored boolean values.
@@ -1205,6 +1222,31 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\bool_not_p:n}
+% \UnitTested
+% The Not variant just reverses the outcome of \cs{bool_if_p:n}. Can
+% be optimized but this is nice and simple and according to the
+% implementation plan. Not even particularly useful to have it when
+% the infix notation is easier to use.
+% \begin{macrocode}
+\cs_new:Npn \bool_not_p:n #1 { \bool_if_p:n { ! ( #1 ) } }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\bool_xor_p:nn}
+% \UnitTested
+% Exclusive or. If the boolean expressions have same truth value,
+% return false, otherwise return true.
+% \begin{macrocode}
+\cs_new:Npn \bool_xor_p:nn #1#2
+ {
+ \int_compare:nNnTF { \bool_if_p:n {#1} } = { \bool_if_p:n {#2} }
+ \c_false_bool
+ \c_true_bool
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{Logical loops}
%
% \begin{macro}{\bool_while_do:Nn, \bool_while_do:cn}
Modified: trunk/l3kernel/testfiles/m3expl001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.luatex.tlg 2015-10-21 09:34:36 UTC (rev 6215)
+++ trunk/l3kernel/testfiles/m3expl001.luatex.tlg 2015-11-01 23:32:43 UTC (rev 6216)
@@ -1440,6 +1440,8 @@
Defining \__bool_eval_skip_to_end_auxi:Nw on line ...
Defining \__bool_eval_skip_to_end_auxii:Nw on line ...
Defining \__bool_eval_skip_to_end_auxiii:Nw on line ...
+Defining \bool_not_p:n on line ...
+Defining \bool_xor_p:nn on line ...
Defining \bool_while_do:Nn on line ...
Defining \bool_until_do:Nn on line ...
Defining \bool_while_do:cn on line ...
@@ -4170,9 +4172,7 @@
Defining \bool_and_p:nn on line ...
Defining \bool_any_p:n on line ...
Defining \__bool_any_aux:n on line ...
-Defining \bool_not_p:n on line ...
Defining \bool_or_p:nn on line ...
-Defining \bool_xor_p:nn on line ...
Defining \bool_log:N on line ...
Defining \bool_log:n on line ...
Defining \bool_log:c on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.ptex.tlg 2015-10-21 09:34:36 UTC (rev 6215)
+++ trunk/l3kernel/testfiles/m3expl001.ptex.tlg 2015-11-01 23:32:43 UTC (rev 6216)
@@ -1438,6 +1438,8 @@
Defining \__bool_eval_skip_to_end_auxi:Nw on line ...
Defining \__bool_eval_skip_to_end_auxii:Nw on line ...
Defining \__bool_eval_skip_to_end_auxiii:Nw on line ...
+Defining \bool_not_p:n on line ...
+Defining \bool_xor_p:nn on line ...
Defining \bool_while_do:Nn on line ...
Defining \bool_until_do:Nn on line ...
Defining \bool_while_do:cn on line ...
@@ -4168,9 +4170,7 @@
Defining \bool_and_p:nn on line ...
Defining \bool_any_p:n on line ...
Defining \__bool_any_aux:n on line ...
-Defining \bool_not_p:n on line ...
Defining \bool_or_p:nn on line ...
-Defining \bool_xor_p:nn on line ...
Defining \bool_log:N on line ...
Defining \bool_log:n on line ...
Defining \bool_log:c on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.tlg 2015-10-21 09:34:36 UTC (rev 6215)
+++ trunk/l3kernel/testfiles/m3expl001.tlg 2015-11-01 23:32:43 UTC (rev 6216)
@@ -1438,6 +1438,8 @@
Defining \__bool_eval_skip_to_end_auxi:Nw on line ...
Defining \__bool_eval_skip_to_end_auxii:Nw on line ...
Defining \__bool_eval_skip_to_end_auxiii:Nw on line ...
+Defining \bool_not_p:n on line ...
+Defining \bool_xor_p:nn on line ...
Defining \bool_while_do:Nn on line ...
Defining \bool_until_do:Nn on line ...
Defining \bool_while_do:cn on line ...
@@ -4168,9 +4170,7 @@
Defining \bool_and_p:nn on line ...
Defining \bool_any_p:n on line ...
Defining \__bool_any_aux:n on line ...
-Defining \bool_not_p:n on line ...
Defining \bool_or_p:nn on line ...
-Defining \bool_xor_p:nn on line ...
Defining \bool_log:N on line ...
Defining \bool_log:n on line ...
Defining \bool_log:c on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.uptex.tlg 2015-10-21 09:34:36 UTC (rev 6215)
+++ trunk/l3kernel/testfiles/m3expl001.uptex.tlg 2015-11-01 23:32:43 UTC (rev 6216)
@@ -1438,6 +1438,8 @@
Defining \__bool_eval_skip_to_end_auxi:Nw on line ...
Defining \__bool_eval_skip_to_end_auxii:Nw on line ...
Defining \__bool_eval_skip_to_end_auxiii:Nw on line ...
+Defining \bool_not_p:n on line ...
+Defining \bool_xor_p:nn on line ...
Defining \bool_while_do:Nn on line ...
Defining \bool_until_do:Nn on line ...
Defining \bool_while_do:cn on line ...
@@ -4168,9 +4170,7 @@
Defining \bool_and_p:nn on line ...
Defining \bool_any_p:n on line ...
Defining \__bool_any_aux:n on line ...
-Defining \bool_not_p:n on line ...
Defining \bool_or_p:nn on line ...
-Defining \bool_xor_p:nn on line ...
Defining \bool_log:N on line ...
Defining \bool_log:n on line ...
Defining \bool_log:c on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.xetex.tlg 2015-10-21 09:34:36 UTC (rev 6215)
+++ trunk/l3kernel/testfiles/m3expl001.xetex.tlg 2015-11-01 23:32:43 UTC (rev 6216)
@@ -1438,6 +1438,8 @@
Defining \__bool_eval_skip_to_end_auxi:Nw on line ...
Defining \__bool_eval_skip_to_end_auxii:Nw on line ...
Defining \__bool_eval_skip_to_end_auxiii:Nw on line ...
+Defining \bool_not_p:n on line ...
+Defining \bool_xor_p:nn on line ...
Defining \bool_while_do:Nn on line ...
Defining \bool_until_do:Nn on line ...
Defining \bool_while_do:cn on line ...
@@ -4168,9 +4170,7 @@
Defining \bool_and_p:nn on line ...
Defining \bool_any_p:n on line ...
Defining \__bool_any_aux:n on line ...
-Defining \bool_not_p:n on line ...
Defining \bool_or_p:nn on line ...
-Defining \bool_xor_p:nn on line ...
Defining \bool_log:N on line ...
Defining \bool_log:n on line ...
Defining \bool_log:c on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.luatex.tlg 2015-10-21 09:34:36 UTC (rev 6215)
+++ trunk/l3kernel/testfiles/m3expl003.luatex.tlg 2015-11-01 23:32:43 UTC (rev 6216)
@@ -1440,6 +1440,8 @@
Defining \__bool_eval_skip_to_end_auxi:Nw on line ...
Defining \__bool_eval_skip_to_end_auxii:Nw on line ...
Defining \__bool_eval_skip_to_end_auxiii:Nw on line ...
+Defining \bool_not_p:n on line ...
+Defining \bool_xor_p:nn on line ...
Defining \bool_while_do:Nn on line ...
Defining \bool_until_do:Nn on line ...
Defining \bool_while_do:cn on line ...
@@ -4171,9 +4173,7 @@
Defining \bool_and_p:nn on line ...
Defining \bool_any_p:n on line ...
Defining \__bool_any_aux:n on line ...
-Defining \bool_not_p:n on line ...
Defining \bool_or_p:nn on line ...
-Defining \bool_xor_p:nn on line ...
Defining \bool_log:N on line ...
Defining \bool_log:n on line ...
Defining \bool_log:c on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.ptex.tlg 2015-10-21 09:34:36 UTC (rev 6215)
+++ trunk/l3kernel/testfiles/m3expl003.ptex.tlg 2015-11-01 23:32:43 UTC (rev 6216)
@@ -1438,6 +1438,8 @@
Defining \__bool_eval_skip_to_end_auxi:Nw on line ...
Defining \__bool_eval_skip_to_end_auxii:Nw on line ...
Defining \__bool_eval_skip_to_end_auxiii:Nw on line ...
+Defining \bool_not_p:n on line ...
+Defining \bool_xor_p:nn on line ...
Defining \bool_while_do:Nn on line ...
Defining \bool_until_do:Nn on line ...
Defining \bool_while_do:cn on line ...
@@ -4169,9 +4171,7 @@
Defining \bool_and_p:nn on line ...
Defining \bool_any_p:n on line ...
Defining \__bool_any_aux:n on line ...
-Defining \bool_not_p:n on line ...
Defining \bool_or_p:nn on line ...
-Defining \bool_xor_p:nn on line ...
Defining \bool_log:N on line ...
Defining \bool_log:n on line ...
Defining \bool_log:c on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.tlg 2015-10-21 09:34:36 UTC (rev 6215)
+++ trunk/l3kernel/testfiles/m3expl003.tlg 2015-11-01 23:32:43 UTC (rev 6216)
@@ -1438,6 +1438,8 @@
Defining \__bool_eval_skip_to_end_auxi:Nw on line ...
Defining \__bool_eval_skip_to_end_auxii:Nw on line ...
Defining \__bool_eval_skip_to_end_auxiii:Nw on line ...
+Defining \bool_not_p:n on line ...
+Defining \bool_xor_p:nn on line ...
Defining \bool_while_do:Nn on line ...
Defining \bool_until_do:Nn on line ...
Defining \bool_while_do:cn on line ...
@@ -4169,9 +4171,7 @@
Defining \bool_and_p:nn on line ...
Defining \bool_any_p:n on line ...
Defining \__bool_any_aux:n on line ...
-Defining \bool_not_p:n on line ...
Defining \bool_or_p:nn on line ...
-Defining \bool_xor_p:nn on line ...
Defining \bool_log:N on line ...
Defining \bool_log:n on line ...
Defining \bool_log:c on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.uptex.tlg 2015-10-21 09:34:36 UTC (rev 6215)
+++ trunk/l3kernel/testfiles/m3expl003.uptex.tlg 2015-11-01 23:32:43 UTC (rev 6216)
@@ -1438,6 +1438,8 @@
Defining \__bool_eval_skip_to_end_auxi:Nw on line ...
Defining \__bool_eval_skip_to_end_auxii:Nw on line ...
Defining \__bool_eval_skip_to_end_auxiii:Nw on line ...
+Defining \bool_not_p:n on line ...
+Defining \bool_xor_p:nn on line ...
Defining \bool_while_do:Nn on line ...
Defining \bool_until_do:Nn on line ...
Defining \bool_while_do:cn on line ...
@@ -4169,9 +4171,7 @@
Defining \bool_and_p:nn on line ...
Defining \bool_any_p:n on line ...
Defining \__bool_any_aux:n on line ...
-Defining \bool_not_p:n on line ...
Defining \bool_or_p:nn on line ...
-Defining \bool_xor_p:nn on line ...
Defining \bool_log:N on line ...
Defining \bool_log:n on line ...
Defining \bool_log:c on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.xetex.tlg 2015-10-21 09:34:36 UTC (rev 6215)
+++ trunk/l3kernel/testfiles/m3expl003.xetex.tlg 2015-11-01 23:32:43 UTC (rev 6216)
@@ -1438,6 +1438,8 @@
Defining \__bool_eval_skip_to_end_auxi:Nw on line ...
Defining \__bool_eval_skip_to_end_auxii:Nw on line ...
Defining \__bool_eval_skip_to_end_auxiii:Nw on line ...
+Defining \bool_not_p:n on line ...
+Defining \bool_xor_p:nn on line ...
Defining \bool_while_do:Nn on line ...
Defining \bool_until_do:Nn on line ...
Defining \bool_while_do:cn on line ...
@@ -4169,9 +4171,7 @@
Defining \bool_and_p:nn on line ...
Defining \bool_any_p:n on line ...
Defining \__bool_any_aux:n on line ...
-Defining \bool_not_p:n on line ...
Defining \bool_or_p:nn on line ...
-Defining \bool_xor_p:nn on line ...
Defining \bool_log:N on line ...
Defining \bool_log:n on line ...
Defining \bool_log:c on line ...
More information about the latex3-commits
mailing list