[latex3-commits] [git/LaTeX3-latex3-latex3] main: Optimization: use \c_zero_int and \c_one_int (eb377a253)
Bruno Le Floch
blflatex at gmail.com
Fri May 21 14:33:06 CEST 2021
Repository : https://github.com/latex3/latex3
On branch : main
Link : https://github.com/latex3/latex3/commit/eb377a253be4d7a5f28aa4d10094f1653d5cd1bb
>---------------------------------------------------------------
commit eb377a253be4d7a5f28aa4d10094f1653d5cd1bb
Author: Bruno Le Floch <blflatex at gmail.com>
Date: Fri May 21 14:33:06 2021 +0200
Optimization: use \c_zero_int and \c_one_int
Many places had (explicit number) followed by \exp_stop_f:
from the time we had removed all integer constants \c_zero,
\c_one, ..., \c_sixteen etc. Since we kept constants for
zero and one (under new names) we can replace 0 \exp_stop_f:
and 1 \exp_stop_f: by the faster constants.
>---------------------------------------------------------------
eb377a253be4d7a5f28aa4d10094f1653d5cd1bb
l3experimental/xgalley/l3galley.dtx | 18 ++++++++--------
l3kernel/l3candidates.dtx | 4 ++--
l3kernel/l3file.dtx | 2 +-
l3kernel/l3fp-aux.dtx | 2 +-
l3kernel/l3fp-basics.dtx | 18 ++++++++--------
l3kernel/l3fp-convert.dtx | 2 +-
l3kernel/l3fp-expo.dtx | 22 ++++++++++----------
l3kernel/l3fp-logic.dtx | 4 ++--
l3kernel/l3fp-parse.dtx | 8 +++----
l3kernel/l3fp-random.dtx | 10 ++++-----
l3kernel/l3fp-round.dtx | 32 ++++++++++++++--------------
l3kernel/l3fp-trig.dtx | 6 +++---
l3kernel/l3regex.dtx | 38 +++++++++++++++++-----------------
l3kernel/l3str-convert.dtx | 2 +-
l3kernel/l3str.dtx | 14 ++++++-------
l3kernel/l3tl-analysis.dtx | 18 ++++++++--------
l3kernel/l3tl.dtx | 4 ++--
l3kernel/l3token.dtx | 12 +++++------
l3kernel/testfiles/m3sort002.lvt | 2 +-
l3trial/l3bigint/l3bigint.dtx | 12 +++++------
l3trial/l3fp-extras/l3fp-functions.dtx | 2 +-
l3trial/l3ldb/l3ldb.dtx | 4 ++--
l3trial/l3tree/l3tree.dtx | 6 +++---
23 files changed, 121 insertions(+), 121 deletions(-)
diff --git a/l3experimental/xgalley/l3galley.dtx b/l3experimental/xgalley/l3galley.dtx
index 1c7c9bd94..e839a31cd 100644
--- a/l3experimental/xgalley/l3galley.dtx
+++ b/l3experimental/xgalley/l3galley.dtx
@@ -1803,10 +1803,10 @@
\bool_lazy_and:nnTF
{ \dim_compare_p:nNn \l_galley_total_left_margin_dim = \c_zero_dim }
{ \dim_compare_p:nNn \l_galley_total_right_margin_dim = \c_zero_dim }
- { \tex_parshape:D 0 \exp_stop_f: }
+ { \tex_parshape:D \c_zero_int }
{
\tex_parshape:D
- 1 \exp_stop_f:
+ \c_one_int
\l_galley_total_left_margin_dim
\l_galley_text_width_dim
}
@@ -2196,7 +2196,7 @@
\tex_displaywidowpenalties:D
\int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f:
\clist_map_function:nN {#1} \@@_set_aux:n
- 0 \exp_stop_f:
+ \c_zero_int
}
\cs_generate_variant:Nn \galley_display_widow_penalties_set:n { V , v }
\cs_new_protected:Npn \galley_widow_penalties_set:n #1
@@ -2204,7 +2204,7 @@
\tex_widowpenalties:D
\int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f:
\clist_map_function:nN {#1} \@@_set_aux:n
- 0 \exp_stop_f:
+ \c_zero_int
}
\cs_generate_variant:Nn \galley_widow_penalties_set:n { V , v }
\cs_new:Npn \@@_set_aux:n #1 { \int_eval:n {#1} ~ }
@@ -2255,7 +2255,7 @@
\tex_clubpenalties:D
\int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f:
\clist_map_function:nN {#1} \@@_set_aux:n
- 0 \exp_stop_f:
+ \c_zero_int
\@@_calc_interline_penalties:
}
\cs_generate_variant:Nn \galley_display_club_penalties_set:n { V , v }
@@ -2301,7 +2301,7 @@
\cs_new_protected:Npn \@@_set_interline_penalty:nn #1#2
{
\tex_interlinepenalties:D
- \tex_interlinepenalties:D 0 \exp_stop_f:
+ \tex_interlinepenalties:D \c_zero_int
\int_step_function:nN {#1}
\@@_set_interline_penalty_auxi:n
\int_step_function:nnN { #1 + 1 } { \tex_interlinepenalties:D 0 - 1 }
@@ -2357,7 +2357,7 @@
\@@_calc_interline_penalties_auxi:n
\int_step_function:nnN { #2 + 1 } { #1 - 1 }
\@@_calc_interline_penalties_auxii:n
- \tex_interlinepenalties:D \tex_interlinepenalties:D 0 \exp_stop_f:
+ \tex_interlinepenalties:D \tex_interlinepenalties:D \c_zero_int
}
\cs_new:Npn \@@_calc_interline_penalties_auxi:n #1
{
@@ -2373,7 +2373,7 @@
{
\int_eval:n
{
- \tex_interlinepenalties:D \tex_interlinepenalties:D 0 \exp_stop_f:
+ \tex_interlinepenalties:D \tex_interlinepenalties:D \c_zero_int
+ 0 \clist_item:Nn \l_galley_club_penalties_clist {#1}
- \tex_clubpenalties:D #1 ~
}
@@ -2449,7 +2449,7 @@
% last value in the primitive array.
% \begin{macrocode}
\cs_new_protected:Npn \galley_interline_penalty:
- { \int_value:w \tex_interlinepenalties:D \tex_interlinepenalties:D 0 \exp_stop_f: }
+ { \int_value:w \tex_interlinepenalties:D \tex_interlinepenalties:D \c_zero_int }
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 84fd99a2b..f9d4e1fe6 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -1694,7 +1694,7 @@
{ \@@_range_collect_unbraced:w #1 ; { } #2 }
\cs_new:Npn \@@_range_collect_braced:w #1 ; #2#3
{
- \if_int_compare:w #1 > 1 \exp_stop_f:
+ \if_int_compare:w #1 > \c_one_int
\exp_after:wN \@@_range_collect_braced:w
\int_value:w \int_eval:n { #1 - 1 } \exp_after:wN ;
\fi:
@@ -1702,7 +1702,7 @@
}
\cs_new:Npn \@@_range_collect_unbraced:w #1 ; #2#3
{
- \if_int_compare:w #1 > 1 \exp_stop_f:
+ \if_int_compare:w #1 > \c_one_int
\exp_after:wN \@@_range_collect_unbraced:w
\int_value:w \int_eval:n { #1 - 1 } \exp_after:wN ;
\fi:
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index a5ab4bf3f..af133e2a1 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -3198,7 +3198,7 @@
\@@_str_cmp:nn
{ \@@_timestamp:n {#1} }
{ \@@_timestamp:n {#2} }
- #3 0 \exp_stop_f:
+ #3 \c_zero_int
\prg_return_true:
\else:
\prg_return_false:
diff --git a/l3kernel/l3fp-aux.dtx b/l3kernel/l3fp-aux.dtx
index 1811a1747..6cec8f77d 100644
--- a/l3kernel/l3fp-aux.dtx
+++ b/l3kernel/l3fp-aux.dtx
@@ -1222,7 +1222,7 @@
\if_meaning:w 0 #1
\exp_after:wN \@@_small_int_true:wTF
\int_value:w \if_meaning:w 2 #5 - \fi:
- \if_int_compare:w #2 > 0 \exp_stop_f:
+ \if_int_compare:w #2 > \c_zero_int
1 0000 0000
\else:
#3
diff --git a/l3kernel/l3fp-basics.dtx b/l3kernel/l3fp-basics.dtx
index 0a5662979..738350ff4 100644
--- a/l3kernel/l3fp-basics.dtx
+++ b/l3kernel/l3fp-basics.dtx
@@ -1846,15 +1846,15 @@
\cs_new:Npn \@@_sqrt_auxiii_o:wnnnnnnnn
#1; #2#3#4#5#6#7#8#9
{
- \if_int_compare:w #1 > 1 \exp_stop_f:
+ \if_int_compare:w #1 > \c_one_int
\exp_after:wN \@@_sqrt_auxiv_o:NNNNNw
\int_value:w \@@_int_eval:w (#1#2 %)
\else:
- \if_int_compare:w #1#2 > 1 \exp_stop_f:
+ \if_int_compare:w #1#2 > \c_one_int
\exp_after:wN \@@_sqrt_auxv_o:NNNNNw
\int_value:w \@@_int_eval:w (#1#2#3 %)
\else:
- \if_int_compare:w #1#2#3 > 1 \exp_stop_f:
+ \if_int_compare:w #1#2#3 > \c_one_int
\exp_after:wN \@@_sqrt_auxvi_o:NNNNNw
\int_value:w \@@_int_eval:w (#1#2#3#4 %)
\else:
@@ -1872,7 +1872,7 @@
{ \@@_sqrt_auxviii_o:nnnnnnn {0000000#1} {#2#3#4#5#6} }
\cs_new:Npn \@@_sqrt_auxvii_o:NNNNNw 1#1#2#3#4#5#6;
{
- \if_int_compare:w #1#2 = 0 \exp_stop_f:
+ \if_int_compare:w #1#2 = \c_zero_int
\exp_after:wN \@@_sqrt_auxx_o:Nnnnnnnn
\fi:
\@@_sqrt_auxviii_o:nnnnnnn {00000000} {000#1#2#3#4#5}
@@ -1967,11 +1967,11 @@
% \begin{macrocode}
\cs_new:Npn \@@_sqrt_auxxii_o:nnnnnnnnw 0; #1#2#3#4#5#6#7#8 #9;
{
- \if_int_compare:w #1#2 > 0 \exp_stop_f:
- \if_int_compare:w #1#2 = 1 \exp_stop_f:
- \if_int_compare:w #3#4 = 0 \exp_stop_f:
- \if_int_compare:w #5#6 = 0 \exp_stop_f:
- \if_int_compare:w #7#8 = 0 \exp_stop_f:
+ \if_int_compare:w #1#2 > \c_zero_int
+ \if_int_compare:w #1#2 = \c_one_int
+ \if_int_compare:w #3#4 = \c_zero_int
+ \if_int_compare:w #5#6 = \c_zero_int
+ \if_int_compare:w #7#8 = \c_zero_int
\@@_sqrt_auxxiii_o:w
\fi:
\fi:
diff --git a/l3kernel/l3fp-convert.dtx b/l3kernel/l3fp-convert.dtx
index 097da442a..759d07254 100644
--- a/l3kernel/l3fp-convert.dtx
+++ b/l3kernel/l3fp-convert.dtx
@@ -324,7 +324,7 @@
\cs_new:Npn \@@_to_decimal_large:Nnnw #1#2#3#4;
{
\exp_after:wN \@@_trim_zeros:w \int_value:w
- \if_int_compare:w #2 > 0 \exp_stop_f:
+ \if_int_compare:w #2 > \c_zero_int
#2
\fi:
\exp_stop_f:
diff --git a/l3kernel/l3fp-expo.dtx b/l3kernel/l3fp-expo.dtx
index 0be0e3f60..658d6a55b 100644
--- a/l3kernel/l3fp-expo.dtx
+++ b/l3kernel/l3fp-expo.dtx
@@ -182,7 +182,7 @@
{ %^^A todo: ln(1) should be "exact zero", not "underflow"
\exp_after:wN \@@_sanitize:Nw
\int_value:w % for the overall sign
- \if_int_compare:w #1 < 1 \exp_stop_f:
+ \if_int_compare:w #1 < \c_one_int
2
\else:
0
@@ -492,7 +492,7 @@
{ \@@_ln_Taylor_loop:www 21 ; {0000}{0000}{0000}{0000}{0000}{0000} ; }
\cs_new:Npn \@@_ln_Taylor_loop:www #1; #2; #3;
{
- \if_int_compare:w #1 = 1 \exp_stop_f:
+ \if_int_compare:w #1 = \c_one_int
\@@_ln_Taylor_break:w
\fi:
\exp_after:wN \@@_fixed_div_int:wwN \c_@@_one_fixed_tl #1;
@@ -564,7 +564,7 @@
\or:
\exp_after:wN \@@_ln_exponent_one:ww \int_value:w
\else:
- \if_int_compare:w #2 > 0 \exp_stop_f:
+ \if_int_compare:w #2 > \c_zero_int
\exp_after:wN \@@_ln_exponent_small:NNww
\exp_after:wN 0
\exp_after:wN \@@_fixed_sub:wwn \int_value:w
@@ -655,7 +655,7 @@
\exp_after:wN \@@_sanitize:Nw
\exp_after:wN 0
\int_value:w #1 \@@_int_eval:w
- \if_int_compare:w #4 < 0 \exp_stop_f:
+ \if_int_compare:w #4 < \c_zero_int
\exp_after:wN \use_i:nn
\else:
\exp_after:wN \use_ii:nn
@@ -707,7 +707,7 @@
{ \@@_exp_Taylor_loop:www 10 ; #1 ; #1 ; \s_@@_stop }
\cs_new:Npn \@@_exp_Taylor_loop:www #1; #2; #3;
{
- \if_int_compare:w #1 = 1 \exp_stop_f:
+ \if_int_compare:w #1 = \c_one_int
\exp_after:wN \@@_exp_Taylor_break:Nww
\fi:
\@@_fixed_div_int:wwN #3 ; #1 ;
@@ -1001,7 +1001,7 @@
\s_@@ \@@_chk:w 1 #1#2#3; \s_@@ \@@_chk:w #4#5
{
\if_int_compare:w \@@_str_if_eq:nn { #2 #3 }
- { 1 {1000} {0000} {0000} {0000} } = 0 \exp_stop_f:
+ { 1 {1000} {0000} {0000} {0000} } = \c_zero_int
\if_int_compare:w #4 #1 = 32 \exp_stop_f:
\exp_after:wN \@@_case_return_ii_o:ww
\fi:
@@ -1013,7 +1013,7 @@
\exp_after:wN #5
\or:
\if_meaning:w 2 #5 \exp_after:wN \reverse_if:N \fi:
- \if_int_compare:w #2 > 0 \exp_stop_f:
+ \if_int_compare:w #2 > \c_zero_int
\exp_after:wN \@@_case_return_o:Nww
\exp_after:wN \c_inf_fp
\else:
@@ -1048,7 +1048,7 @@
\exp_after:wN \@@_sanitize:Nw
\exp_after:wN 0
\int_value:w
- \if:w #1 \if_int_compare:w #3 > 0 \exp_stop_f: 0 \else: 2 \fi:
+ \if:w #1 \if_int_compare:w #3 > \c_zero_int 0 \else: 2 \fi:
\exp_after:wN \@@_pow_npos_aux:NNnww
\exp_after:wN +
\exp_after:wN \@@_fixed_to_float_o:wN
@@ -1080,7 +1080,7 @@
}
\cs_new:Npn \@@_pow_exponent:wnN #1; #2
{
- \if_int_compare:w #2 > 0 \exp_stop_f:
+ \if_int_compare:w #2 > \c_zero_int
\exp_after:wN \@@_pow_exponent:Nwnnnnnw % n\ln(10) - (-\ln(x))
\exp_after:wN +
\else:
@@ -1112,7 +1112,7 @@
}
\cs_new:Npn \@@_pow_B:wwN #1#2#3#4#5#6; #7;
{
- \if_int_compare:w #7 < 0 \exp_stop_f:
+ \if_int_compare:w #7 < \c_zero_int
\exp_after:wN \@@_pow_C_neg:w \int_value:w -
\else:
\if_int_compare:w #7 < 22 \exp_stop_f:
@@ -1177,7 +1177,7 @@
\if_case:w \@@_pow_neg_case:w #4 ;
\exp_after:wN \@@_pow_neg_aux:wNN
\or:
- \if_int_compare:w \@@_int_eval:w #1 / 2 = 1 \exp_stop_f:
+ \if_int_compare:w \@@_int_eval:w #1 / 2 = \c_one_int
\@@_invalid_operation_o:Nww ^ #3; #4;
\exp:w \exp_end_continue_f:w
\exp_after:wN \exp_after:wN
diff --git a/l3kernel/l3fp-logic.dtx b/l3kernel/l3fp-logic.dtx
index 165d955d7..e42a3f28f 100644
--- a/l3kernel/l3fp-logic.dtx
+++ b/l3kernel/l3fp-logic.dtx
@@ -214,7 +214,7 @@
\if_int_compare:w #4 < #1 - \fi: 1
\fi:
\else:
- \if_int_compare:w #1#4 = 0 \exp_stop_f:
+ \if_int_compare:w #1#4 = \c_zero_int
0
\else:
1
@@ -257,7 +257,7 @@
\use_none:n #1
\use_none:n #4
\if_int_compare:w
- \@@_compare_back_any:ww #1 #2 ; #4 #5 ; = 0 \exp_stop_f:
+ \@@_compare_back_any:ww #1 #2 ; #4 #5 ; = \c_zero_int
\else:
2 \exp_after:wN \prg_break:
\fi:
diff --git a/l3kernel/l3fp-parse.dtx b/l3kernel/l3fp-parse.dtx
index dcfa86e22..98a92cf26 100644
--- a/l3kernel/l3fp-parse.dtx
+++ b/l3kernel/l3fp-parse.dtx
@@ -1757,7 +1757,7 @@
\if_meaning:w \scan_stop: #1
\if_int_compare:w
\@@_str_if_eq:nn { \s_@@ } { \exp_not:N #1 }
- = 0 \exp_stop_f:
+ = \c_zero_int
0
\__kernel_msg_expandable_error:nnn
{ fp } { after-e } { floating~point~ }
@@ -1771,7 +1771,7 @@
\else:
\if_int_compare:w
\@@_str_if_eq:nn { \int_value:w #1 } { \tex_the:D #1 }
- = 0 \exp_stop_f:
+ = \c_zero_int
\int_value:w #1
\else:
0
@@ -2265,7 +2265,7 @@
\if_catcode:w \scan_stop: \exp_not:N #2
\if_int_compare:w
\@@_str_if_eq:nn { \s_@@_expr_mark } { \exp_not:N #2 }
- = 0 \exp_stop_f:
+ = \c_zero_int
\exp_after:wN \exp_after:wN
\exp_after:wN \@@_parse_infix_mark:NNN
\else:
@@ -2317,7 +2317,7 @@
\if_catcode:w \scan_stop: \exp_not:N #2
\if_int_compare:w
\@@_str_if_eq:nn { \s_@@_expr_mark } { \exp_not:N #2 }
- = 0 \exp_stop_f:
+ = \c_zero_int
\exp_after:wN \exp_after:wN
\exp_after:wN \@@_parse_infix_mark:NNN
\else:
diff --git a/l3kernel/l3fp-random.dtx b/l3kernel/l3fp-random.dtx
index 7b854343e..5997bccf2 100644
--- a/l3kernel/l3fp-random.dtx
+++ b/l3kernel/l3fp-random.dtx
@@ -396,19 +396,19 @@
\if_meaning:w 1 #1
\if_int_compare:w
\@@_use_i_until_s:nw #3 ; > \c_@@_prec_int
- 1 \exp_stop_f:
+ \c_one_int
\fi:
\fi:
}
- { 1 \exp_stop_f: }
+ { \c_one_int }
}
\cs_new:Npn \@@_randint_o:w #1; #2; @
{
\if_case:w
\@@_randint_badarg:w #1;
\@@_randint_badarg:w #2;
- \if:w 1 \@@_compare_back:ww #2; #1; 1 \exp_stop_f: \fi:
- 0 \exp_stop_f:
+ \if:w 1 \@@_compare_back:ww #2; #1; \c_one_int \fi:
+ \c_zero_int
\@@_randint_auxi_o:ww #1; #2;
\or:
\@@_invalid_operation_tl_o:ff
@@ -632,7 +632,7 @@
}
\cs_new:Npn \@@_randint:n #1
{
- \if_int_compare:w #1 < 1 \exp_stop_f:
+ \if_int_compare:w #1 < \c_one_int
\__kernel_msg_expandable_error:nnnn
{ kernel } { randint-backward-range } { 1 } {#1}
\@@_randint:ww #1; 1;
diff --git a/l3kernel/l3fp-round.dtx b/l3kernel/l3fp-round.dtx
index 5012e48e9..3eaaf7122 100644
--- a/l3kernel/l3fp-round.dtx
+++ b/l3kernel/l3fp-round.dtx
@@ -198,21 +198,21 @@
\cs_new:Npn \@@_round_to_ninf:NNN #1 #2 #3
{
\if_meaning:w 2 #1
- \if_int_compare:w #3 > 0 \exp_stop_f:
+ \if_int_compare:w #3 > \c_zero_int
\@@_round_return_one:
\fi:
\fi:
- 0 \exp_stop_f:
+ \c_zero_int
}
-\cs_new:Npn \@@_round_to_zero:NNN #1 #2 #3 { 0 \exp_stop_f: }
+\cs_new:Npn \@@_round_to_zero:NNN #1 #2 #3 { \c_zero_int }
\cs_new:Npn \@@_round_to_pinf:NNN #1 #2 #3
{
\if_meaning:w 0 #1
- \if_int_compare:w #3 > 0 \exp_stop_f:
+ \if_int_compare:w #3 > \c_zero_int
\@@_round_return_one:
\fi:
\fi:
- 0 \exp_stop_f:
+ \c_zero_int
}
\cs_new:Npn \@@_round_to_nearest:NNN #1 #2 #3
{
@@ -225,7 +225,7 @@
\fi:
\fi:
\fi:
- 0 \exp_stop_f:
+ \c_zero_int
}
\cs_new:Npn \@@_round_to_nearest_ninf:NNN #1 #2 #3
{
@@ -238,14 +238,14 @@
\fi:
\fi:
\fi:
- 0 \exp_stop_f:
+ \c_zero_int
}
\cs_new:Npn \@@_round_to_nearest_zero:NNN #1 #2 #3
{
\if_int_compare:w #3 > \c_@@_five_int
\@@_round_return_one:
\fi:
- 0 \exp_stop_f:
+ \c_zero_int
}
\cs_new:Npn \@@_round_to_nearest_pinf:NNN #1 #2 #3
{
@@ -258,7 +258,7 @@
\fi:
\fi:
\fi:
- 0 \exp_stop_f:
+ \c_zero_int
}
\cs_new_eq:NN \@@_round:NNN \@@_round_to_nearest:NNN
% \end{macrocode}
@@ -286,7 +286,7 @@
\if_int_odd:w 0 \if_meaning:w 0 #3 1 \fi:
\if_meaning:w 5 #3 1 \fi:
\exp_stop_f:
- \if_int_compare:w \@@_int_eval:w #4 > 0 \exp_stop_f:
+ \if_int_compare:w \@@_int_eval:w #4 > \c_zero_int
1 +
\fi:
\fi:
@@ -311,7 +311,7 @@
\if_int_odd:w \if_meaning:w 0 #1 1 \else:
\if_meaning:w 5 #1 1 \else:
0 \fi: \fi: \exp_stop_f:
- \if_int_compare:w \@@_int_eval:w #2 > 0 \exp_stop_f:
+ \if_int_compare:w \@@_int_eval:w #2 > \c_zero_int
\@@_int_eval:w 1 +
\fi:
\fi:
@@ -350,10 +350,10 @@
\cs_new_eq:NN \@@_round_to_ninf_neg:NNN \@@_round_to_pinf:NNN
\cs_new:Npn \@@_round_to_zero_neg:NNN #1 #2 #3
{
- \if_int_compare:w #3 > 0 \exp_stop_f:
+ \if_int_compare:w #3 > \c_zero_int
\@@_round_return_one:
\fi:
- 0 \exp_stop_f:
+ \c_zero_int
}
\cs_new_eq:NN \@@_round_to_pinf_neg:NNN \@@_round_to_ninf:NNN
\cs_new_eq:NN \@@_round_to_nearest_neg:NNN \@@_round_to_nearest:NNN
@@ -364,7 +364,7 @@
\if_int_compare:w #3 < \c_@@_five_int \else:
\@@_round_return_one:
\fi:
- 0 \exp_stop_f:
+ \c_zero_int
}
\cs_new_eq:NN \@@_round_to_nearest_pinf_neg:NNN
\@@_round_to_nearest_ninf:NNN
@@ -525,12 +525,12 @@
{
\exp_after:wN \@@_round_normal:NNwNnn
\int_value:w \@@_int_eval:w
- \if_int_compare:w #2 > 0 \exp_stop_f:
+ \if_int_compare:w #2 > \c_zero_int
1 \int_value:w #2
\exp_after:wN \@@_round_pack:Nw
\int_value:w \@@_int_eval:w 1#3 +
\else:
- \if_int_compare:w #3 > 0 \exp_stop_f:
+ \if_int_compare:w #3 > \c_zero_int
1 \int_value:w #3 +
\fi:
\fi:
diff --git a/l3kernel/l3fp-trig.dtx b/l3kernel/l3fp-trig.dtx
index 669642d2e..6459c00b6 100644
--- a/l3kernel/l3fp-trig.dtx
+++ b/l3kernel/l3fp-trig.dtx
@@ -1311,7 +1311,7 @@
7 - \@@_int_eval:w
\fi:
\if_int_compare:w
- \@@_ep_compare:wwww #2,#3; #5,#6; > 0 \exp_stop_f:
+ \@@_ep_compare:wwww #2,#3; #5,#6; > \c_zero_int
3 -
\exp_after:wN \@@_reverse_args:Nww
\fi:
@@ -1398,7 +1398,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_atan_Taylor_loop:www #1; #2; #3;
{
- \if_int_compare:w #1 = -1 \exp_stop_f:
+ \if_int_compare:w #1 = - \c_one_int
\@@_atan_Taylor_break:w
\fi:
\exp_after:wN \@@_fixed_div_int:wwN \c_@@_one_fixed_tl #1;
@@ -1550,7 +1550,7 @@
\cs_new:Npn \@@_asin_normal_o:NfwNnnnnw
#1#2#3 \s_@@ \@@_chk:w 1#4#5#6#7#8#9;
{
- \if_int_compare:w #5 < 1 \exp_stop_f:
+ \if_int_compare:w #5 < \c_one_int
\exp_after:wN \@@_use_none_until_s:w
\fi:
\if_int_compare:w \@@_int_eval:w #5 + #6#7 + #8#9 = 1000 0001 ~
diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index ae611f2e9..a8a2a5a11 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -2260,7 +2260,7 @@
\prg_do_nothing: \prg_do_nothing:
}
{ }
- \if_int_compare:w \l_@@_group_level_int > 0 \exp_stop_f:
+ \if_int_compare:w \l_@@_group_level_int > \c_zero_int
\__kernel_msg_error:nnx { regex } { missing-rparen }
{ \int_use:N \l_@@_group_level_int }
\prg_replicate:nn
@@ -3026,7 +3026,7 @@
}
\cs_new_protected:Npn \@@_compile_group_end:
{
- \if_int_compare:w \l_@@_group_level_int > 0 \exp_stop_f:
+ \if_int_compare:w \l_@@_group_level_int > \c_zero_int
\tl_build_put_right:Nn \l_@@_build_tl { \if_false: { \fi: } }
\tl_build_end:N \l_@@_build_tl
\exp_args:NNNx
@@ -3606,7 +3606,7 @@
{
\@@_class:NnnnN \c_true_bool
{
- \if_int_compare:w "##3 = 0 \exp_stop_f:
+ \if_int_compare:w "##3 = \c_zero_int
\@@_item_exact_cs:n
{ \exp_after:wN \cs_to_str:N ##1 }
\else:
@@ -4323,7 +4323,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_class_repeat:nN #1#2
{
- \if_int_compare:w #1 = 0 \exp_stop_f:
+ \if_int_compare:w #1 = \c_zero_int
\@@_build_transitions_lazyness:NNNNN #2
\@@_action_free:n \l_@@_right_state_int
\@@_tests_action_cost:n \l_@@_left_state_int
@@ -4383,7 +4383,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_group_aux:nnnnN #1#2#3#4#5
{
- \if_int_compare:w #3 = 0 \exp_stop_f:
+ \if_int_compare:w #3 = \c_zero_int
\@@_build_new_state:
\@@_build_transition_right:nNn \@@_action_free_group:n
\l_@@_left_state_int \l_@@_right_state_int
@@ -4487,7 +4487,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_group_repeat:nn #1#2
{
- \if_int_compare:w #2 = 0 \exp_stop_f:
+ \if_int_compare:w #2 = \c_zero_int
\int_set:Nn \l_@@_max_state_int
{ \l_@@_left_state_int - 1 }
\@@_build_new_state:
@@ -4507,7 +4507,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_group_submatches:nNN #1#2#3
{
- \if_int_compare:w #1 > - 1 \exp_stop_f:
+ \if_int_compare:w #1 > - \c_one_int
\@@_toks_put_left:Nx #2 { \@@_action_submatch:nN {#1} < }
\@@_toks_put_left:Nx #3 { \@@_action_submatch:nN {#1} > }
\fi:
@@ -4531,7 +4531,7 @@
\l_@@_right_state_int \l_@@_max_state_int
\int_set_eq:NN \l_@@_internal_a_int \l_@@_left_state_int
\int_set_eq:NN \l_@@_internal_b_int \l_@@_max_state_int
- \if_int_compare:w \int_eval:n {#1} > 1 \exp_stop_f:
+ \if_int_compare:w \int_eval:n {#1} > \c_one_int
\int_set:Nn \l_@@_internal_c_int
{
( #1 - 1 )
@@ -4570,7 +4570,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_group_repeat:nnN #1#2#3
{
- \if_int_compare:w #2 = 0 \exp_stop_f:
+ \if_int_compare:w #2 = \c_zero_int
\@@_group_submatches:nNN {#1}
\l_@@_left_state_int \l_@@_right_state_int
\int_set:Nn \l_@@_internal_a_int
@@ -4641,7 +4641,7 @@
\@@_build_transition_right:nNn \@@_action_free:n
\l_@@_right_state_int \l_@@_max_state_int
}
- \if_int_compare:w #2 = 0 \exp_stop_f:
+ \if_int_compare:w #2 = \c_zero_int
\int_set:Nn \l_@@_right_state_int
{ \l_@@_left_state_int - 1 }
\else:
@@ -5596,7 +5596,7 @@
{ \@@_replacement_normal:n ##1 }
{#1}
\prg_do_nothing: \prg_do_nothing:
- \if_int_compare:w \l_@@_replacement_csnames_int > 0 \exp_stop_f:
+ \if_int_compare:w \l_@@_replacement_csnames_int > \c_zero_int
\__kernel_msg_error:nnx { regex } { replacement-missing-rbrace }
{ \int_use:N \l_@@_replacement_csnames_int }
\tl_build_put_right:Nx \l_@@_build_tl
@@ -5755,7 +5755,7 @@
{
\tl_build_put_right:Nn \l_@@_build_tl
{ \@@_query_submatch:n { \int_eval:n { #1 + ##1 } } }
- \if_int_compare:w \l_@@_replacement_csnames_int = 0 \exp_stop_f:
+ \if_int_compare:w \l_@@_replacement_csnames_int = \c_zero_int
\tl_put_right:Nn \l_@@_balance_tl
{
+ \@@_submatch_balance:n
@@ -5877,7 +5877,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_replacement_rbrace:N #1
{
- \if_int_compare:w \l_@@_replacement_csnames_int > 0 \exp_stop_f:
+ \if_int_compare:w \l_@@_replacement_csnames_int > \c_zero_int
\tl_build_put_right:Nn \l_@@_build_tl { \cs_end: }
\int_decr:N \l_@@_replacement_csnames_int
\else:
@@ -5893,7 +5893,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_replacement_lbrace:N #1
{
- \if_int_compare:w \l_@@_replacement_csnames_int > 0 \exp_stop_f:
+ \if_int_compare:w \l_@@_replacement_csnames_int > \c_zero_int
\__kernel_msg_error:nnn { regex } { cu-lbrace } { u }
\else:
\@@_replacement_normal:n {#1}
@@ -5998,7 +5998,7 @@
\char_set_catcode_group_begin:N \^^@
\cs_new_protected:Npn \@@_replacement_c_B:w
{
- \if_int_compare:w \l_@@_replacement_csnames_int = 0 \exp_stop_f:
+ \if_int_compare:w \l_@@_replacement_csnames_int = \c_zero_int
\int_incr:N \l_@@_balance_int
\fi:
\@@_replacement_char:nNN
@@ -6038,7 +6038,7 @@
\char_set_catcode_group_end:N \^^@
\cs_new_protected:Npn \@@_replacement_c_E:w
{
- \if_int_compare:w \l_@@_replacement_csnames_int = 0 \exp_stop_f:
+ \if_int_compare:w \l_@@_replacement_csnames_int = \c_zero_int
\int_decr:N \l_@@_balance_int
\fi:
\@@_replacement_char:nNN
@@ -6099,7 +6099,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_replacement_c_S:w #1#2
{
- \if_int_compare:w `#2 = 0 \exp_stop_f:
+ \if_int_compare:w `#2 = \c_zero_int
\__kernel_msg_error:nn { regex } { replacement-null-space }
\fi:
\tex_lccode:D `\ = `#2 \scan_stop:
@@ -6588,7 +6588,7 @@
}
\cs_new:Npn \@@_extract_seq_aux:ww #1; #2;
{
- \if_int_compare:w #1 < 0 \exp_stop_f:
+ \if_int_compare:w #1 < \c_zero_int
\prg_replicate:nn {-#1}
{
\flag_raise:n { @@_begin }
@@ -6596,7 +6596,7 @@
}
\fi:
\@@_query_submatch:n {#2}
- \if_int_compare:w #1 > 0 \exp_stop_f:
+ \if_int_compare:w #1 > \c_zero_int
\prg_replicate:nn {#1}
{
\flag_raise:n { @@_end }
diff --git a/l3kernel/l3str-convert.dtx b/l3kernel/l3str-convert.dtx
index 4a84cb821..4346bc56a 100644
--- a/l3kernel/l3str-convert.dtx
+++ b/l3kernel/l3str-convert.dtx
@@ -2563,7 +2563,7 @@
\exp_after:wN \@@_decode_utf_xxxii_end:w
\fi:
#1#2#3#4 \s_@@
- \if_int_compare:w \@@_tmp:w #1#4 > 0 \exp_stop_f:
+ \if_int_compare:w \@@_tmp:w #1#4 > \c_zero_int
\flag_raise:n { str_overflow }
\flag_raise:n { str_error }
\int_use:N \c_@@_replacement_char_int
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 49ee60b33..0e941ea4c 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -1145,12 +1145,12 @@
{
\if_int_compare:w
\@@_if_eq:nn { \exp_not:n {#1} } { \exp_not:n {#3} }
- #2 0 \exp_stop_f:
+ #2 \c_zero_int
\prg_return_true: \else: \prg_return_false: \fi:
}
\prg_new_conditional:Npnn \str_compare:eNe #1#2#3 { p , T , F , TF }
{
- \if_int_compare:w \@@_if_eq:nn {#1} {#3} #2 0 \exp_stop_f:
+ \if_int_compare:w \@@_if_eq:nn {#1} {#3} #2 \c_zero_int
\prg_return_true: \else: \prg_return_false: \fi:
}
% \end{macrocode}
@@ -1171,14 +1171,14 @@
{
\if_int_compare:w
\@@_if_eq:nn { \exp_not:n {#1} } { \exp_not:n {#2} }
- = 0 \exp_stop_f:
+ = \c_zero_int
\prg_return_true: \else: \prg_return_false: \fi:
}
\prg_generate_conditional_variant:Nnn \str_if_eq:nn
{ V , v , o , nV , no , VV , nv } { p , T , F , TF }
\prg_new_conditional:Npnn \str_if_eq:ee #1#2 { p , T , F , TF }
{
- \if_int_compare:w \@@_if_eq:nn {#1} {#2} = 0 \exp_stop_f:
+ \if_int_compare:w \@@_if_eq:nn {#1} {#2} = \c_zero_int
\prg_return_true: \else: \prg_return_false: \fi:
}
% \end{macrocode}
@@ -1193,7 +1193,7 @@
{
\if_int_compare:w
\@@_if_eq:nn { \tl_to_str:N #1 } { \tl_to_str:N #2 }
- = 0 \exp_stop_f: \prg_return_true: \else: \prg_return_false: \fi:
+ = \c_zero_int \prg_return_true: \else: \prg_return_false: \fi:
}
\prg_generate_conditional_variant:Nnn \str_if_eq:NN
{ c , Nc , cc } { T , F , TF , p }
@@ -1667,7 +1667,7 @@
{
\int_eval:n
{
- \if_int_compare:w #1 < 0 \exp_stop_f:
+ \if_int_compare:w #1 < \c_zero_int
\if_int_compare:w #1 < -#2 \exp_stop_f:
0
\else:
@@ -1720,7 +1720,7 @@
\cs_new:Npn \@@_collect_end:wn #1 ;
{
\exp_after:wN \@@_collect_end:nnnnnnnnw
- \if_case:w \if_int_compare:w #1 > 0 \exp_stop_f:
+ \if_case:w \if_int_compare:w #1 > \c_zero_int
#1 \else: 0 \fi: \exp_stop_f:
\or: \or: \or: \or: \or: \or: \fi:
}
diff --git a/l3kernel/l3tl-analysis.dtx b/l3kernel/l3tl-analysis.dtx
index 88217288b..36fc1008f 100644
--- a/l3kernel/l3tl-analysis.dtx
+++ b/l3kernel/l3tl-analysis.dtx
@@ -692,7 +692,7 @@
plus \l_@@_analysis_type_int sp \scan_stop:
\int_incr:N \l_@@_analysis_index_int
\int_zero:N \l_@@_analysis_normal_int
- \if_int_compare:w \l_@@_analysis_nesting_int = -1 \exp_stop_f:
+ \if_int_compare:w \l_@@_analysis_nesting_int = - \c_one_int
\cs_set_eq:NN \@@_analysis_a_loop:w \scan_stop:
\fi:
}
@@ -738,7 +738,7 @@
}
\cs_new_protected:Npn \@@_analysis_a_cs:ww #1; #2;
{
- \if_int_compare:w #1 > 0 \exp_stop_f:
+ \if_int_compare:w #1 > \c_zero_int
\tex_skip:D \l_@@_analysis_index_int
= \int_eval:n { \l_@@_analysis_normal_int + 1 } sp \exp_stop_f:
\tex_advance:D \l_@@_analysis_index_int #1 \exp_stop_f:
@@ -797,7 +797,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_analysis_b_normals:ww #1;
{
- \if_int_compare:w #1 = 0 \exp_stop_f:
+ \if_int_compare:w #1 = \c_zero_int
\@@_analysis_b_special:w
\fi:
\@@_analysis_b_normal:wwN #1;
@@ -868,7 +868,7 @@
{
\exp_after:wN \@@_analysis_b_normals:ww
\int_value:w \int_eval:w
- \if_int_compare:w #1 = 0 \exp_stop_f:
+ \if_int_compare:w #1 = \c_zero_int
#3
\else:
\tex_skip:D \int_eval:n { #4 + #1 } \exp_stop_f:
@@ -1039,7 +1039,7 @@
{
\use_none:n #2
\iow_newline: > \use:nn { ~ } { ~ }
- \if_int_compare:w "#2 = 0 \exp_stop_f:
+ \if_int_compare:w "#2 = \c_zero_int
\exp_after:wN \@@_analysis_show_cs:n
\else:
\if_int_compare:w "#2 = 13 \exp_stop_f:
@@ -1224,10 +1224,10 @@
\cs_new_protected:Npn \@@_peek_analysis_test:
{
\if_int_odd:w
- \if_catcode:w \exp_not:N \l_peek_token { 0 \exp_stop_f: \fi:
- \if_catcode:w \exp_not:N \l_peek_token } 0 \exp_stop_f: \fi:
- \if_meaning:w \l_peek_token \c_space_token 0 \exp_stop_f: \fi:
- 1 \exp_stop_f:
+ \if_catcode:w \exp_not:N \l_peek_token { \c_zero_int \fi:
+ \if_catcode:w \exp_not:N \l_peek_token } \c_zero_int \fi:
+ \if_meaning:w \l_peek_token \c_space_token \c_zero_int \fi:
+ \c_one_int
\exp_after:wN \exp_after:wN
\exp_after:wN \@@_peek_analysis_normal:N
\exp_after:wN \exp_not:N
diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index 68b4e46c4..dad1f1587 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -3465,7 +3465,7 @@
}
\cs_new:Npn \@@_range_skip:w #1 ; #2
{
- \if_int_compare:w #1 > 0 \exp_stop_f:
+ \if_int_compare:w #1 > \c_zero_int
\exp_after:wN \@@_range_skip:w
\int_value:w \int_eval:n { #1 - 1 } \exp_after:wN ;
\else:
@@ -3525,7 +3525,7 @@
{
\int_eval:n
{
- \if_int_compare:w #1 < 0 \exp_stop_f:
+ \if_int_compare:w #1 < \c_zero_int
\if_int_compare:w #1 < -#2 \exp_stop_f:
0
\else:
diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index ce65d8706..411b7a9f2 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -1580,7 +1580,7 @@
\cs_new:Npn \@@_generate_aux:w #1 ; #2 ;
{
\if_int_compare:w #2 = 10 \exp_stop_f:
- \if_int_compare:w #1 = 0 \exp_stop_f:
+ \if_int_compare:w #1 = \c_zero_int
\__kernel_msg_expandable_error:nn { char } { null-space }
\else:
\__kernel_msg_expandable_error:nn { char } { space }
@@ -1595,7 +1595,7 @@
{ invalid-catcode }
\else:
\if_int_odd:w 0
- \if_int_compare:w #1 < 0 \exp_stop_f: 1 \fi:
+ \if_int_compare:w #1 < \c_zero_int 1 \fi:
\if_int_compare:w #1 > \c_max_char_int 1 \fi: \exp_stop_f:
\__kernel_msg_expandable_error:nn { char }
{ out-of-range }
@@ -3143,10 +3143,10 @@ end
\cs_new_protected:Npn \@@_execute_branches_N_type:
{
\if_int_odd:w
- \if_catcode:w \exp_not:N \l_peek_token { 0 \exp_stop_f: \fi:
- \if_catcode:w \exp_not:N \l_peek_token } 0 \exp_stop_f: \fi:
- \if_meaning:w \l_peek_token \c_space_token 0 \exp_stop_f: \fi:
- 1 \exp_stop_f:
+ \if_catcode:w \exp_not:N \l_peek_token { \c_zero_int \fi:
+ \if_catcode:w \exp_not:N \l_peek_token } \c_zero_int \fi:
+ \if_meaning:w \l_peek_token \c_space_token \c_zero_int \fi:
+ \c_one_int
\exp_after:wN \@@_N_type:w
\token_to_meaning:N \l_peek_token
\s_@@_mark \@@_N_type_aux:nnw
diff --git a/l3kernel/testfiles/m3sort002.lvt b/l3kernel/testfiles/m3sort002.lvt
index 9938bb70d..e1eab88f4 100644
--- a/l3kernel/testfiles/m3sort002.lvt
+++ b/l3kernel/testfiles/m3sort002.lvt
@@ -39,7 +39,7 @@
\OMIT
\prg_set_conditional:Npnn \test_compare:nn #1#2 { TF }
{
- \if_int_compare:w \__str_if_eq:nn {#1} {#2} > 0 \exp_stop_f:
+ \if_int_compare:w \__str_if_eq:nn {#1} {#2} > \c_zero_int
\prg_return_false:
\else:
\prg_return_true:
diff --git a/l3trial/l3bigint/l3bigint.dtx b/l3trial/l3bigint/l3bigint.dtx
index 4df122724..033a09e55 100644
--- a/l3trial/l3bigint/l3bigint.dtx
+++ b/l3trial/l3bigint/l3bigint.dtx
@@ -1617,7 +1617,7 @@
\cs_new:Npn \@@_diff_sign_aux:w #1#2 ; #3
{
\if_meaning:w #1 #3 \else:
- \if_meaning:w 1 #1 - \fi: 1 \exp_stop_f:
+ \if_meaning:w 1 #1 - \fi: \c_one_int
\fi:
\if_case:w #1 \exp_stop_f:
\exp_after:wN \@@_diff_sign_pp:w
@@ -1633,8 +1633,8 @@
}
\cs_new:Npn \@@_diff_sign_dd:w #1 ; #2 ;
{
- \if_int_compare:w #1 < #2 - 1 \exp_stop_f: \fi:
- \if_int_compare:w #1 > #2 \exp_stop_f: 1 \exp_stop_f: \fi:
+ \if_int_compare:w #1 < #2 - \c_one_int \fi:
+ \if_int_compare:w #1 > #2 \exp_stop_f: \c_one_int \fi:
}
% \end{macrocode}
% \end{macro}
@@ -1684,7 +1684,7 @@
}
\cs_new:Npn \@@_wrapup_zeros:wNNNNNNNN . #1 00000000 #2#3#4#5#6#7#8#9
{
- \if_int_compare:w #2#3#4#5#6#7#8#9 = 0 \exp_stop_f:
+ \if_int_compare:w #2#3#4#5#6#7#8#9 = \c_zero_int
- 1 \exp_after:wN \@@_wrapup_zeros:wNNNNNNNN
\fi:
. #1 #2#3#4#5#6#7#8#9
@@ -2475,7 +2475,7 @@
\if_int_compare:w
\@@_parse_do:nn {#3}
{ \@@_parse_do:nn {#1} \@@_compare:ww }
- #2 0 \exp_stop_f:
+ #2 \c_zero_int
\prg_return_true:
\else:
\prg_return_false:
@@ -2590,7 +2590,7 @@
\or:
\if_int_compare:w
\@@_str_cmp:nn {#3} { 00000021 47483648 }
- = - 1 \exp_stop_f:
+ = - \c_one_int
\prg_return_true:
\else:
\prg_return_false:
diff --git a/l3trial/l3fp-extras/l3fp-functions.dtx b/l3trial/l3fp-extras/l3fp-functions.dtx
index f72108ab2..0f45041a5 100644
--- a/l3trial/l3fp-extras/l3fp-functions.dtx
+++ b/l3trial/l3fp-extras/l3fp-functions.dtx
@@ -347,7 +347,7 @@
\if_meaning:w @ #2
\exp_after:wN \@@_function_arg_few:w
\fi:
- \if_int_compare:w #1 = 1 \exp_stop_f:
+ \if_int_compare:w #1 = \c_one_int
\exp_after:wN \@@_function_arg_get:w
\fi:
\@@_use_i_until_s:nw
diff --git a/l3trial/l3ldb/l3ldb.dtx b/l3trial/l3ldb/l3ldb.dtx
index 819e25533..974debf99 100644
--- a/l3trial/l3ldb/l3ldb.dtx
+++ b/l3trial/l3ldb/l3ldb.dtx
@@ -1038,13 +1038,13 @@
% \begin{macrocode}
\cs_new_protected:Npn \trace_ldb:x #1
{
- \if_int_compare:w \g_trace_ldb_status > 0 \exp_stop_f:
+ \if_int_compare:w \g_trace_ldb_status > \c_zero_int
\iow_term:x { LDB:~ #1 }
\fi:
}
\cs_new_protected:Npn \trace_ldb_internal:x #1
{
- \if_int_compare:w \g_trace_ldb_status > 1 \exp_stop_f:
+ \if_int_compare:w \g_trace_ldb_status > \c_one_int
\iow_term:x { LDB:~ #1 }
\fi:
}
diff --git a/l3trial/l3tree/l3tree.dtx b/l3trial/l3tree/l3tree.dtx
index a93adfaf7..60e701ae3 100644
--- a/l3trial/l3tree/l3tree.dtx
+++ b/l3trial/l3tree/l3tree.dtx
@@ -311,10 +311,10 @@
\if_hbox:N \l_tree_first_box
\hbox_unpack_drop:N \l_tree_first_box
\else:
- \if_int_compare:w \tex_ht:D \l_tree_first_box = 0 \exp_stop_f:
+ \if_int_compare:w \tex_ht:D \l_tree_first_box = \c_zero_int
\exp_after:wN \exp_after:wN \exp_after:wN \use_none:n
\else:
- \tex_advance:D \l_tree_index_int 1 \exp_stop_f:
+ \tex_advance:D \l_tree_index_int \c_one_int
\tex_dimen:D \l_tree_index_int \tex_ht:D \l_tree_first_box
\fi:
\fi:
@@ -328,7 +328,7 @@
% \begin{macrocode}
\cs_new:Npn \tree_extract_loop:w #1 ;
{
- \if_int_compare:w #1 = 0 \exp_stop_f:
+ \if_int_compare:w #1 = \c_zero_int
\exp_after:wN \prg_break:
\fi:
\exp_not:N \__seq_item:n { \int_value:w \tex_dimen:D #1 }
More information about the latex3-commits
mailing list.