[latex3-commits] [l3svn] r6967 - Remove a few more uses of named integers
noreply at latex-project.org
noreply at latex-project.org
Mon Feb 20 15:51:30 CET 2017
Author: bruno
Date: 2017-02-20 15:51:30 +0100 (Mon, 20 Feb 2017)
New Revision: 6967
Modified:
trunk/l3kernel/l3candidates.dtx
trunk/l3kernel/l3clist.dtx
trunk/l3kernel/l3expan.dtx
trunk/l3kernel/l3fp-aux.dtx
trunk/l3kernel/l3fp-logic.dtx
trunk/l3kernel/l3seq.dtx
trunk/l3kernel/l3sort.dtx
trunk/l3kernel/l3str.dtx
trunk/l3kernel/l3sys.dtx
trunk/l3kernel/l3tl.dtx
trunk/l3kernel/l3token.dtx
trunk/l3trial/l3bigint/l3bigint.dtx
trunk/l3trial/l3trace/l3trace.dtx
Log:
Remove a few more uses of named integers
Modified: trunk/l3kernel/l3candidates.dtx
===================================================================
--- trunk/l3kernel/l3candidates.dtx 2017-02-20 03:39:43 UTC (rev 6966)
+++ trunk/l3kernel/l3candidates.dtx 2017-02-20 14:51:30 UTC (rev 6967)
@@ -4402,7 +4402,7 @@
}
\cs_new:Npn \@@_range_skip:w #1 ; #2
{
- \if_int_compare:w #1 > \c_zero
+ \if_int_compare:w #1 > 0 \exp_stop_f:
\exp_after:wN \@@_range_skip:w
\__int_value:w \__int_eval:w #1 - 1 \exp_after:wN ;
\else:
@@ -4411,7 +4411,7 @@
}
\cs_new:Npn \@@_range_collect:w #1 ; #2#3
{
- \if_int_compare:w #1 > \c_one
+ \if_int_compare:w #1 > 1 \exp_stop_f:
\exp_after:wN \@@_range_collect:w
\__int_value:w \__int_eval:w #1 - 1 \exp_after:wN ;
\fi:
@@ -4431,11 +4431,11 @@
{
\int_eval:n
{
- \if_int_compare:w #1 < \c_zero
+ \if_int_compare:w #1 < 0 \exp_stop_f:
\if_int_compare:w #1 < -#2 \exp_stop_f:
- \c_zero
+ 0
\else:
- #1 + #2 + \c_one
+ #1 + #2 + 1
\fi:
\else:
\if_int_compare:w #1 < #2 \exp_stop_f:
@@ -4487,10 +4487,10 @@
\cs_new_protected:Npn \@@_execute_branches_N_type:
{
\if_int_odd:w
- \if_catcode:w \exp_not:N \l_peek_token { \c_zero \fi:
- \if_catcode:w \exp_not:N \l_peek_token } \c_zero \fi:
- \if_meaning:w \l_peek_token \c_space_token \c_zero \fi:
- \c_one
+ \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:
\exp_after:wN \@@_N_type:w
\token_to_meaning:N \l_peek_token
\q_mark \@@_N_type_aux:nnw
Modified: trunk/l3kernel/l3clist.dtx
===================================================================
--- trunk/l3kernel/l3clist.dtx 2017-02-20 03:39:43 UTC (rev 6966)
+++ trunk/l3kernel/l3clist.dtx 2017-02-20 14:51:30 UTC (rev 6967)
@@ -1643,7 +1643,7 @@
{
\int_eval:n
{
- \c_zero
+ 0
\clist_map_function:NN #1 \@@_count:n
}
}
@@ -1652,16 +1652,16 @@
{
\exp_not:N \int_eval:n
{
- \c_zero
+ 0
\exp_not:N \@@_count:w \c_space_tl
#1 \exp_not:n { , \q_recursion_tail , \q_recursion_stop }
}
}
-\cs_new:Npn \@@_count:n #1 { + \c_one }
+\cs_new:Npn \@@_count:n #1 { + 1 }
\cs_new:Npx \@@_count:w #1 ,
{
\exp_not:n { \exp_args:Nf \quark_if_recursion_tail_stop:n } {#1}
- \exp_not:N \tl_if_blank:nF {#1} { + \c_one }
+ \exp_not:N \tl_if_blank:nF {#1} { + 1 }
\exp_not:N \@@_count:w \c_space_tl
}
% \end{macrocode}
Modified: trunk/l3kernel/l3expan.dtx
===================================================================
--- trunk/l3kernel/l3expan.dtx 2017-02-20 03:39:43 UTC (rev 6966)
+++ trunk/l3kernel/l3expan.dtx 2017-02-20 14:51:30 UTC (rev 6967)
@@ -1426,11 +1426,11 @@
%\cs_new_eq:NN \exp:w \tex_romannumeral:D
% \end{macrocode}
% So to stop the expansion sequence in a controlled way all we need
-% to provide is \cs{c_zero} as part of expanded tokens. As this is
+% to provide is a constant integer zero as part of expanded tokens. As this is
% an integer constant it will immediately stop
% \cs{tex_romannumerl:D}'s search for a number.
% \begin{macrocode}
-%\cs_new_eq:NN \exp_end: \c_zero
+%\int_const:Nn \exp_end: { 0 }
% \end{macrocode}
% (Note that according to our specification all tokens we expand
% initiated by \cs{exp:w} are supposed to be expandable (as well as
Modified: trunk/l3kernel/l3fp-aux.dtx
===================================================================
--- trunk/l3kernel/l3fp-aux.dtx 2017-02-20 03:39:43 UTC (rev 6966)
+++ trunk/l3kernel/l3fp-aux.dtx 2017-02-20 14:51:30 UTC (rev 6967)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3fp-aux.dtx Copyright(C) 2011-2014,2016 The LaTeX3 Project
+%% File: l3fp-aux.dtx Copyright(C) 2011-2014,2016-2017 The LaTeX3 Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -966,7 +966,7 @@
}
\cs_new:Npn \@@_int_normal:nnnnn #1 #2#3#4#5
{
- \if_int_compare:w #1 > \c_zero
+ \if_int_compare:w #1 > 0 \exp_stop_f:
\@@_decimate:nNnnnn { \c_@@_prec_int - #1 }
\@@_int_test:Nw
{#2} {#3} {#4} {#5}
@@ -1031,7 +1031,7 @@
\cs_new:Npn \@@_small_int_true:wTF #1; #2#3 { #2 {#1} }
\cs_new:Npn \@@_small_int_normal:NnwTF #1#2#3;
{
- \if_int_compare:w #2 > \c_zero
+ \if_int_compare:w #2 > 0 \exp_stop_f:
\@@_decimate:nNnnnn { \c_@@_prec_int - #2 }
\@@_small_int_test:NnnwNnw
#3 #1 {#2}
@@ -1069,13 +1069,13 @@
% \begin{macrocode}
\cs_new:Npn \@@_array_count:n #1
{
- \__int_value:w \__int_eval:w \c_zero
+ \__int_value:w \__int_eval:w 0
\@@_array_count_loop:Nw #1 { ? \__prg_break: } ;
\__prg_break_point:
\__int_eval_end:
}
\cs_new:Npn \@@_array_count_loop:Nw #1#2;
- { \use_none:n #1 + \c_one \@@_array_count_loop:Nw }
+ { \use_none:n #1 + 1 \@@_array_count_loop:Nw }
% \end{macrocode}
% \end{macro}
% \end{macro}
Modified: trunk/l3kernel/l3fp-logic.dtx
===================================================================
--- trunk/l3kernel/l3fp-logic.dtx 2017-02-20 03:39:43 UTC (rev 6966)
+++ trunk/l3kernel/l3fp-logic.dtx 2017-02-20 14:51:30 UTC (rev 6967)
@@ -570,7 +570,7 @@
\cs_new:Npn \@@_ternary_loop_break:w
#1 \fi: #2 \@@_ternary_break_point:n #3
{
- \c_zero = \c_zero \fi:
+ 0 = 0 \exp_stop_f: \fi:
\exp_after:wN \@@_ternary_auxii:NwwN
}
\cs_new:Npn \@@_ternary_loop:Nw \s_@@ \@@_chk:w #1#2;
Modified: trunk/l3kernel/l3seq.dtx
===================================================================
--- trunk/l3kernel/l3seq.dtx 2017-02-20 03:39:43 UTC (rev 6966)
+++ trunk/l3kernel/l3seq.dtx 2017-02-20 14:51:30 UTC (rev 6967)
@@ -1710,14 +1710,14 @@
}
\cs_new:Npn \@@_item:nN #1#2
{
- \int_compare:nNnTF {#1} < \c_zero
- { \int_eval:n { \seq_count:N #2 + \c_one + #1 } }
+ \int_compare:nNnTF {#1} < 0
+ { \int_eval:n { \seq_count:N #2 + 1 + #1 } }
{#1}
}
\cs_new:Npn \@@_item:nnn #1#2#3
{
\use_none:n #2
- \int_compare:nNnTF {#1} = \c_one
+ \int_compare:nNnTF {#1} = 1
{ \__prg_break:n { \exp_not:n {#3} } }
{ \exp_args:Nf \@@_item:nnn { \int_eval:n { #1 - 1 } } }
}
@@ -1863,7 +1863,7 @@
\seq_map_function:NN #1 \@@_count:n
}
}
-\cs_new:Npn \@@_count:n #1 { + \c_one }
+\cs_new:Npn \@@_count:n #1 { + 1 }
\cs_generate_variant:Nn \seq_count:N { c }
% \end{macrocode}
% \end{macro}
Modified: trunk/l3kernel/l3sort.dtx
===================================================================
--- trunk/l3kernel/l3sort.dtx 2017-02-20 03:39:43 UTC (rev 6966)
+++ trunk/l3kernel/l3sort.dtx 2017-02-20 14:51:30 UTC (rev 6967)
@@ -335,12 +335,12 @@
\@@_too_long_error:NNw #3 #5
\fi:
\tex_toks:D \l_@@_top_int {##1}
- \tex_advance:D \l_@@_top_int \c_one
+ \int_incr:N \l_@@_top_int
}
\int_set:Nn \l_@@_length_int
{ \l_@@_top_int - \l_@@_min_int }
\cs_set:Npn \@@_compare:nn ##1 ##2 { #6 }
- \int_set_eq:NN \l_@@_block_int \c_one
+ \int_set:Nn \l_@@_block_int { 1 }
\@@_level:
\use:x
{
@@ -464,7 +464,7 @@
\if_int_compare:w #3 < \l_@@_top_int
#1 #2 { \tex_the:D \tex_toks:D #3 }
\exp_after:wN \@@_toks:NNw \exp_after:wN #1 \exp_after:wN #2
- \__int_value:w \__int_eval:w #3 + \c_one \exp_after:wN ;
+ \__int_value:w \__int_eval:w #3 + 1 \exp_after:wN ;
\fi:
}
% \end{macrocode}
@@ -522,9 +522,9 @@
\l_@@_B_int \l_@@_A_int
\l_@@_C_int \l_@@_top_int
\@@_copy_block:
- \tex_advance:D \l_@@_A_int - \c_one
- \tex_advance:D \l_@@_B_int - \c_one
- \tex_advance:D \l_@@_C_int - \c_one
+ \int_decr:N \l_@@_A_int
+ \int_decr:N \l_@@_B_int
+ \int_decr:N \l_@@_C_int
\exp_after:wN \@@_merge_blocks_aux:
\exp_after:wN \@@_merge_blocks:
\fi:
@@ -542,8 +542,8 @@
\cs_new_protected:Npn \@@_copy_block:
{
\tex_toks:D \l_@@_C_int \tex_toks:D \l_@@_B_int
- \tex_advance:D \l_@@_C_int \c_one
- \tex_advance:D \l_@@_B_int \c_one
+ \int_incr:N \l_@@_C_int
+ \int_incr:N \l_@@_B_int
\if_int_compare:w \l_@@_B_int = \l_@@_end_int
\use_i:nn
\fi:
@@ -621,8 +621,8 @@
\cs_new_protected:Npn \@@_return_same:
{
\tex_toks:D \l_@@_B_int \tex_toks:D \l_@@_C_int
- \tex_advance:D \l_@@_B_int - \c_one
- \tex_advance:D \l_@@_C_int - \c_one
+ \int_decr:N \l_@@_B_int
+ \int_decr:N \l_@@_C_int
\if_int_compare:w \l_@@_C_int < \l_@@_top_int
\use_i:nn
\fi:
@@ -645,8 +645,8 @@
\cs_new_protected:Npn \@@_return_swapped:
{
\tex_toks:D \l_@@_B_int \tex_toks:D \l_@@_A_int
- \tex_advance:D \l_@@_B_int - \c_one
- \tex_advance:D \l_@@_A_int - \c_one
+ \int_decr:N \l_@@_B_int
+ \int_decr:N \l_@@_A_int
\if_int_compare:w \l_@@_A_int < \l_@@_begin_int
\@@_merge_blocks_end: \use_i:nn
\fi:
@@ -665,8 +665,8 @@
\cs_new_protected:Npn \@@_merge_blocks_end:
{
\tex_toks:D \l_@@_B_int \tex_toks:D \l_@@_C_int
- \tex_advance:D \l_@@_B_int - \c_one
- \tex_advance:D \l_@@_C_int - \c_one
+ \int_decr:N \l_@@_B_int
+ \int_decr:N \l_@@_C_int
\if_int_compare:w \l_@@_B_int < \l_@@_begin_int
\use_i:nn
\fi:
Modified: trunk/l3kernel/l3str.dtx
===================================================================
--- trunk/l3kernel/l3str.dtx 2017-02-20 03:39:43 UTC (rev 6966)
+++ trunk/l3kernel/l3str.dtx 2017-02-20 14:51:30 UTC (rev 6967)
@@ -811,7 +811,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_if_eq_x_return:nn #1 #2
{
- \if_int_compare:w \@@_if_eq_x:nn {#1} {#2} = \c_zero
+ \if_int_compare:w \@@_if_eq_x:nn {#1} {#2} = 0 \exp_stop_f:
\prg_return_true:
\else:
\prg_return_false:
@@ -835,7 +835,7 @@
{
\if_int_compare:w
\@@_if_eq_x:nn { \exp_not:n {#1} } { \exp_not:n {#2} }
- = \c_zero
+ = 0 \exp_stop_f:
\prg_return_true: \else: \prg_return_false: \fi:
}
\cs_generate_variant:Nn \str_if_eq_p:nn { V , o }
@@ -848,7 +848,7 @@
\cs_generate_variant:Nn \str_if_eq:nnTF { nV , no , VV }
\prg_new_conditional:Npnn \str_if_eq_x:nn #1#2 { p , T , F , TF }
{
- \if_int_compare:w \@@_if_eq_x:nn {#1} {#2} = \c_zero
+ \if_int_compare:w \@@_if_eq_x:nn {#1} {#2} = 0 \exp_stop_f:
\prg_return_true: \else: \prg_return_false: \fi:
}
% \end{macrocode}
@@ -862,7 +862,7 @@
\prg_new_conditional:Npnn \str_if_eq:NN #1#2 { p , TF , T , F }
{
\if_int_compare:w \@@_if_eq_x:nn { \tl_to_str:N #1 } { \tl_to_str:N #2 }
- = \c_zero \prg_return_true: \else: \prg_return_false: \fi:
+ = 0 \exp_stop_f: \prg_return_true: \else: \prg_return_false: \fi:
}
\cs_generate_variant:Nn \str_if_eq:NNT { c , Nc , cc }
\cs_generate_variant:Nn \str_if_eq:NNF { c , Nc , cc }
@@ -1058,7 +1058,7 @@
}
\cs_new:Npn \@@_item:w #1; #2;
{
- \int_compare:nNnTF {#1} < \c_zero
+ \int_compare:nNnTF {#1} < 0
{
\int_compare:nNnTF {#1} < {-#2}
{ \use_none_delimit_by_q_stop:w }
@@ -1149,7 +1149,7 @@
{
\exp_after:wN \@@_range:w
\__int_value:w \@@_count:n {#1} \exp_after:wN ;
- \__int_value:w \__int_eval:w #2 - \c_one \exp_after:wN ;
+ \__int_value:w \__int_eval:w #2 - 1 \exp_after:wN ;
\__int_value:w \__int_eval:w #3 ;
#1 \q_stop
}
@@ -1181,11 +1181,11 @@
{
\int_eval:n
{
- \if_int_compare:w #1 < \c_zero
+ \if_int_compare:w #1 < 0 \exp_stop_f:
\if_int_compare:w #1 < -#2 \exp_stop_f:
- \c_zero
+ 0
\else:
- #1 + #2 + \c_one
+ #1 + #2 + 1
\fi:
\else:
\if_int_compare:w #1 < #2 \exp_stop_f:
@@ -1234,7 +1234,7 @@
\cs_new:Npn \@@_collect_end:wn #1 ;
{
\exp_after:wN \@@_collect_end:nnnnnnnnw
- \if_case:w \if_int_compare:w #1 > \c_zero #1 \else: 0 \fi: \exp_stop_f:
+ \if_case:w \if_int_compare:w #1 > 0 \exp_stop_f: #1 \else: 0 \fi: \exp_stop_f:
\or: \or: \or: \or: \or: \or: \fi:
}
\cs_new:Npn \@@_collect_end:nnnnnnnnw #1#2#3#4#5#6#7#8 #9 \q_stop
@@ -1602,7 +1602,7 @@
% \LaTeXe{} and Con\TeX{}t MkII and MkIV).
% \begin{macrocode}
%<*initex>
- \tex_chardef:D \g_@@_data_ior \c_zero
+ \tex_chardef:D \g_@@_data_ior = 0 \scan_stop:
%</initex>
%<*package>
\tex_chardef:D \g_@@_data_ior
@@ -1665,7 +1665,7 @@
\@@_parse_auxi:w #1#2 \q_stop
\else:
\if_int_compare:w \__str_if_eq_x:nn
- { \exp_not:n {#2} } { ~Conditional~Mappings~ } = \c_zero
+ { \exp_not:n {#2} } { ~Conditional~Mappings~ } = 0 \exp_stop_f:
\cs_set_protected:Npn \@@_parse:w ##1 \q_stop { }
\fi:
\fi:
@@ -1699,7 +1699,7 @@
{
\tl_if_blank:nF {#7}
{
- \if_int_compare:w \__str_if_eq_x:nn { #5 ~ } {#7} = \c_zero
+ \if_int_compare:w \__str_if_eq_x:nn { #5 ~ } {#7} = 0 \exp_stop_f:
\else:
\tl_const:cx
{ c_@@_title_ \utex_char:D "#1 _tl }
@@ -1716,7 +1716,7 @@
% \begin{macrocode}
\cs_set_protected:Npn \@@_parse_auxi:w #1 ;~ #2 ;~ #3 ; #4 \q_stop
{
- \if_int_compare:w \__str_if_eq_x:nn {#2} { C } = \c_zero
+ \if_int_compare:w \__str_if_eq_x:nn {#2} { C } = 0 \exp_stop_f:
\if_int_compare:w \tex_lccode:D "#1 = "#3 \scan_stop:
\else:
\tl_const:cx
@@ -1724,7 +1724,7 @@
{ \utex_char:D "#3 ~ }
\fi:
\else:
- \if_int_compare:w \__str_if_eq_x:nn {#2} { F } = \c_zero
+ \if_int_compare:w \__str_if_eq_x:nn {#2} { F } = 0 \exp_stop_f:
\@@_parse_auxii:w #1 ~ #3 ~ \q_stop
\fi:
\fi:
@@ -1740,7 +1740,7 @@
{
\use:n { \@@_parse_auxii:w #1 ~ lower ~ #2 ~ } ~ \q_stop
\use:n { \@@_parse_auxii:w #1 ~ upper ~ #4 ~ } ~ \q_stop
- \if_int_compare:w \__str_if_eq_x:nn {#3} {#4} = \c_zero
+ \if_int_compare:w \__str_if_eq_x:nn {#3} {#4} = 0 \exp_stop_f:
\else:
\use:n { \@@_parse_auxii:w #1 ~ title ~ #3 ~ } ~ \q_stop
\fi:
Modified: trunk/l3kernel/l3sys.dtx
===================================================================
--- trunk/l3kernel/l3sys.dtx 2017-02-20 03:39:43 UTC (rev 6966)
+++ trunk/l3kernel/l3sys.dtx 2017-02-20 14:51:30 UTC (rev 6967)
@@ -269,7 +269,7 @@
% This is a simple enough concept: the two views here are complementary.
% \begin{macrocode}
\int_compare:nNnTF
- { \cs_if_exist_use:NF \pdftex_pdfoutput:D \c_zero } > \c_zero
+ { \cs_if_exist_use:NF \pdftex_pdfoutput:D { 0 } } > { 0 }
{
\cs_new_eq:NN \sys_if_output_dvi:T \use_none:n
\cs_new_eq:NN \sys_if_output_dvi:F \use:n
Modified: trunk/l3kernel/l3tl.dtx
===================================================================
--- trunk/l3kernel/l3tl.dtx 2017-02-20 03:39:43 UTC (rev 6966)
+++ trunk/l3kernel/l3tl.dtx 2017-02-20 14:51:30 UTC (rev 6967)
@@ -1489,7 +1489,7 @@
\group_begin:
\exp_args:No \etex_everyeof:D { \c_@@_rescan_marker_tl \exp_not:N }
\int_compare:nNnT \tex_endlinechar:D = { 32 }
- { \tex_endlinechar:D - \c_one }
+ { \int_set:Nn \tex_endlinechar:D { -1 } }
\tex_newlinechar:D \tex_endlinechar:D
#3 \scan_stop:
\exp_args:No \@@_set_rescan:n { \tl_to_str:n {#4} }
@@ -1586,7 +1586,7 @@
\tex_catcode:D `\^^@ = 12 \scan_stop:
\cs_new_protected:Npn \@@_set_rescan:n #1
{
- \int_compare:nNnTF \tex_newlinechar:D < \c_zero
+ \int_compare:nNnTF \tex_newlinechar:D < 0
{ \use_ii:nn }
{
\char_set_lccode:nn { 0 } { \tex_newlinechar:D }
@@ -1614,7 +1614,7 @@
}
\cs_new_protected:Npn \@@_set_rescan_single_aux:nn #1#2
{
- \tex_endlinechar:D - \c_one
+ \int_set:Nn \tex_endlinechar:D { -1 }
\use:x
{
\exp_not:N \use:n
@@ -2325,7 +2325,7 @@
\int_eval:n
{ 0 \tl_map_function:NN #1 \@@_count:n }
}
-\cs_new:Npn \@@_count:n #1 { + \c_one }
+\cs_new:Npn \@@_count:n #1 { + 1 }
\cs_generate_variant:Nn \tl_count:n { V , o }
\cs_generate_variant:Nn \tl_count:N { c }
% \end{macrocode}
@@ -2913,14 +2913,14 @@
}
\cs_new:Npn \@@_item_aux:nn #1#2
{
- \int_compare:nNnTF {#1} < \c_zero
- { \int_eval:n { \tl_count:n {#2} + \c_one + #1 } }
+ \int_compare:nNnTF {#1} < 0
+ { \int_eval:n { \tl_count:n {#2} + 1 + #1 } }
{#1}
}
\cs_new:Npn \@@_item:nn #1#2
{
\__quark_if_recursion_tail_break:nN {#2} \__prg_break:
- \int_compare:nNnTF {#1} = \c_one
+ \int_compare:nNnTF {#1} = 1
{ \__prg_break:n { \exp_not:n {#2} } }
{ \exp_args:Nf \@@_item:nn { \int_eval:n { #1 - 1 } } }
}
Modified: trunk/l3kernel/l3token.dtx
===================================================================
--- trunk/l3kernel/l3token.dtx 2017-02-20 03:39:43 UTC (rev 6966)
+++ trunk/l3kernel/l3token.dtx 2017-02-20 14:51:30 UTC (rev 6967)
@@ -1437,7 +1437,7 @@
{ char-invalid-catcode }
\else:
\if_int_odd:w 0
- \if_int_compare:w #1 < \c_zero 1 \fi:
+ \if_int_compare:w #1 < 0 \exp_stop_f: 1 \fi:
\if_int_compare:w #1 > \c_@@_max_int 1 \fi: \exp_stop_f:
\__msg_kernel_expandable_error:nn { kernel }
{ char-out-of-range }
@@ -1885,7 +1885,7 @@
##1 \tl_to_str:n { ma } ##2 \c_colon_str ##3 \exp_not:N \q_stop
}
{
- \if_int_compare:w \__str_if_eq_x:nn { #2 } { cro } = \c_zero
+ \if_int_compare:w \__str_if_eq_x:nn { #2 } { cro } = 0 \exp_stop_f:
\prg_return_true:
\else:
\prg_return_false:
Modified: trunk/l3trial/l3bigint/l3bigint.dtx
===================================================================
--- trunk/l3trial/l3bigint/l3bigint.dtx 2017-02-20 03:39:43 UTC (rev 6966)
+++ trunk/l3trial/l3bigint/l3bigint.dtx 2017-02-20 14:51:30 UTC (rev 6967)
@@ -1625,11 +1625,11 @@
% unpacking all of the tree rather than just the first few leaves.
% \begin{macrocode}
\cs_new:Npn \@@_diff_sign:w #1 ; #2 ;
- { \@@_diff_sign_aux:w #1 ; #2 ; \c_zero }
+ { \@@_diff_sign_aux:w #1 ; #2 ; 0 \exp_stop_f: }
\cs_new:Npn \@@_diff_sign_aux:w #1#2 ; #3
{
\if_meaning:w #1 #3 \else:
- \if_meaning:w 1 #1 - \fi: \c_one
+ \if_meaning:w 1 #1 - \fi: 1 \exp_stop_f:
\fi:
\if_case:w #1 \exp_stop_f:
\exp_after:wN \@@_diff_sign_pp:w
@@ -1645,8 +1645,8 @@
}
\cs_new:Npn \@@_diff_sign_dd:w #1 ; #2 ;
{
- \if_int_compare:w #1 < #2 - \c_one \fi:
- \if_int_compare:w #1 > #2 \c_one \fi:
+ \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:
}
% \end{macrocode}
% \end{macro}
@@ -2278,7 +2278,7 @@
\cs_new:Npn \@@_max:wwN #1 ; #2 ; #3
{
\int_compare:nNnTF
- { \@@_compare:ww #1 ; #2 ; } #3 \c_zero
+ { \@@_compare:ww #1 ; #2 ; } #3 { 0 }
{ \@@_use:w #1 ; }
{ \@@_use:w #2 ; }
}
Modified: trunk/l3trial/l3trace/l3trace.dtx
===================================================================
--- trunk/l3trial/l3trace/l3trace.dtx 2017-02-20 03:39:43 UTC (rev 6966)
+++ trunk/l3trial/l3trace/l3trace.dtx 2017-02-20 14:51:30 UTC (rev 6967)
@@ -323,12 +323,12 @@
% \begin{macrocode}
\cs_new_protected:Npn \trace_on:n #1
{
- \int_gset_eq:NN \g_trace_default_int \c_one
+ \int_gset:Nn \g_trace_default_int { 1 }
\keys_set:nn { trace } { #1 }
}
\cs_new_protected:Npn \trace_off:n #1
{
- \int_gset_eq:NN \g_trace_default_int \c_zero
+ \int_gset:Nn \g_trace_default_int { 0 }
\keys_set:nn { trace } { #1 }
}
% \end{macrocode}
More information about the latex3-commits
mailing list