[latex3-commits] [git/LaTeX3-latex3-latex3] master: Drop \__int_eval:n (5fad518)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sun Mar 25 17:20:53 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/5fad51857f0787c21a3cb39612915e641b461199
>---------------------------------------------------------------
commit 5fad51857f0787c21a3cb39612915e641b461199
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Mar 25 16:12:05 2018 +0100
Drop \__int_eval:n
Very slight performance hit here:
where that is vital we will need copies of the primitives.
>---------------------------------------------------------------
5fad51857f0787c21a3cb39612915e641b461199
l3experimental/xgalley/l3galley.dtx | 32 +++++++++++++++------------
l3kernel/l3basics.dtx | 2 +-
l3kernel/l3candidates.dtx | 2 +-
l3kernel/l3int.dtx | 21 ------------------
l3kernel/l3prg.dtx | 2 +-
l3kernel/l3regex.dtx | 27 ++++++++++++----------
l3kernel/l3str.dtx | 4 ++--
l3kernel/l3token.dtx | 22 +++++++++---------
l3kernel/testfiles/m3expl001.luatex.tlg | 1 -
l3kernel/testfiles/m3expl001.ptex.tlg | 1 -
l3kernel/testfiles/m3expl001.tlg | 1 -
l3kernel/testfiles/m3expl001.uptex.tlg | 1 -
l3kernel/testfiles/m3expl001.xetex.tlg | 1 -
l3kernel/testfiles/m3expl003.luatex.tlg | 1 -
l3kernel/testfiles/m3expl003.ptex.tlg | 1 -
l3kernel/testfiles/m3expl003.tlg | 1 -
l3kernel/testfiles/m3expl003.uptex.tlg | 1 -
l3kernel/testfiles/m3expl003.xetex.tlg | 1 -
l3trial/l3auxdata/l3auxdata.dtx | 6 ++---
l3trial/l3check/l3check.dtx | 6 ++---
l3trial/l3kernel-extras/l3kernel-extras.dtx | 6 ++---
l3trial/xfont/xfss.dtx | 6 ++---
22 files changed, 61 insertions(+), 85 deletions(-)
diff --git a/l3experimental/xgalley/l3galley.dtx b/l3experimental/xgalley/l3galley.dtx
index f0ff78e..3f2e371 100644
--- a/l3experimental/xgalley/l3galley.dtx
+++ b/l3experimental/xgalley/l3galley.dtx
@@ -1584,7 +1584,7 @@
}
{
\tex_penalty:D
- \__int_eval:n { \g_@@_interpar_penalty_user_tl }
+ \int_eval:n { \g_@@_interpar_penalty_user_tl }
\tl_gclear:N \g_@@_interpar_penalty_user_tl
}
\bool_gset_false:N \g_galley_no_break_next_bool
@@ -1863,8 +1863,9 @@
\cs_new_protected:Npn \@@_parshape_set_indents:NN #1#2
{
\tex_parshape:D
- \__int_eval:n
+ \int_eval:n
{ \int_min:nn { \seq_count:N #1 } { \seq_count:N #2 } }
+ \exp_stop_f:
\seq_mapthread_function:NNN #1 #2
\@@_parshape_set_indents:nn
}
@@ -2225,7 +2226,7 @@
\cs_new_protected:Npn \galley_display_widow_penalties_set:n #1
{
\etex_displaywidowpenalties:D
- \__int_eval:n { \clist_count:n {#1} + 1 }
+ \int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f:
\clist_map_function:nN {#1} \@@_set_aux:n
0 \exp_stop_f:
}
@@ -2233,7 +2234,7 @@
\cs_new_protected:Npn \galley_widow_penalties_set:n #1
{
\etex_widowpenalties:D
- \__int_eval:n { \clist_count:n {#1} + 1 }
+ \int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f:
\clist_map_function:nN {#1} \@@_set_aux:n
0 \exp_stop_f:
}
@@ -2284,7 +2285,7 @@
\cs_new_protected:Npn \galley_display_club_penalties_set:n #1
{
\etex_clubpenalties:D
- \__int_eval:n { \clist_count:n {#1} + 1 }
+ \int_eval:n { \clist_count:n {#1} + 1 } \exp_stop_f:
\clist_map_function:nN {#1} \@@_set_aux:n
0 \exp_stop_f:
\@@_calc_interline_penalties:
@@ -2311,18 +2312,19 @@
{
\int_compare:nNnTF { \etex_interlinepenalties:D 0 } = 0
{
- \etex_interlinepenalties:D 1 = \__int_eval:n {#1}
+ \etex_interlinepenalties:D 1 = \int_eval:n {#1} \exp_stop_f:
\@@_calc_interline_penalties:
}
{
\cs_set:Npn \@@_set_interline_penalty_auxii:n ##1
{
- \__int_eval:n
+ \int_eval:n
{
\etex_interlinepenalties:D ##1
- \etex_interlinepenalties:D \etex_interlinepenalties:D 0
+ #1
}
+ \exp_stop_f:
}
\exp_args:Nf \@@_set_interline_penalty:nn
{ \clist_count:N \l_galley_line_penalties_clist } {#1}
@@ -2337,10 +2339,10 @@
\int_step_function:nnnN { #1 + 1 } { 1 }
{ \etex_interlinepenalties:D 0 - 1 }
\@@_set_interline_penalty_auxii:n
- \__int_eval:n {#2}
+ \int_eval:n {#2} \exp_stop_f:
}
\cs_new:Npn \@@_set_interline_penalty_auxi:n #1
- { \etex_interlinepenalties:D \__int_eval:n {#1} }
+ { \etex_interlinepenalties:D \int_eval:n {#1} \exp_stop_f: }
\cs_new:Npn \@@_set_interline_penalty_auxii:n #1 { }
% \end{macrocode}
% \end{macro}
@@ -2392,21 +2394,23 @@
}
\cs_new:Npn \@@_calc_interline_penalties_auxi:n #1
{
- \__int_eval:n
+ \int_eval:n
{
\clist_item:Nn \l_galley_line_penalties_clist {#1}
+ 0 \clist_item:Nn \l_galley_club_penalties_clist {#1}
- \etex_clubpenalties:D #1 ~
}
+ \exp_stop_f:
}
\cs_new:Npn \@@_calc_interline_penalties_auxii:n #1
{
- \__int_eval:n
+ \int_eval:n
{
\etex_interlinepenalties:D \etex_interlinepenalties:D 0 \exp_stop_f:
+ 0 \clist_item:Nn \l_galley_club_penalties_clist {#1}
- \etex_clubpenalties:D #1 ~
}
+ \exp_stop_f:
}
% \end{macrocode}
% \end{macro}
@@ -2449,7 +2453,7 @@
}
}
\cs_new:Npn \@@_save_display_club_penalties:n #1
- { \__int_value:w \etex_clubpenalties:D \__int_eval:n {#1} , }
+ { \__int_value:w \etex_clubpenalties:D \int_eval:n {#1} , }
\cs_new_protected:Npn \galley_save_display_widow_penalties:N #1
{
\clist_set:Nx #1
@@ -2462,7 +2466,7 @@
\cs_new:Npn \@@_save_display_widow_penalties:n #1
{
\__int_value:w \etex_displaywidowpenalties:D
- \__int_eval:n {#1} ,
+ \int_eval:n {#1} ,
}
\cs_new_protected:Npn \galley_save_widow_penalties:N #1
{
@@ -2474,7 +2478,7 @@
}
}
\cs_new:Npn \@@_save_widow_penalties:n #1
- { \__int_value:w \etex_widowpenalties:D \__int_eval:n {#1} , }
+ { \__int_value:w \etex_widowpenalties:D \int_eval:n {#1} , }
% \end{macrocode}
% This one is not an array, but is stored in a primitive, so there is
% a simple conversion. The general interline penalty is always the
diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
index 5ab37b9..e29a5fc 100644
--- a/l3kernel/l3basics.dtx
+++ b/l3kernel/l3basics.dtx
@@ -3157,7 +3157,7 @@
\exp_args:Nx \@@_parm_from_arg_count_test:nnF
{
\exp_after:wN \exp_not:n
- \if_case:w \__int_eval:n {#2}
+ \if_case:w \int_eval:n {#2}
{ }
\or: { ##1 }
\or: { ##1##2 }
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 67040b2..cdd5ffa 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -2356,7 +2356,7 @@
% The primitive always assigns the seed globally.
% \begin{macrocode}
\cs_new_protected:Npn \sys_gset_rand_seed:n #1
- { \pdftex_setrandomseed:D \__int_eval:n {#1} }
+ { \pdftex_setrandomseed:D \int_eval:n {#1} \exp_stop_f: }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3int.dtx b/l3kernel/l3int.dtx
index 572ff22..d7af92f 100644
--- a/l3kernel/l3int.dtx
+++ b/l3kernel/l3int.dtx
@@ -958,16 +958,6 @@
% \end{texnote}
% \end{function}
%
-% \begin{function}[EXP]{\__int_eval:n}
-% \begin{syntax}
-% \cs{__int_eval:n} \Arg{intexpr}
-% \end{syntax}
-% By default this expands to \cs{__int_eval:w} \meta{intexpr}
-% \cs{__int_eval_end:} but when debugging is enabled this expands to a
-% more complicated construction that evaluates \meta{intexpr} with
-% parentheses and within a brace group to detect early termination.
-% \end{function}
-%
% \begin{function}{\__prg_compare_error:, \__prg_compare_error:Nw}
% \begin{syntax}
% \cs{__prg_compare_error:}
@@ -1042,17 +1032,6 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_eval:n}
-% Only differ from \cs{int_eval:n} by the absence of \cs{@@_value:w},
-% so as to produce an internal integer rather than expanding into
-% characters. This is for use in other modules.
-% \begin{macrocode}
-\__kernel_patch_args:nNNpn
- { { \__kernel_chk_expr:nNnN {#1} \@@_eval:w { } \@@_eval:n } }
-\cs_new:Npn \@@_eval:n #1 { \@@_eval:w #1 \@@_eval_end: }
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}[EXP]{\int_abs:n}
% \begin{macro}[EXP]{\@@_abs:N}
% \UnitTested
diff --git a/l3kernel/l3prg.dtx b/l3kernel/l3prg.dtx
index 73a8774..ed52e85 100644
--- a/l3kernel/l3prg.dtx
+++ b/l3kernel/l3prg.dtx
@@ -1386,7 +1386,7 @@
{
\exp:w
\exp_after:wN \@@_replicate_first:N
- \__int_value:w \__int_eval:n {#1}
+ \__int_value:w \int_eval:n {#1}
\cs_end:
}
\cs_new:Npn \@@_replicate:N #1
diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index 41f3b77..44d801c 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -1243,7 +1243,7 @@
}
\cs_new_protected:Npn \@@_item_catcode:nT #1
{
- \if_int_odd:w \__int_eval:n { #1 / \@@_item_catcode: }
+ \if_int_odd:w \int_eval:n { #1 / \@@_item_catcode: } \exp_stop_f:
\exp_after:wN \use:n
\else:
\exp_after:wN \use_none:n
@@ -1682,7 +1682,7 @@
#1 \prg_return_true:
\else:
\if_case:w
- \__int_eval:n { \exp_after:wN ` \token_to_str:N #1 - `a }
+ \int_eval:n { \exp_after:wN ` \token_to_str:N #1 - `a }
A
\or: B
\or: C
@@ -3112,7 +3112,7 @@
}
\cs_new_protected:Npn \@@_compile_c_lbrack_add:N #1
{
- \if_int_odd:w \__int_eval:n { \l_@@_catcodes_int / #1 }
+ \if_int_odd:w \int_eval:n { \l_@@_catcodes_int / #1 } \exp_stop_f:
\else:
\int_add:Nn \l_@@_catcodes_int {#1}
\fi:
@@ -4109,7 +4109,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} > 1 \exp_stop_f:
\int_set:Nn \l_@@_internal_c_int
{
( #1 - 1 )
@@ -4838,8 +4838,8 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_action_cost:n #1
{
- \exp_args:No \@@_store_state:n
- { \__int_value:w \__int_eval:n { \l_@@_curr_state_int + #1 } }
+ \exp_args:Nx \@@_store_state:n
+ { \int_eval:n { \l_@@_curr_state_int + #1 } }
}
% \end{macrocode}
% \end{macro}
@@ -5050,7 +5050,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[rEXP]{\@@_submatch_balance:n}
+% \begin{macro}{\@@_submatch_balance:n}
% Every user function must result in a balanced token list (unbalanced
% token lists cannot be stored by TeX). When we unpacked the query, we
% kept track of the brace balance, hence the contribution from a given
@@ -5061,7 +5061,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_submatch_balance:n #1
{
- \__int_eval:n
+ \int_eval:n
{
\int_compare:nNnTF
{ \__intarray_item_fast:Nn \g_@@_submatch_end_intarray {#1} } = 0
@@ -5212,9 +5212,9 @@
% Unless the submatch appears inside a |\c{...}| or |\u{...}|
% construction, it must be taken into account in the brace balance.
% Later on, |##1| will be replaced by a pointer to the $0$-th submatch for a
-% given match. We cannot use \cs{int_eval:n} because it is
-% expandable, and would be expanded too early (short of adding
-% \cs{exp_not:N}, making the code messy again).
+% given match. There is an \cs{exp_not:N} here as at the point-of-use
+% of \cs{l_@@_balance_tl} there is an \texttt{x}-type expansion which is needed
+% to get |##1| in correctly.
% \begin{macrocode}
\cs_new_protected:Npn \@@_replacement_put_submatch:n #1
{
@@ -5222,7 +5222,10 @@
\__tl_build_one:n { \@@_query_submatch:n { #1 + ##1 } }
\if_int_compare:w \l_@@_replacement_csnames_int = 0 \exp_stop_f:
\tl_put_right:Nn \l_@@_balance_tl
- { + \@@_submatch_balance:n { \__int_eval:n { #1+##1 } } }
+ {
+ + \@@_submatch_balance:n
+ { \exp_not:N \int_eval:n { #1 + ##1 } }
+ }
\fi:
\fi:
}
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index f6eb659..ac766ea 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -1497,7 +1497,7 @@
}
\cs_new:Npn \str_item_ignore_spaces:nn #1
{ \exp_args:No \@@_item:nn { \tl_to_str:n {#1} } }
-\__kernel_patch_args:nNNpn { {#1} { \__int_eval:n {#2} } }
+\__kernel_patch_args:nNNpn { {#1} { \int_eval:n {#2} } }
\cs_new:Npn \@@_item:nn #1#2
{
\exp_after:wN \@@_item:w
@@ -1595,7 +1595,7 @@
\cs_new:Npn \str_range_ignore_spaces:nnn #1
{ \exp_args:No \@@_range:nnn { \tl_to_str:n {#1} } }
\__kernel_patch_args:nNNpn
- { {#1} { \__int_eval:n {#2} } { \__int_eval:n {#3} } }
+ { {#1} { \int_eval:n {#2} } { \int_eval:n {#3} } }
\cs_new:Npn \@@_range:nnn #1#2#3
{
\exp_after:wN \@@_range:w
diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index 3d57761..2919675 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -1129,9 +1129,9 @@
% Simple wrappers around the primitives.
% \begin{macrocode}
\cs_new_protected:Npn \char_set_catcode:nn #1#2
- { \tex_catcode:D \__int_eval:n {#1} = \__int_eval:n {#2} }
+ { \tex_catcode:D \int_eval:n {#1} = \int_eval:n {#2} \exp_stop_f: }
\cs_new:Npn \char_value_catcode:n #1
- { \tex_the:D \tex_catcode:D \__int_eval:n {#1} }
+ { \tex_the:D \tex_catcode:D \int_eval:n {#1} \exp_stop_f: }
\cs_new_protected:Npn \char_show_value_catcode:n #1
{ \exp_args:Nf \tl_show:n { \char_value_catcode:n {#1} } }
% \end{macrocode}
@@ -1264,27 +1264,27 @@
% Pretty repetitive, but necessary!
% \begin{macrocode}
\cs_new_protected:Npn \char_set_mathcode:nn #1#2
- { \tex_mathcode:D \__int_eval:n {#1} = \__int_eval:n {#2} }
+ { \tex_mathcode:D \int_eval:n {#1} = \int_eval:n {#2} \exp_stop_f: }
\cs_new:Npn \char_value_mathcode:n #1
- { \tex_the:D \tex_mathcode:D \__int_eval:n {#1} }
+ { \tex_the:D \tex_mathcode:D \int_eval:n {#1} \exp_stop_f: }
\cs_new_protected:Npn \char_show_value_mathcode:n #1
{ \exp_args:Nf \tl_show:n { \char_value_mathcode:n {#1} } }
\cs_new_protected:Npn \char_set_lccode:nn #1#2
- { \tex_lccode:D \__int_eval:n {#1} = \__int_eval:n {#2} }
+ { \tex_lccode:D \int_eval:n {#1} = \int_eval:n {#2} \exp_stop_f: }
\cs_new:Npn \char_value_lccode:n #1
- { \tex_the:D \tex_lccode:D \__int_eval:n {#1} }
+ { \tex_the:D \tex_lccode:D \int_eval:n {#1} \exp_stop_f: }
\cs_new_protected:Npn \char_show_value_lccode:n #1
{ \exp_args:Nf \tl_show:n { \char_value_lccode:n {#1} } }
\cs_new_protected:Npn \char_set_uccode:nn #1#2
- { \tex_uccode:D \__int_eval:n {#1} = \__int_eval:n {#2} }
+ { \tex_uccode:D \int_eval:n {#1} = \int_eval:n {#2} \exp_stop_f: }
\cs_new:Npn \char_value_uccode:n #1
- { \tex_the:D \tex_uccode:D \__int_eval:n {#1} }
+ { \tex_the:D \tex_uccode:D \int_eval:n {#1} \exp_stop_f: }
\cs_new_protected:Npn \char_show_value_uccode:n #1
{ \exp_args:Nf \tl_show:n { \char_value_uccode:n {#1} } }
\cs_new_protected:Npn \char_set_sfcode:nn #1#2
- { \tex_sfcode:D \__int_eval:n {#1} = \__int_eval:n {#2} }
+ { \tex_sfcode:D \int_eval:n {#1} = \int_eval:n {#2} \exp_stop_f: }
\cs_new:Npn \char_value_sfcode:n #1
- { \tex_the:D \tex_sfcode:D \__int_eval:n {#1} }
+ { \tex_the:D \tex_sfcode:D \int_eval:n {#1} \exp_stop_f: }
\cs_new_protected:Npn \char_show_value_sfcode:n #1
{ \exp_args:Nf \tl_show:n { \char_value_sfcode:n {#1} } }
% \end{macrocode}
@@ -1367,7 +1367,7 @@
% the interface layer, turn the two arguments into integers up-front so
% this is only done once.
% \begin{macrocode}
-\__kernel_patch_args:nNNpn { { \__int_eval:n {#1} } { \__int_eval:n {#2} } }
+\__kernel_patch_args:nNNpn { { \int_eval:n {#1} } { \int_eval:n {#2} } }
\cs_new:Npn \char_generate:nn #1#2
{
\exp:w \exp_after:wN \@@_generate_aux:w
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index a05787d..c54e6d7 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -1633,7 +1633,6 @@ Defining \__int_eval_end: on line ...
Defining \if_int_odd:w on line ...
Defining \if_case:w on line ...
Defining \int_eval:n on line ...
-Defining \__int_eval:n on line ...
Defining \int_abs:n on line ...
Defining \__int_abs:N on line ...
Defining \__int_maxmin:wwN on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index be5007e..1b8200e 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -1314,7 +1314,6 @@ Defining \__int_eval_end: on line ...
Defining \if_int_odd:w on line ...
Defining \if_case:w on line ...
Defining \int_eval:n on line ...
-Defining \__int_eval:n on line ...
Defining \int_abs:n on line ...
Defining \__int_abs:N on line ...
Defining \__int_maxmin:wwN on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index ea219a0..79aced7 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -1314,7 +1314,6 @@ Defining \__int_eval_end: on line ...
Defining \if_int_odd:w on line ...
Defining \if_case:w on line ...
Defining \int_eval:n on line ...
-Defining \__int_eval:n on line ...
Defining \int_abs:n on line ...
Defining \__int_abs:N on line ...
Defining \__int_maxmin:wwN on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 9d9fb1c..9fb73d3 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -1314,7 +1314,6 @@ Defining \__int_eval_end: on line ...
Defining \if_int_odd:w on line ...
Defining \if_case:w on line ...
Defining \int_eval:n on line ...
-Defining \__int_eval:n on line ...
Defining \int_abs:n on line ...
Defining \__int_abs:N on line ...
Defining \__int_maxmin:wwN on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index fa36379..e75fc86 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -1631,7 +1631,6 @@ Defining \__int_eval_end: on line ...
Defining \if_int_odd:w on line ...
Defining \if_case:w on line ...
Defining \int_eval:n on line ...
-Defining \__int_eval:n on line ...
Defining \int_abs:n on line ...
Defining \__int_abs:N on line ...
Defining \__int_maxmin:wwN on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index a05787d..c54e6d7 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -1633,7 +1633,6 @@ Defining \__int_eval_end: on line ...
Defining \if_int_odd:w on line ...
Defining \if_case:w on line ...
Defining \int_eval:n on line ...
-Defining \__int_eval:n on line ...
Defining \int_abs:n on line ...
Defining \__int_abs:N on line ...
Defining \__int_maxmin:wwN on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index be5007e..1b8200e 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -1314,7 +1314,6 @@ Defining \__int_eval_end: on line ...
Defining \if_int_odd:w on line ...
Defining \if_case:w on line ...
Defining \int_eval:n on line ...
-Defining \__int_eval:n on line ...
Defining \int_abs:n on line ...
Defining \__int_abs:N on line ...
Defining \__int_maxmin:wwN on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index ea219a0..79aced7 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -1314,7 +1314,6 @@ Defining \__int_eval_end: on line ...
Defining \if_int_odd:w on line ...
Defining \if_case:w on line ...
Defining \int_eval:n on line ...
-Defining \__int_eval:n on line ...
Defining \int_abs:n on line ...
Defining \__int_abs:N on line ...
Defining \__int_maxmin:wwN on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 9d9fb1c..9fb73d3 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -1314,7 +1314,6 @@ Defining \__int_eval_end: on line ...
Defining \if_int_odd:w on line ...
Defining \if_case:w on line ...
Defining \int_eval:n on line ...
-Defining \__int_eval:n on line ...
Defining \int_abs:n on line ...
Defining \__int_abs:N on line ...
Defining \__int_maxmin:wwN on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index fa36379..e75fc86 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -1631,7 +1631,6 @@ Defining \__int_eval_end: on line ...
Defining \if_int_odd:w on line ...
Defining \if_case:w on line ...
Defining \int_eval:n on line ...
-Defining \__int_eval:n on line ...
Defining \int_abs:n on line ...
Defining \__int_abs:N on line ...
Defining \__int_maxmin:wwN on line ...
diff --git a/l3trial/l3auxdata/l3auxdata.dtx b/l3trial/l3auxdata/l3auxdata.dtx
index 2a1c8b7..f04865f 100644
--- a/l3trial/l3auxdata/l3auxdata.dtx
+++ b/l3trial/l3auxdata/l3auxdata.dtx
@@ -6,7 +6,7 @@
%<*ins>
\iffalse meta-comment
-File l3auxdata.ins Copyright (C) 2014,2017 The LaTeX3 Project
+File l3auxdata.ins Copyright (C) 2014,2017,2018 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
@@ -733,7 +733,7 @@ Don't~ look~ here:~ check~ your~ console~ output!
\prop_put:Nxx \l_@@_catcodes_prop
{ \int_eval:n {##1} }
{ \tex_the:D \tex_catcode:D \int_eval:n {##1} }
- \tex_catcode:D \int_eval:n {##1} = \__int_eval:n {##2}
+ \tex_catcode:D \int_eval:n {##1} = \int_eval:n {##2} \exp_stop_f:
}
}
% \end{macrocode}
@@ -742,7 +742,7 @@ Don't~ look~ here:~ check~ your~ console~ output!
\cs_new:Nn \@@_catcodes_pop:
{
\cs_set_protected:Npn \char_set_catcode:nn ##1 ##2
- { \tex_catcode:D \int_eval:n {##1} = \__int_eval:n {##2} }
+ { \tex_catcode:D \int_eval:n {##1} = \int_eval:n {##2} \exp_stop_f: }
\prop_map_inline:Nn \l_@@_catcodes_prop
{ \char_set_catcode:nn {##1} {##2} }
\prop_clear:N \l_@@_catcodes_prop
diff --git a/l3trial/l3check/l3check.dtx b/l3trial/l3check/l3check.dtx
index 96d1090..9f9f955 100644
--- a/l3trial/l3check/l3check.dtx
+++ b/l3trial/l3check/l3check.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3check.dtx (C) Copyright 2012-2017 The LaTeX3 Project
+%% File l3check.dtx (C) Copyright 2012-2018 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
@@ -1679,7 +1679,7 @@
{ \@@_error:nn { internal } { Cannot~patch~\__cs_generate_variant_loop_end:nwwwNNnn } }
\cs_set_protected:Npn \check_tmp:w #1#2#3#4#5
{
- \tex_catcode:D `#1 = \__int_eval:n {#2}
+ \tex_catcode:D `#1 = \int_eval:n {#2} \exp_stop_f:
#3 { \tex_catcode:D `#1 / 2 } = { 6 }
{
\group_begin: \exp_args:NNc \group_end:
@@ -1690,7 +1690,7 @@
{
\cs_gset_protected:Npn \__char_set_catcode:NnNNN #1#2#3#4#5
{
- \tex_catcode:D `#1 = \__int_eval:n {#2}
+ \tex_catcode:D `#1 = \int_eval:n {#2} \exp_stop_f:
#3 { \tex_catcode:D `#1 / 2 } = { 6 }
{
\group_begin: \exp_after:wN \group_end:
diff --git a/l3trial/l3kernel-extras/l3kernel-extras.dtx b/l3trial/l3kernel-extras/l3kernel-extras.dtx
index 0292444..222b0bb 100644
--- a/l3trial/l3kernel-extras/l3kernel-extras.dtx
+++ b/l3trial/l3kernel-extras/l3kernel-extras.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3kernel-extras.dtx (C) Copyright 2012-2017 The LaTeX3 Project
+%% File l3kernel-extras.dtx (C) Copyright 2012-2018 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
@@ -936,7 +936,7 @@
{
\__int_value:w
\__dim_eval:n
- { #2 \__dim_eval:n { \__int_eval:n {#1} sp } }
+ { #2 \__dim_eval:n { \int_eval:n {#1} sp } }
}
% \end{macrocode}
% \end{macro}
@@ -1138,7 +1138,7 @@
}
\prg_new_conditional:Npnn \__char_if_in_font:nN #1#2 { TF }
{
- \etex_iffontchar:D #2 \__int_eval:n {#1}
+ \etex_iffontchar:D #2 \int_eval:n {#1} \exp_stop_f:
\prg_return_true:
\else:
\prg_return_false:
diff --git a/l3trial/xfont/xfss.dtx b/l3trial/xfont/xfss.dtx
index 6b489c6..e07500d 100644
--- a/l3trial/xfont/xfss.dtx
+++ b/l3trial/xfont/xfss.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File xfss.dtx Copyright (C) 2011,2012,2013,2015-2017 The LaTeX3 Project
+%% File xfss.dtx Copyright (C) 2011,2012,2013,2015-2018 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
@@ -205,7 +205,7 @@
% \begin{macrocode}
\cs_new_eq:NN \mathgroup_use:N \tex_fam:D
\cs_new:Npn \mathgroup_use:n #1
- { \tex_fam:D \__int_eval:n {#1} }
+ { \tex_fam:D \int_eval:n {#1} \exp_stop_f: }
% \end{macrocode}
% \end{macro}
%
@@ -2197,7 +2197,7 @@
% of the current font.
% \begin{macrocode}
\DeclareDocumentCommand \symbol {m}
- { \tex_char:D \__int_eval:n {#1} }
+ { \tex_char:D \int_eval:n {#1} \exp_stop_f: }
% \end{macrocode}
% \end{macro}
%
More information about the latex3-commits
mailing list