[latex3-commits] [l3svn] 02/03: Use \__int_value:w \__int_eval:w
noreply at latex-project.org
noreply at latex-project.org
Thu Mar 24 11:49:48 CET 2016
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
commit 3f42f1d008002563354b0fdbff28ffaf5771dd91
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Mar 24 10:11:59 2016 +0000
Use \__int_value:w \__int_eval:w
This avoids 'abuse' of \int_use:N for what is not an N-type
argument.
---
l3kernel/l3candidates.dtx | 4 +-
l3kernel/l3fp-aux.dtx | 16 ++---
l3kernel/l3fp-basics.dtx | 148 ++++++++++++++++++++++----------------------
l3kernel/l3fp-convert.dtx | 4 +-
l3kernel/l3fp-expo.dtx | 78 +++++++++++------------
l3kernel/l3fp-extended.dtx | 100 +++++++++++++++---------------
l3kernel/l3fp-parse.dtx | 30 ++++-----
l3kernel/l3fp-round.dtx | 10 +--
l3kernel/l3fp-trig.dtx | 38 ++++++------
l3kernel/l3int.dtx | 24 +++----
l3kernel/l3str.dtx | 16 ++---
11 files changed, 234 insertions(+), 234 deletions(-)
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index c38d55d..e660e67 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -4528,8 +4528,8 @@
\cs_new:Npn \char_generate:nn #1#2
{
\exp:w \exp_after:wN \@@_generate_aux:w
- \int_use:N \__int_eval:w #1 \exp_after:wN ;
- \int_use:N \__int_eval:w #2 ;
+ \__int_value:w \__int_eval:w #1 \exp_after:wN ;
+ \__int_value:w \__int_eval:w #2 ;
}
% \end{macrocode}
% Before doing any actual conversion, first some special case filtering.
diff --git a/l3kernel/l3fp-aux.dtx b/l3kernel/l3fp-aux.dtx
index 249f278..2e3f152 100644
--- a/l3kernel/l3fp-aux.dtx
+++ b/l3kernel/l3fp-aux.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3fp-aux.dtx Copyright(C) 2011-2014 The LaTeX3 Project
+%% File: l3fp-aux.dtx Copyright(C) 2011-2014,2016 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
@@ -543,7 +543,7 @@
% \begin{verbatim}
% \cs_new:Npn \pack:NNNNNw #1 #2#3#4#5 #6; { {#2#3#4#5} {#6} }
% \exp_after:wN \pack:NNNNNw
-% \int_use:N \__int_eval:w 1 0000 0000 + #1 ;
+% \__int_value:w \__int_eval:w 1 0000 0000 + #1 ;
% \end{verbatim}
% The idea is that adding $10^8$ to the number ensures that it has
% exactly $9$ digits, and can then easily find which digits correspond
@@ -558,19 +558,19 @@
% 6677\,8899$. With simplified names, we would do
% \begin{verbatim}
% \exp_after:wN \post_processing:w
-% \int_use:N \__int_eval:w - 5 0000
+% \__int_value:w \__int_eval:w - 5 0000
% \exp_after:wN \pack:NNNNNw
-% \int_use:N \__int_eval:w 4 9995 0000
+% \__int_value:w \__int_eval:w 4 9995 0000
% + 12345 * 6677
% \exp_after:wN \pack:NNNNNw
-% \int_use:N \__int_eval:w 5 0000 0000
+% \__int_value:w \__int_eval:w 5 0000 0000
% + 12345 * 8899 ;
% \end{verbatim}
-% The \cs{exp_after:wN} triggers |\int_use:N \__int_eval:w|, which
+% The \cs{exp_after:wN} triggers |\__int_value:w \__int_eval:w|, which
% starts a first computation, whose initial value is $- 5\,0000$ (the
% \enquote{leading shift}). In that computation appears an
% \cs{exp_after:wN}, which triggers the nested computation
-% |\int_use:N \__int_eval:w| with starting value $4\,9995\,0000$ (the
+% |\__int_value:w \__int_eval:w| with starting value $4\,9995\,0000$ (the
% \enquote{middle shift}). That, in turn, expands \cs{exp_after:wN}
% which triggers the third computation. The third computation's value
% is $5\,0000\,0000 + 12345 \times 8899$, which has $9$ digits. Adding
@@ -1022,7 +1022,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_array_count:n #1
{
- \int_use:N \__int_eval:w \c_zero
+ \__int_value:w \__int_eval:w \c_zero
\@@_array_count_loop:Nw #1 { ? \__prg_break: } ;
\__prg_break_point:
\__int_eval_end:
diff --git a/l3kernel/l3fp-basics.dtx b/l3kernel/l3fp-basics.dtx
index 699102b..a553acb 100644
--- a/l3kernel/l3fp-basics.dtx
+++ b/l3kernel/l3fp-basics.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3fp-basics.dtx Copyright (C) 2011-2014 The LaTeX3 Project
+%% File: l3fp-basics.dtx Copyright (C) 2011-2014,2016 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
@@ -336,7 +336,7 @@
{
\exp_after:wN \@@_sanitize:Nw
\exp_after:wN #1
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\if_int_compare:w #2 > #5 \exp_stop_f:
#2
\exp_after:wN \@@_add_big_i_o:wNww \__int_value:w -
@@ -400,9 +400,9 @@
\cs_new:Npn \@@_add_significand_o:NnnwnnnnN #1 #2#3 #4; #5#6#7#8
{
\exp_after:wN \@@_add_significand_test_o:N
- \int_use:N \__int_eval:w 1#5#6 + #2
+ \__int_value:w \__int_eval:w 1#5#6 + #2
\exp_after:wN \@@_add_significand_pack:NNNNNNN
- \int_use:N \__int_eval:w 1#7#8 + #3 ; #1
+ \__int_value:w \__int_eval:w 1#7#8 + #3 ; #1
}
\cs_new:Npn \@@_add_significand_pack:NNNNNNN #1 #2#3#4#5#6#7
{
@@ -437,9 +437,9 @@
#1; #2; #3#4 ; #5#6
{
\exp_after:wN \@@_basics_pack_high:NNNNNw
- \int_use:N \__int_eval:w 1 #1
+ \__int_value:w \__int_eval:w 1 #1
\exp_after:wN \@@_basics_pack_low:NNNNNw
- \int_use:N \__int_eval:w 1 #2 #3#4
+ \__int_value:w \__int_eval:w 1 #2 #3#4
+ \@@_round:NNN #6 #4 #5
\exp_after:wN ;
}
@@ -460,9 +460,9 @@
{
+ \c_one
\exp_after:wN \@@_basics_pack_weird_high:NNNNNNNNw
- \int_use:N \__int_eval:w 1 1 #1
+ \__int_value:w \__int_eval:w 1 1 #1
\exp_after:wN \@@_basics_pack_weird_low:NNNNw
- \int_use:N \__int_eval:w 1 #2#3 +
+ \__int_value:w \__int_eval:w 1 #2#3 +
\exp_after:wN \@@_round:NNN
\exp_after:wN #6
\exp_after:wN #3
@@ -503,7 +503,7 @@
\cs_new:Npn \@@_sub_npos_ii_o:Nnwnw #1 #2; #3;
{
\exp_after:wN \@@_sub_npos_i_o:Nnwnw
- \int_use:N \__int_eval:w \c_two - #1 \__int_eval_end:
+ \__int_value:w \__int_eval:w \c_two - #1 \__int_eval_end:
#3; #2;
}
% \end{macrocode}
@@ -525,13 +525,13 @@
{
\exp_after:wN \@@_sanitize:Nw
\exp_after:wN #1
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
#2
\if_int_compare:w #2 = #4 \exp_stop_f:
\exp_after:wN \@@_sub_back_near_o:nnnnnnnnN
\else:
\exp_after:wN \@@_decimate:nNnnnn \exp_after:wN
- { \int_use:N \__int_eval:w #2 - #4 - \c_one \exp_after:wN }
+ { \__int_value:w \__int_eval:w #2 - #4 - \c_one \exp_after:wN }
\exp_after:wN \@@_sub_back_far_o:NnnwnnnnN
\fi:
#5
@@ -560,9 +560,9 @@
\cs_new:Npn \@@_sub_back_near_o:nnnnnnnnN #1#2#3#4 #5#6#7#8 #9
{
\exp_after:wN \@@_sub_back_near_after:wNNNNw
- \int_use:N \__int_eval:w 10#5#6 - #1#2 - \c_eleven
+ \__int_value:w \__int_eval:w 10#5#6 - #1#2 - \c_eleven
\exp_after:wN \@@_sub_back_near_pack:NNNNNNw
- \int_use:N \__int_eval:w 11#7#8 - #3#4 \exp_after:wN ;
+ \__int_value:w \__int_eval:w 11#7#8 - #3#4 \exp_after:wN ;
}
\cs_new:Npn \@@_sub_back_near_pack:NNNNNNw #1#2#3#4#5#6#7 ;
{ + #1#2 ; {#3#4#5#6} {#7} ; }
@@ -717,9 +717,9 @@
{
- \c_one
\exp_after:wN \@@_sub_back_near_after:wNNNNw
- \int_use:N \__int_eval:w 1#30 - #1 - \c_eleven
+ \__int_value:w \__int_eval:w 1#30 - #1 - \c_eleven
\exp_after:wN \@@_sub_back_near_pack:NNNNNNw
- \int_use:N \__int_eval:w 11 0000 0000 + #40 - #2
+ \__int_value:w \__int_eval:w 11 0000 0000 + #40 - #2
- \exp_after:wN \@@_round_neg:NNN
\exp_after:wN #6
\use_none:nnnnnnn #2 #5
@@ -750,9 +750,9 @@
\cs_new:Npn \@@_sub_back_very_far_ii_o:nnNwwNN #1#2 ; #3 ; #4 ~ #5; #6#7
{
\exp_after:wN \@@_basics_pack_high:NNNNNw
- \int_use:N \__int_eval:w 1#4 - #1 - \c_one
+ \__int_value:w \__int_eval:w 1#4 - #1 - \c_one
\exp_after:wN \@@_basics_pack_low:NNNNNw
- \int_use:N \__int_eval:w 2#5 - #2
+ \__int_value:w \__int_eval:w 2#5 - #2
- \exp_after:wN \@@_round_neg:NNN
\exp_after:wN #7
\__int_value:w
@@ -872,7 +872,7 @@
{
\exp_after:wN \@@_sanitize:Nw
\exp_after:wN #1
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
#4 + #8
\@@_mul_significand_o:nnnnNnnnn #5 #1 #9
}
@@ -907,19 +907,19 @@
{
\exp_after:wN \@@_mul_significand_test_f:NNN
\exp_after:wN #5
- \int_use:N \__int_eval:w 99990000 + #1*#6 +
+ \__int_value:w \__int_eval:w 99990000 + #1*#6 +
\exp_after:wN \@@_mul_significand_keep:NNNNNw
- \int_use:N \__int_eval:w 99990000 + #1*#7 + #2*#6 +
+ \__int_value:w \__int_eval:w 99990000 + #1*#7 + #2*#6 +
\exp_after:wN \@@_mul_significand_keep:NNNNNw
- \int_use:N \__int_eval:w 99990000 + #1*#8 + #2*#7 + #3*#6 +
+ \__int_value:w \__int_eval:w 99990000 + #1*#8 + #2*#7 + #3*#6 +
\exp_after:wN \@@_mul_significand_drop:NNNNNw
- \int_use:N \__int_eval:w 99990000 + #1*#9 + #2*#8 + #3*#7 + #4*#6 +
+ \__int_value:w \__int_eval:w 99990000 + #1*#9 + #2*#8 + #3*#7 + #4*#6 +
\exp_after:wN \@@_mul_significand_drop:NNNNNw
- \int_use:N \__int_eval:w 99990000 + #2*#9 + #3*#8 + #4*#7 +
+ \__int_value:w \__int_eval:w 99990000 + #2*#9 + #3*#8 + #4*#7 +
\exp_after:wN \@@_mul_significand_drop:NNNNNw
- \int_use:N \__int_eval:w 99990000 + #3*#9 + #4*#8 +
+ \__int_value:w \__int_eval:w 99990000 + #3*#9 + #4*#8 +
\exp_after:wN \@@_mul_significand_drop:NNNNNw
- \int_use:N \__int_eval:w 100000000 + #4*#9 ;
+ \__int_value:w \__int_eval:w 100000000 + #4*#9 ;
; \exp_after:wN ;
}
\cs_new:Npn \@@_mul_significand_drop:NNNNNw #1#2#3#4#5 #6;
@@ -967,9 +967,9 @@
\cs_new:Npn \@@_mul_significand_large_f:NwwNNNN #1 #2; #3; #4#5#6#7; +
{
\exp_after:wN \@@_basics_pack_high:NNNNNw
- \int_use:N \__int_eval:w 1#2
+ \__int_value:w \__int_eval:w 1#2
\exp_after:wN \@@_basics_pack_low:NNNNNw
- \int_use:N \__int_eval:w 1#3#4#5#6#7
+ \__int_value:w \__int_eval:w 1#3#4#5#6#7
+ \exp_after:wN \@@_round:NNN
\exp_after:wN #1
\exp_after:wN #7
@@ -990,9 +990,9 @@
{
- \c_one
\exp_after:wN \@@_basics_pack_high:NNNNNw
- \int_use:N \__int_eval:w 1#3#4
+ \__int_value:w \__int_eval:w 1#3#4
\exp_after:wN \@@_basics_pack_low:NNNNNw
- \int_use:N \__int_eval:w 1#5#6#7
+ \__int_value:w \__int_eval:w 1#5#6#7
+ \exp_after:wN \@@_round:NNN
\exp_after:wN #1
\exp_after:wN #7
@@ -1060,10 +1060,10 @@
{
\exp_after:wN \@@_sanitize:Nw
\exp_after:wN #1
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
#3 - #6
\exp_after:wN \@@_div_significand_i_o:wnnw
- \int_use:N \__int_eval:w #7 \use_i:nnnn #8 + \c_one ;
+ \__int_value:w \__int_eval:w #7 \use_i:nnnn #8 + \c_one ;
#4
{#7}{#8}#9 ;
#1
@@ -1259,9 +1259,9 @@
\cs_new:Npn \@@_div_significand_i_o:wnnw #1 ; #2#3 #4 ;
{
\exp_after:wN \@@_div_significand_test_o:w
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\exp_after:wN \@@_div_significand_calc:wwnnnnnnn
- \int_use:N \__int_eval:w 999999 + #2 #3 0 / #1 ;
+ \__int_value:w \__int_eval:w 999999 + #2 #3 0 / #1 ;
#2 #3 ;
#4
{ \exp_after:wN \@@_div_significand_ii:wwn \__int_value:w #1 }
@@ -1343,16 +1343,16 @@
{
1 1 #1
#9 \exp_after:wN ;
- \int_use:N \__int_eval:w \c_@@_Bigg_leading_shift_int
+ \__int_value:w \__int_eval:w \c_@@_Bigg_leading_shift_int
+ #2 - #1 * #5 - #5#60
\exp_after:wN \@@_pack_Bigg:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_Bigg_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_Bigg_middle_shift_int
+ #3 - #1 * #6 - #70
\exp_after:wN \@@_pack_Bigg:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_Bigg_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_Bigg_middle_shift_int
+ #4 - #1 * #7 - #80
\exp_after:wN \@@_pack_Bigg:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_Bigg_trailing_shift_int
+ \__int_value:w \__int_eval:w \c_@@_Bigg_trailing_shift_int
- #1 * #8 ;
{#5}{#6}{#7}{#8}
}
@@ -1360,16 +1360,16 @@
{
1 0 #1
#9 \exp_after:wN ;
- \int_use:N \__int_eval:w \c_@@_Bigg_leading_shift_int
+ \__int_value:w \__int_eval:w \c_@@_Bigg_leading_shift_int
+ #2 - #1 * #5
\exp_after:wN \@@_pack_Bigg:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_Bigg_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_Bigg_middle_shift_int
+ #3 - #1 * #6
\exp_after:wN \@@_pack_Bigg:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_Bigg_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_Bigg_middle_shift_int
+ #4 - #1 * #7
\exp_after:wN \@@_pack_Bigg:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_Bigg_trailing_shift_int
+ \__int_value:w \__int_eval:w \c_@@_Bigg_trailing_shift_int
- #1 * #8 ;
{#5}{#6}{#7}{#8}
}
@@ -1396,9 +1396,9 @@
\cs_new:Npn \@@_div_significand_ii:wwn #1; #2;#3
{
\exp_after:wN \@@_div_significand_pack:NNN
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\exp_after:wN \@@_div_significand_calc:wwnnnnnnn
- \int_use:N \__int_eval:w 999999 + #2 #3 0 / #1 ; #2 #3 ;
+ \__int_value:w \__int_eval:w 999999 + #2 #3 0 / #1 ; #2 #3 ;
}
% \end{macrocode}
% \end{macro}
@@ -1418,7 +1418,7 @@
{
0
\exp_after:wN \@@_div_significand_iv:wwnnnnnnn
- \int_use:N \__int_eval:w (\c_two * #2 #3) / #6 #7 ; % <- P
+ \__int_value:w \__int_eval:w (\c_two * #2 #3) / #6 #7 ; % <- P
#2 ; {#3} {#4} {#5}
{#6} {#7}
}
@@ -1477,11 +1477,11 @@
{
+ \c_five * #1
\exp_after:wN \@@_div_significand_vi:Nw
- \int_use:N \__int_eval:w -20 + 2*#2#3 - #1*#6#7 +
+ \__int_value:w \__int_eval:w -20 + 2*#2#3 - #1*#6#7 +
\exp_after:wN \@@_div_significand_v:NN
- \int_use:N \__int_eval:w 199980 + 2*#4 - #1*#8 +
+ \__int_value:w \__int_eval:w 199980 + 2*#4 - #1*#8 +
\exp_after:wN \@@_div_significand_v:NN
- \int_use:N \__int_eval:w 200000 + 2*#5 - #1*#9 ;
+ \__int_value:w \__int_eval:w 200000 + 2*#5 - #1*#9 ;
}
\cs_new:Npn \@@_div_significand_v:NN #1#2 { #1#2 \__int_eval_end: + }
\cs_new:Npn \@@_div_significand_vi:Nw #1#2;
@@ -1557,9 +1557,9 @@
0 #1; #2; #3; #4#5#6#7#8; #9
{
\exp_after:wN \@@_basics_pack_high:NNNNNw
- \int_use:N \__int_eval:w 1 #1#2
+ \__int_value:w \__int_eval:w 1 #1#2
\exp_after:wN \@@_basics_pack_low:NNNNNw
- \int_use:N \__int_eval:w 1 #3#4#5#6#7
+ \__int_value:w \__int_eval:w 1 #3#4#5#6#7
+ \@@_round:NNN #9 #7 #8
\exp_after:wN ;
}
@@ -1581,9 +1581,9 @@
{
+ \c_one
\exp_after:wN \@@_basics_pack_weird_high:NNNNNNNNw
- \int_use:N \__int_eval:w 1 #1 #2
+ \__int_value:w \__int_eval:w 1 #1 #2
\exp_after:wN \@@_basics_pack_weird_low:NNNNw
- \int_use:N \__int_eval:w 1 #3 #4 #5 #6 +
+ \__int_value:w \__int_eval:w 1 #3 #4 #5 #6 +
\exp_after:wN \@@_round:NNN
\exp_after:wN #9
\exp_after:wN #6
@@ -1631,7 +1631,7 @@
{
\exp_after:wN \@@_sanitize:Nw
\exp_after:wN 0
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\if_int_odd:w #1 \exp_stop_f:
\exp_after:wN \@@_sqrt_npos_auxi_o:wwnnN
\fi:
@@ -1720,11 +1720,11 @@
{
\if_int_compare:w #1 = #2 \exp_stop_f:
\exp_after:wN \@@_sqrt_auxi_o:NNNNwnnN
- \int_use:N \__int_eval:w 9999 9999 +
+ \__int_value:w \__int_eval:w 9999 9999 +
\exp_after:wN \@@_use_none_until_s:w
\fi:
\exp_after:wN \@@_sqrt_Newton_o:wwn
- \int_use:N \__int_eval:w (#1 + #3 * 1 0000 0000 / #1) / \c_two ;
+ \__int_value:w \__int_eval:w (#1 + #3 * 1 0000 0000 / #1) / \c_two ;
#1; {#3}
}
% \end{macrocode}
@@ -1813,32 +1813,32 @@
\cs_new:Npn \@@_sqrt_auxii_o:NnnnnnnnN #1 #2#3#4#5#6 #7#8#9
{
\exp_after:wN #1
- \int_use:N \__int_eval:w \c_@@_big_leading_shift_int
+ \__int_value:w \__int_eval:w \c_@@_big_leading_shift_int
+ #7 - #2 * #2
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_big_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_big_middle_shift_int
- 2 * #2 * #3
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_big_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_big_middle_shift_int
+ #8 - #3 * #3 - 2 * #2 * #4
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_big_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_big_middle_shift_int
- 2 * #3 * #4 - 2 * #2 * #5
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_big_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_big_middle_shift_int
+ #9 000 0000 - #4 * #4 - 2 * #3 * #5 - 2 * #2 * #6
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_big_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_big_middle_shift_int
- 2 * #4 * #5 - 2 * #3 * #6
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_big_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_big_middle_shift_int
- #5 * #5 - 2 * #4 * #6
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\c_@@_big_middle_shift_int
- 2 * #5 * #6
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\c_@@_big_trailing_shift_int
- #6 * #6 ;
% (
@@ -1896,18 +1896,18 @@
{
\if_int_compare:w #1 > \c_one
\exp_after:wN \@@_sqrt_auxiv_o:NNNNNw
- \int_use:N \__int_eval:w (#1#2 %)
+ \__int_value:w \__int_eval:w (#1#2 %)
\else:
\if_int_compare:w #1#2 > \c_one
\exp_after:wN \@@_sqrt_auxv_o:NNNNNw
- \int_use:N \__int_eval:w (#1#2#3 %)
+ \__int_value:w \__int_eval:w (#1#2#3 %)
\else:
\if_int_compare:w #1#2#3 > \c_one
\exp_after:wN \@@_sqrt_auxvi_o:NNNNNw
- \int_use:N \__int_eval:w (#1#2#3#4 %)
+ \__int_value:w \__int_eval:w (#1#2#3#4 %)
\else:
\exp_after:wN \@@_sqrt_auxvii_o:NNNNNw
- \int_use:N \__int_eval:w (#1#2#3#4#5 %)
+ \__int_value:w \__int_eval:w (#1#2#3#4#5 %)
\fi:
\fi:
\fi:
@@ -1937,11 +1937,11 @@
\cs_new:Npn \@@_sqrt_auxviii_o:nnnnnnn #1#2 #3#4#5#6#7
{
\exp_after:wN \@@_sqrt_auxix_o:wnwnw
- \int_use:N \__int_eval:w #3
+ \__int_value:w \__int_eval:w #3
\exp_after:wN \@@_basics_pack_low:NNNNNw
- \int_use:N \__int_eval:w #1 + 1#4#5
+ \__int_value:w \__int_eval:w #1 + 1#4#5
\exp_after:wN \@@_basics_pack_low:NNNNNw
- \int_use:N \__int_eval:w #2 + 1#6#7 ;
+ \__int_value:w \__int_eval:w #2 + 1#6#7 ;
}
\cs_new:Npn \@@_sqrt_auxix_o:wnwnw #1; #2#3; #4#5;
{
@@ -1987,7 +1987,7 @@
\cs_new:Npn \@@_sqrt_auxx_o:Nnnnnnnn #1#2#3 #4#5#6#7#8
{
\exp_after:wN \@@_sqrt_auxxi_o:wwnnN
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
(#8 + 2499) / 5000 * 5000 ;
{#4} {#5} {#6} {#7} ;
}
@@ -2065,9 +2065,9 @@
\cs_new:Npn \@@_sqrt_auxxiv_o:wnnnnnnnN #1; #2#3#4#5#6 #7#8#9
{
\exp_after:wN \@@_basics_pack_high:NNNNNw
- \int_use:N \__int_eval:w 1 0000 0000 + #2#3
+ \__int_value:w \__int_eval:w 1 0000 0000 + #2#3
\exp_after:wN \@@_basics_pack_low:NNNNNw
- \int_use:N \__int_eval:w 1 0000 0000
+ \__int_value:w \__int_eval:w 1 0000 0000
+ #4#5
\if_int_compare:w #6 > #1 \exp_stop_f: + \c_one \fi:
+ \exp_after:wN \@@_round:NNN
@@ -2076,7 +2076,7 @@
\__int_value:w
\exp_after:wN \use_i:nn
\exp_after:wN \@@_round_digit:Nw
- \int_use:N \__int_eval:w #6 + 19999 - #1 ;
+ \__int_value:w \__int_eval:w #6 + 19999 - #1 ;
\exp_after:wN ;
}
% \end{macrocode}
diff --git a/l3kernel/l3fp-convert.dtx b/l3kernel/l3fp-convert.dtx
index 75659c8..969a73e 100644
--- a/l3kernel/l3fp-convert.dtx
+++ b/l3kernel/l3fp-convert.dtx
@@ -175,7 +175,7 @@
\else:
\exp_after:wN \@@_to_scientific_normal:wNw
\exp_after:wN e
- \int_use:N \__int_eval:w #2 - \c_one
+ \__int_value:w \__int_eval:w #2 - \c_one
\fi:
; #3 #4 #5 #6 ;
}
@@ -425,7 +425,7 @@
\@@_case_return:nw { \exp_after:wN \c_zero_fp }
\else:
\exp_after:wN \@@_from_dim:wNw
- \int_use:N \__int_eval:w #1 - \c_four
+ \__int_value:w \__int_eval:w #1 - \c_four
\if_meaning:w - #2
\exp_after:wN , \exp_after:wN 2 \__int_value:w
\else:
diff --git a/l3kernel/l3fp-expo.dtx b/l3kernel/l3fp-expo.dtx
index b0b73f0..08d66f7 100644
--- a/l3kernel/l3fp-expo.dtx
+++ b/l3kernel/l3fp-expo.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3fp-expo.dtx Copyright (C) 2011-2014 The LaTeX3 Project
+%% File: l3fp-expo.dtx Copyright (C) 2011-2014,2016 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
@@ -187,7 +187,7 @@
0
\fi:
\exp_after:wN \exp_stop_f:
- \int_use:N \__int_eval:w % for the exponent
+ \__int_value:w \__int_eval:w % for the exponent
\@@_ln_significand:NNNNnnnN #2#3
\@@_ln_exponent:wn {#1}
}
@@ -239,11 +239,11 @@
\cs:w c_@@_ln_ \__int_to_roman:w #1 _fixed_tl \exp_after:wN \cs_end:
\__int_value:w
\exp_after:wN \@@_ln_x_iv:wnnnnnnnn
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\exp_after:wN \@@_ln_x_iii_var:NNNNNw
- \int_use:N \__int_eval:w 9999 9990 + #1*#2#3 +
+ \__int_value:w \__int_eval:w 9999 9990 + #1*#2#3 +
\exp_after:wN \@@_ln_x_iii:NNNNNNw
- \int_use:N \__int_eval:w 10 0000 0000 + #1*#4#5 ;
+ \__int_value:w \__int_eval:w 10 0000 0000 + #1*#4#5 ;
{20000} {0000} {0000} {0000}
} %^^A todo: reoptimize (a generalization attempt failed).
\cs_new:Npn \@@_ln_x_iii:NNNNNNw #1#2 #3#4#5#6 #7;
@@ -328,7 +328,7 @@
\cs_new:Npn \@@_ln_x_iv:wnnnnnnnn #1; #2#3#4#5 #6#7#8#9
{
\exp_after:wN \@@_div_significand_pack:NNN
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\@@_ln_div_i:w #1 ;
#6 #7 ; {#8} {#9}
{#2} {#3} {#4} {#5}
@@ -341,20 +341,20 @@
\cs_new:Npn \@@_ln_div_i:w #1;
{
\exp_after:wN \@@_div_significand_calc:wwnnnnnnn
- \int_use:N \__int_eval:w 999999 + 2 0000 0000 / #1 ; % Q1
+ \__int_value:w \__int_eval:w 999999 + 2 0000 0000 / #1 ; % Q1
}
\cs_new:Npn \@@_ln_div_ii:wwn #1; #2;#3 % y; B1;B2 <- for k=1
{
\exp_after:wN \@@_div_significand_pack:NNN
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\exp_after:wN \@@_div_significand_calc:wwnnnnnnn
- \int_use:N \__int_eval:w 999999 + #2 #3 / #1 ; % Q2
+ \__int_value:w \__int_eval:w 999999 + #2 #3 / #1 ; % Q2
#2 #3 ;
}
\cs_new:Npn \@@_ln_div_vi:wwn #1; #2;#3#4#5 #6#7#8#9 %y;F1;F2F3F4x1x2x3x4
{
\exp_after:wN \@@_div_significand_pack:NNN
- \int_use:N \__int_eval:w 1000000 + #2 #3 / #1 ; % Q6
+ \__int_value:w \__int_eval:w 1000000 + #2 #3 / #1 ; % Q6
}
% \end{macrocode}
% We now have essentially\footnote{Bruno: add a mention that
@@ -402,12 +402,12 @@
\exp_after:wN \@@_ln_t_large:NNw
\exp_after:wN + % <sign>
\exp_after:wN #1
- \int_use:N \__int_eval:w 9999 - #2 \exp_after:wN ;
- \int_use:N \__int_eval:w 9999 - #3 \exp_after:wN ;
- \int_use:N \__int_eval:w 9999 - #4 \exp_after:wN ;
- \int_use:N \__int_eval:w 9999 - #5 \exp_after:wN ;
- \int_use:N \__int_eval:w 9999 - #6 \exp_after:wN ;
- \int_use:N \__int_eval:w 1 0000 - #7 ;
+ \__int_value:w \__int_eval:w 9999 - #2 \exp_after:wN ;
+ \__int_value:w \__int_eval:w 9999 - #3 \exp_after:wN ;
+ \__int_value:w \__int_eval:w 9999 - #4 \exp_after:wN ;
+ \__int_value:w \__int_eval:w 9999 - #5 \exp_after:wN ;
+ \__int_value:w \__int_eval:w 9999 - #6 \exp_after:wN ;
+ \__int_value:w \__int_eval:w 1 0000 - #7 ;
}
% \end{macrocode}
%
@@ -422,29 +422,29 @@
\cs_new:Npn \@@_ln_t_large:NNw #1 #2 #3; #4; #5; #6; #7; #8;
{
\exp_after:wN \@@_ln_square_t_after:w
- \int_use:N \__int_eval:w 9999 0000 + #3*#3
+ \__int_value:w \__int_eval:w 9999 0000 + #3*#3
\exp_after:wN \@@_ln_square_t_pack:NNNNNw
- \int_use:N \__int_eval:w 9999 0000 + 2*#3*#4
+ \__int_value:w \__int_eval:w 9999 0000 + 2*#3*#4
\exp_after:wN \@@_ln_square_t_pack:NNNNNw
- \int_use:N \__int_eval:w 9999 0000 + 2*#3*#5 + #4*#4
+ \__int_value:w \__int_eval:w 9999 0000 + 2*#3*#5 + #4*#4
\exp_after:wN \@@_ln_square_t_pack:NNNNNw
- \int_use:N \__int_eval:w 9999 0000 + 2*#3*#6 + 2*#4*#5
+ \__int_value:w \__int_eval:w 9999 0000 + 2*#3*#6 + 2*#4*#5
\exp_after:wN \@@_ln_square_t_pack:NNNNNw
- \int_use:N \__int_eval:w 1 0000 0000 + 2*#3*#7 + 2*#4*#6 + #5*#5
+ \__int_value:w \__int_eval:w 1 0000 0000 + 2*#3*#7 + 2*#4*#6 + #5*#5
+ (2*#3*#8 + 2*#4*#7 + 2*#5*#6) / 1 0000
% ; ; ;
\exp_after:wN \@@_ln_twice_t_after:w
- \int_use:N \__int_eval:w -1 + 2*#3
+ \__int_value:w \__int_eval:w -1 + 2*#3
\exp_after:wN \@@_ln_twice_t_pack:Nw
- \int_use:N \__int_eval:w 9999 + 2*#4
+ \__int_value:w \__int_eval:w 9999 + 2*#4
\exp_after:wN \@@_ln_twice_t_pack:Nw
- \int_use:N \__int_eval:w 9999 + 2*#5
+ \__int_value:w \__int_eval:w 9999 + 2*#5
\exp_after:wN \@@_ln_twice_t_pack:Nw
- \int_use:N \__int_eval:w 9999 + 2*#6
+ \__int_value:w \__int_eval:w 9999 + 2*#6
\exp_after:wN \@@_ln_twice_t_pack:Nw
- \int_use:N \__int_eval:w 9999 + 2*#7
+ \__int_value:w \__int_eval:w 9999 + 2*#7
\exp_after:wN \@@_ln_twice_t_pack:Nw
- \int_use:N \__int_eval:w 10000 + 2*#8 ; ;
+ \__int_value:w \__int_eval:w 10000 + 2*#8 ; ;
{ \@@_ln_c:NwNw #1 }
#2
}
@@ -498,7 +498,7 @@
\@@_fixed_mul:wwn #3;
{
\exp_after:wN \@@_ln_Taylor_loop:www
- \int_use:N \__int_eval:w #1 - \c_two ;
+ \__int_value:w \__int_eval:w #1 - \c_two ;
}
#3;
}
@@ -506,7 +506,7 @@
{
\fi:
\exp_after:wN \@@_fixed_mul:wwn
- \exp_after:wN { \int_use:N \__int_eval:w 10000 + #2 } #3;
+ \exp_after:wN { \__int_value:w \__int_eval:w 10000 + #2 } #3;
}
% \end{macrocode}
% \end{macro}
@@ -652,7 +652,7 @@
\if_int_compare:w #4 < - \c_eight
\c_one
\exp_after:wN \@@_add_big_i_o:wNww
- \int_use:N \__int_eval:w \c_one - #4 ;
+ \__int_value:w \__int_eval:w \c_one - #4 ;
0 {1000}{0000}{0000}{0000} ; #5;
\exp:w
\else:
@@ -717,7 +717,7 @@
\@@_fixed_mul:wwn #2 ;
{
\exp_after:wN \@@_exp_Taylor_loop:www
- \int_use:N \__int_eval:w #1 - 1 ;
+ \__int_value:w \__int_eval:w #1 - 1 ;
#2 ;
}
}
@@ -1086,21 +1086,21 @@
\cs_new:Npn \@@_pow_exponent:Nwnnnnnw #1#2; #3#4#5#6#7#8;
{ %^^A todo: use that in ln.
\exp_after:wN \@@_fixed_mul_after:wwn
- \int_use:N \__int_eval:w \c_@@_leading_shift_int
+ \__int_value:w \__int_eval:w \c_@@_leading_shift_int
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_middle_shift_int
#1#2*23025 - #1 #3
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_middle_shift_int
#1 #2*8509 - #1 #4
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_middle_shift_int
#1 #2*2994 - #1 #5
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_middle_shift_int
#1 #2*0456 - #1 #6
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_trailing_shift_int
+ \__int_value:w \__int_eval:w \c_@@_trailing_shift_int
#1 #2*8401 - #1 #7
#1 ( #2*7991 - #8 ) / 1 0000 ; ;
}
@@ -1116,7 +1116,7 @@
\fi:
\fi:
#7 \exp_after:wN ;
- \int_use:N \__int_eval:w 10 0000 + #1 \__int_eval_end:
+ \__int_value:w \__int_eval:w 10 0000 + #1 \__int_eval_end:
#2#3#4#5#6 0000 0000 0000 0000 0000 0000 ; %^^A todo: how many 0?
}
\cs_new:Npn \@@_pow_C_overflow:w #1; #2; #3
@@ -1183,7 +1183,7 @@
\exp_after:wN \s_@@
\exp_after:wN \@@_chk:w
\exp_after:wN #2
- \int_use:N \__int_eval:w \c_two - #3 \__int_eval_end:
+ \__int_value:w \__int_eval:w \c_two - #3 \__int_eval_end:
}
% \end{macrocode}
% ^^A todo: is this \@@_exp_after_o:w necessary? Appropriate?
diff --git a/l3kernel/l3fp-extended.dtx b/l3kernel/l3fp-extended.dtx
index 5f887af..5e78311 100644
--- a/l3kernel/l3fp-extended.dtx
+++ b/l3kernel/l3fp-extended.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3fp-extended.dtx Copyright (C) 2011-2014 The LaTeX3 Project
+%% File: l3fp-extended.dtx Copyright (C) 2011-2014,2016 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
@@ -154,7 +154,7 @@
\cs_new:Npn \@@_fixed_add_one:wN #1#2; #3
{
\exp_after:wN #3 \exp_after:wN
- { \int_use:N \__int_eval:w \c_ten_thousand + #1 } #2 ;
+ { \__int_value:w \__int_eval:w \c_ten_thousand + #1 } #2 ;
}
% \end{macrocode}
% \end{macro}
@@ -170,9 +170,9 @@
\cs_new:Npn \@@_fixed_div_myriad:wn #1#2#3#4#5#6;
{
\exp_after:wN \@@_fixed_mul_after:wwn
- \int_use:N \__int_eval:w \c_@@_leading_shift_int
+ \__int_value:w \__int_eval:w \c_@@_leading_shift_int
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_trailing_shift_int
+ \__int_value:w \__int_eval:w \c_@@_trailing_shift_int
+ #1 ; {#2}{#3}{#4}{#5};
}
% \end{macrocode}
@@ -210,22 +210,22 @@
\cs_new:Npn \@@_fixed_mul_short:wwn #1#2#3#4#5#6; #7#8#9;
{
\exp_after:wN \@@_fixed_mul_after:wwn
- \int_use:N \__int_eval:w \c_@@_leading_shift_int
+ \__int_value:w \__int_eval:w \c_@@_leading_shift_int
+ #1*#7
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_middle_shift_int
+ #1*#8 + #2*#7
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_middle_shift_int
+ #1*#9 + #2*#8 + #3*#7
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_middle_shift_int
+ #2*#9 + #3*#8 + #4*#7
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_middle_shift_int
+ #3*#9 + #4*#8 + #5*#7
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_trailing_shift_int
+ \__int_value:w \__int_eval:w \c_@@_trailing_shift_int
+ #4*#9 + #5*#8 + #6*#7
+ ( #5*#9 + #6*#8 + #6*#9 / \c_ten_thousand )
/ \c_ten_thousand ; ;
@@ -290,7 +290,7 @@
{
\exp_after:wN \@@_fixed_div_int_after:Nw
\exp_after:wN #8
- \int_use:N \__int_eval:w \c_minus_one
+ \__int_value:w \__int_eval:w \c_minus_one
\@@_fixed_div_int:wnN
#1; {#7} \@@_fixed_div_int_auxi:wnn
#2; {#7} \@@_fixed_div_int_auxi:wnn
@@ -302,7 +302,7 @@
\cs_new:Npn \@@_fixed_div_int:wnN #1; #2 #3
{
\exp_after:wN #3
- \int_use:N \__int_eval:w #1 / #2 - \c_one ;
+ \__int_value:w \__int_eval:w #1 / #2 - \c_one ;
{#2}
{#1}
}
@@ -310,9 +310,9 @@
{
+ #1
\exp_after:wN \@@_fixed_div_int_pack:Nw
- \int_use:N \__int_eval:w 9999
+ \__int_value:w \__int_eval:w 9999
\exp_after:wN \@@_fixed_div_int:wnN
- \int_use:N \__int_eval:w #3 - #1*#2 \__int_eval_end:
+ \__int_value:w \__int_eval:w #3 - #1*#2 \__int_eval_end:
}
\cs_new:Npn \@@_fixed_div_int_auxii:wnn #1; #2 #3 { + #1 + \c_two ; }
\cs_new:Npn \@@_fixed_div_int_pack:Nw #1 #2; { + #1; {#2} }
@@ -354,16 +354,16 @@
\cs_new:Npn \@@_fixed_add:Nnnnnwnn #1 #2#3#4#5 #6; #7#8
{
\exp_after:wN \@@_fixed_add_after:NNNNNwn
- \int_use:N \__int_eval:w 9 9999 9998 + #2#3 #1 #7#8
+ \__int_value:w \__int_eval:w 9 9999 9998 + #2#3 #1 #7#8
\exp_after:wN \@@_fixed_add_pack:NNNNNwn
- \int_use:N \__int_eval:w 1 9999 9998 + #4#5
+ \__int_value:w \__int_eval:w 1 9999 9998 + #4#5
\@@_fixed_add:nnNnnnwn #6 #1
}
\cs_new:Npn \@@_fixed_add:nnNnnnwn #1#2 #3 #4#5 #6#7 ; #8
{
#3 #4#5
\exp_after:wN \@@_fixed_add_pack:NNNNNwn
- \int_use:N \__int_eval:w 2 0000 0000 #3 #6#7 + #1#2 ; {#8} ;
+ \__int_value:w \__int_eval:w 2 0000 0000 #3 #6#7 + #1#2 ; {#8} ;
}
\cs_new:Npn \@@_fixed_add_pack:NNNNNwn #1 #2#3#4#5 #6; #7
{ + #1 ; {#7} {#2#3#4#5} {#6} }
@@ -423,21 +423,21 @@
\cs_new:Npn \@@_fixed_mul:wwn #1#2#3#4 #5; #6#7#8#9
{
\exp_after:wN \@@_fixed_mul_after:wwn
- \int_use:N \__int_eval:w \c_@@_leading_shift_int
+ \__int_value:w \__int_eval:w \c_@@_leading_shift_int
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_middle_shift_int
+ #1*#6
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_middle_shift_int
+ #1*#7 + #2*#6
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_middle_shift_int
+ #1*#8 + #2*#7 + #3*#6
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_middle_shift_int
+ #1*#9 + #2*#8 + #3*#7 + #4*#6
\exp_after:wN \@@_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_trailing_shift_int
+ \__int_value:w \__int_eval:w \c_@@_trailing_shift_int
+ #2*#9 + #3*#8 + #4*#7
+ ( #3*#9 + #4*#8
+ \@@_fixed_mul:nnnnnnnw #5 {#6}{#7} {#1}{#2}
@@ -507,9 +507,9 @@
\cs_new:Npn \@@_fixed_mul_add:wwwn #1; #2; #3#4#5#6#7#8;
{
\exp_after:wN \@@_fixed_mul_after:wwn
- \int_use:N \__int_eval:w \c_@@_big_leading_shift_int
+ \__int_value:w \__int_eval:w \c_@@_big_leading_shift_int
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_big_middle_shift_int + #3 #4
+ \__int_value:w \__int_eval:w \c_@@_big_middle_shift_int + #3 #4
\@@_fixed_mul_add:Nwnnnwnnn +
+ #5 #6 ; #2 ; #1 ; #2 ; +
+ #7 #8 ; ;
@@ -517,9 +517,9 @@
\cs_new:Npn \@@_fixed_mul_sub_back:wwwn #1; #2; #3#4#5#6#7#8;
{
\exp_after:wN \@@_fixed_mul_after:wwn
- \int_use:N \__int_eval:w \c_@@_big_leading_shift_int
+ \__int_value:w \__int_eval:w \c_@@_big_leading_shift_int
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_big_middle_shift_int + #3 #4
+ \__int_value:w \__int_eval:w \c_@@_big_middle_shift_int + #3 #4
\@@_fixed_mul_add:Nwnnnwnnn -
+ #5 #6 ; #2 ; #1 ; #2 ; -
+ #7 #8 ; ;
@@ -527,9 +527,9 @@
\cs_new:Npn \@@_fixed_one_minus_mul:wwn #1; #2;
{
\exp_after:wN \@@_fixed_mul_after:wwn
- \int_use:N \__int_eval:w \c_@@_big_leading_shift_int
+ \__int_value:w \__int_eval:w \c_@@_big_leading_shift_int
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_big_middle_shift_int + 1 0000 0000
+ \__int_value:w \__int_eval:w \c_@@_big_middle_shift_int + 1 0000 0000
\@@_fixed_mul_add:Nwnnnwnnn -
; #2 ; #1 ; #2 ; -
; ;
@@ -559,13 +559,13 @@
{
#1 #7*#3
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_big_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_big_middle_shift_int
#1 #7*#4 #1 #8*#3
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_big_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_big_middle_shift_int
#1 #7*#5 #1 #8*#4 #1 #9*#3 #2
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_big_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_big_middle_shift_int
#1 \@@_fixed_mul_add:nnnnwnnnn {#7}{#8}{#9}
}
% \end{macrocode}
@@ -597,7 +597,7 @@
{
( #1*#9 + #2*#8 + #3*#7 + #4*#6 )
\exp_after:wN \@@_pack_big:NNNNNNw
- \int_use:N \__int_eval:w \c_@@_big_trailing_shift_int
+ \__int_value:w \__int_eval:w \c_@@_big_trailing_shift_int
\@@_fixed_mul_add:nnnnwnnwN
{ #6 + #4*#7 + #3*#8 + #2*#9 + #1 }
{ #7 + #4*#8 + #3*#9 + #2 }
@@ -651,7 +651,7 @@
\cs_new:Npn \@@_ep_to_fixed:wwn #1,#2
{
\exp_after:wN \@@_ep_to_fixed_auxi:www
- \int_use:N \__int_eval:w 1 0000 0000 + #2 \exp_after:wN ;
+ \__int_value:w \__int_eval:w 1 0000 0000 + #2 \exp_after:wN ;
\exp:w \exp_end_continue_f:w
\prg_replicate:nn { \c_four - \int_max:nn {#1} { -32 } } { 0 } ;
}
@@ -692,10 +692,10 @@
\cs_new:Npn \@@_ep_to_ep:wwN #1,#2#3#4#5#6#7; #8
{
\exp_after:wN #8
- \int_use:N \__int_eval:w #1 + \c_four
+ \__int_value:w \__int_eval:w #1 + \c_four
\exp_after:wN \use_i:nn
\exp_after:wN \@@_ep_to_ep_loop:N
- \int_use:N \__int_eval:w 1 0000 0000 + #2 \__int_eval_end:
+ \__int_value:w \__int_eval:w 1 0000 0000 + #2 \__int_eval_end:
#3#4#5#6#7 ; ; !
}
\cs_new:Npn \@@_ep_to_ep_loop:N #1
@@ -776,7 +776,7 @@
\cs_new:Npn \@@_ep_mul_raw:wwwwN #1,#2; #3,#4; #5
{
\@@_fixed_mul:wwn #2; #4;
- { \exp_after:wN #5 \int_use:N \__int_eval:w #1 + #3 , }
+ { \exp_after:wN #5 \__int_value:w \__int_eval:w #1 + #3 , }
}
% \end{macrocode}
% \end{macro}
@@ -952,15 +952,15 @@
\cs_new:Npn \@@_ep_div_esti:wwwwn #1,#2#3; #4,
{
\exp_after:wN \@@_ep_div_estii:wwnnwwn
- \int_use:N \__int_eval:w 10 0000 0000 / ( #2 + \c_one )
+ \__int_value:w \__int_eval:w 10 0000 0000 / ( #2 + \c_one )
\exp_after:wN ;
- \int_use:N \__int_eval:w #4 - #1 + \c_one ,
+ \__int_value:w \__int_eval:w #4 - #1 + \c_one ,
{#2} #3;
}
\cs_new:Npn \@@_ep_div_estii:wwnnwwn #1; #2,#3#4#5; #6; #7
{
\exp_after:wN \@@_ep_div_estiii:NNNNNwwwn
- \int_use:N \__int_eval:w 10 0000 0000 - 1750
+ \__int_value:w \__int_eval:w 10 0000 0000 - 1750
+ #1 000 + (10 0000 0000 / #3 - #1) * (1000 - #4 / 10) ;
{#3}{#4}#5; #6; { #7 #2, }
}
@@ -995,11 +995,11 @@
\cs_new:Npn \@@_ep_div_epsi:wnNNNNNn #1#2#3#4#5#6;
{
\exp_after:wN \@@_ep_div_epsii:wwnNNNNNn
- \int_use:N \__int_eval:w 1 9998 - #2
+ \__int_value:w \__int_eval:w 1 9998 - #2
\exp_after:wN \@@_ep_div_eps_pack:NNNNNw
- \int_use:N \__int_eval:w 1 9999 9998 - #3#4
+ \__int_value:w \__int_eval:w 1 9999 9998 - #3#4
\exp_after:wN \@@_ep_div_eps_pack:NNNNNw
- \int_use:N \__int_eval:w 2 0000 0000 - #5#6 ; ;
+ \__int_value:w \__int_eval:w 2 0000 0000 - #5#6 ; ;
}
\cs_new:Npn \@@_ep_div_eps_pack:NNNNNw #1#2#3#4#5#6;
{ + #1 ; {#2#3#4#5} {#6} }
@@ -1069,7 +1069,7 @@
\cs_new:Npn \@@_ep_isqrt_auxi:wwn #1,
{
\exp_after:wN \@@_ep_isqrt_auxii:wwnnnwn
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\int_if_odd:nTF {#1}
{ (\c_one - #1) / \c_two , 535 , { 0 } { } }
{ \c_one - #1 / \c_two , 168 , { } { 0 } }
@@ -1112,15 +1112,15 @@
\exp_after:wN \@@_ep_isqrt_estii:wwwnnwn
\fi:
\exp_after:wN \@@_ep_isqrt_esti:wwwnnwn
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
(#1 + 1 0050 0000 #4 / (#1 * #3)) / \c_two ,
#1, #3, {#4}
}
\cs_new:Npn \@@_ep_isqrt_estii:wwwnnwn #1, #2, #3, #4#5
{
\exp_after:wN \@@_ep_isqrt_estiii:NNNNNwwwn
- \int_use:N \__int_eval:w 1000 0000 + #2 * #2 #5 * \c_five
- \exp_after:wN , \int_use:N \__int_eval:w 10000 + #2 ;
+ \__int_value:w \__int_eval:w 1000 0000 + #2 * #2 #5 * \c_five
+ \exp_after:wN , \__int_value:w \__int_eval:w 10000 + #2 ;
}
\cs_new:Npn \@@_ep_isqrt_estiii:NNNNNwwwn 1#1#2#3#4#5#6, 1#7#8; #9;
{
@@ -1225,7 +1225,7 @@
\exp_after:wN \exp_after:wN
\exp_after:wN \@@_fixed_to_loop:N
\exp_after:wN \use_none:n
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
1 0000 0000 + #1 \exp_after:wN \@@_use_none_stop_f:n
\__int_value:w 1#2 \exp_after:wN \@@_use_none_stop_f:n
\__int_value:w 1#3#4 \exp_after:wN \@@_use_none_stop_f:n
@@ -1270,9 +1270,9 @@
\cs_new:Npn \@@_fixed_to_float_round_up:wnnnnw ; #1#2#3#4 ;
{
\exp_after:wN \@@_basics_pack_high:NNNNNw
- \int_use:N \__int_eval:w 1 #1#2
+ \__int_value:w \__int_eval:w 1 #1#2
\exp_after:wN \@@_basics_pack_low:NNNNNw
- \int_use:N \__int_eval:w 1 #3#4 + \c_one ;
+ \__int_value:w \__int_eval:w 1 #3#4 + \c_one ;
}
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3fp-parse.dtx b/l3kernel/l3fp-parse.dtx
index 3cc51d2..0ebefa7 100644
--- a/l3kernel/l3fp-parse.dtx
+++ b/l3kernel/l3fp-parse.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3fp-parse.dtx Copyright (C) 2011-2015 The LaTeX3 Project
+%% File: l3fp-parse.dtx Copyright (C) 2011-2016 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
@@ -888,7 +888,7 @@
\exp_after:wN #1
\exp:w \exp_end_continue_f:w
\exp_after:wN \@@_sanitize:wN
- \int_use:N \__int_eval:w \c_zero \@@_parse_trim_zeros:N
+ \__int_value:w \__int_eval:w \c_zero \@@_parse_trim_zeros:N
}
% \end{macrocode}
% \end{macro}
@@ -1123,7 +1123,7 @@
\cs_new:Npn \@@_parse_small:N #1
{
\exp_after:wN \@@_parse_pack_leading:NNNNNww
- \int_use:N \__int_eval:w 1 \token_to_str:N #1
+ \__int_value:w \__int_eval:w 1 \token_to_str:N #1
\exp_after:wN \@@_parse_small_leading:wwNN
\__int_value:w 1
\exp_after:wN \@@_parse_digits_vii:N
@@ -1151,7 +1151,7 @@
#1 #2
\exp_after:wN \@@_parse_pack_trailing:NNNNNNww
\exp_after:wN \c_zero
- \int_use:N \__int_eval:w 1
+ \__int_value:w \__int_eval:w 1
\if_int_compare:w \c_nine < 1 \token_to_str:N #4 \exp_stop_f:
\token_to_str:N #4
\exp_after:wN \@@_parse_small_trailing:wwNN
@@ -1275,7 +1275,7 @@
{
+ \c_eight - #3
\exp_after:wN \@@_parse_pack_leading:NNNNNww
- \int_use:N \__int_eval:w 1 #1
+ \__int_value:w \__int_eval:w 1 #1
\if_int_compare:w \c_nine < 1 \token_to_str:N #4 \exp_stop_f:
\exp_after:wN \@@_parse_large_trailing:wwNN
\__int_value:w 1 \token_to_str:N #4
@@ -1327,14 +1327,14 @@
\if_int_compare:w \c_nine < 1 \token_to_str:N #4 \exp_stop_f:
\exp_after:wN \@@_parse_pack_trailing:NNNNNNww
\exp_after:wN \c_eight
- \int_use:N \__int_eval:w 1 #1 \token_to_str:N #4
+ \__int_value:w \__int_eval:w 1 #1 \token_to_str:N #4
\exp_after:wN \@@_parse_large_round:NN
\exp_after:wN #4
\exp:w
\else:
\exp_after:wN \@@_parse_pack_trailing:NNNNNNww
- \int_use:N \__int_eval:w \c_seven - #3 \exp_stop_f:
- \int_use:N \__int_eval:w 1 #1
+ \__int_value:w \__int_eval:w \c_seven - #3 \exp_stop_f:
+ \__int_value:w \__int_eval:w 1 #1
\if:w . \exp_not:N #4
\exp_after:wN \@@_parse_small_trailing:wwNN
\__int_value:w 1
@@ -1405,7 +1405,7 @@
\cs_new:Npn \@@_parse_round_after:wN #1; #2
{
+ #2 \exp_after:wN ;
- \int_use:N \__int_eval:w #1 + \@@_parse_exponent:N
+ \__int_value:w \__int_eval:w #1 + \@@_parse_exponent:N
}
% \end{macrocode}
% \end{macro}
@@ -1433,9 +1433,9 @@
\exp_after:wN 0
\exp_after:wN #1
\exp_after:wN #2
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\exp_after:wN \@@_parse_round_after:wN
- \int_use:N \__int_eval:w \c_zero * \__int_eval:w \c_zero
+ \__int_value:w \__int_eval:w \c_zero * \__int_eval:w \c_zero
\exp_after:wN \@@_parse_round_loop:N
\exp:w
\else:
@@ -1474,9 +1474,9 @@
\exp_after:wN 0
\exp_after:wN #1
\exp_after:wN #2
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\exp_after:wN \@@_parse_large_round_aux:wNN
- \int_use:N \__int_eval:w \c_one
+ \__int_value:w \__int_eval:w \c_one
\exp_after:wN \@@_parse_round_loop:N
\else: %^^A could be dot, or e, or other
\exp_after:wN \@@_parse_large_round_test:NN
@@ -1499,7 +1499,7 @@
{
+ #2
\exp_after:wN \@@_parse_round_after:wN
- \int_use:N \__int_eval:w #1
+ \__int_value:w \__int_eval:w #1
\if:w . \exp_not:N #3
+ \c_zero * \__int_eval:w \c_zero
\exp_after:wN \@@_parse_round_loop:N
@@ -1774,7 +1774,7 @@
\exp_after:wN #1
\exp:w \exp_end_continue_f:w
\exp_after:wN \@@_sanitize:wN
- \int_use:N \__int_eval:w \c_zero \@@_parse_strim_zeros:N
+ \__int_value:w \__int_eval:w \c_zero \@@_parse_strim_zeros:N
}
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3fp-round.dtx b/l3kernel/l3fp-round.dtx
index f89ce2a..ce85e29 100644
--- a/l3kernel/l3fp-round.dtx
+++ b/l3kernel/l3fp-round.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3fp-round.dtx Copyright(C) 2011-2012,2014,2015 The LaTeX3 Project
+%% File: l3fp-round.dtx Copyright(C) 2011-2012,2014-2016 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
@@ -257,7 +257,7 @@
\exp_after:wN \@@_round:NNN
\exp_after:wN #1
\exp_after:wN #2
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\if_int_odd:w 0 \if_meaning:w 0 #3 1 \fi:
\if_meaning:w 5 #3 1 \fi:
\exp_stop_f:
@@ -462,11 +462,11 @@
\cs_new:Npn \@@_round_normal:NnnwNNnn #1#2#3#4; #5#6
{
\exp_after:wN \@@_round_normal:NNwNnn
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\if_int_compare:w #2 > \c_zero
1 \__int_value:w #2
\exp_after:wN \@@_round_pack:Nw
- \int_use:N \__int_eval:w 1#3 +
+ \__int_value:w \__int_eval:w 1#3 +
\else:
\if_int_compare:w #3 > \c_zero
1 \__int_value:w #3 +
@@ -505,7 +505,7 @@
\else:
\exp_after:wN \@@_round_special_aux:Nw
\exp_after:wN #4
- \int_use:N \__int_eval:w \c_one
+ \__int_value:w \__int_eval:w \c_one
\if_meaning:w 1 #1 -#6 \else: +#5 \fi:
\fi:
;
diff --git a/l3kernel/l3fp-trig.dtx b/l3kernel/l3fp-trig.dtx
index 24bdd91..c517712 100644
--- a/l3kernel/l3fp-trig.dtx
+++ b/l3kernel/l3fp-trig.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3fp-trig.dtx Copyright (C) 2011-2014 The LaTeX3 Project
+%% File: l3fp-trig.dtx Copyright (C) 2011-2014,2016 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
@@ -318,7 +318,7 @@
\exp_after:wN #2
\exp_after:wN #3
\exp_after:wN #4
- \int_use:N \__int_eval:w #5
+ \__int_value:w \__int_eval:w #5
\exp_after:wN \exp_after:wN \exp_after:wN \exp_after:wN
\if_int_compare:w #7 > #1 \c_zero \c_one
#1 \@@_trig_large:ww \@@_trigd_large:ww
@@ -410,7 +410,7 @@
\cs_new:Npn \@@_trigd_large_auxi:nnnnwNNNN #1#2#3#4#5; #6#7#8#9
{
\exp_after:wN \@@_trigd_large_auxii:wNw
- \int_use:N \__int_eval:w #1 + #2
+ \__int_value:w \__int_eval:w #1 + #2
- (#1 + #2 - \c_four) / \c_nine * \c_nine \__int_eval_end:
#3;
#4; #5{#6#7#8#9};
@@ -419,7 +419,7 @@
{
+ (#1#2 - \c_four) / \c_nine * \c_two
\exp_after:wN \@@_trigd_large_auxiii:www
- \int_use:N \__int_eval:w #1#2
+ \__int_value:w \__int_eval:w #1#2
- (#1#2 - \c_four) / \c_nine * \c_nine \__int_eval_end: #3 ;
}
\cs_new:Npn \@@_trigd_large_auxiii:www #1; #2; #3!
@@ -665,8 +665,8 @@
\cs_new:Npn \@@_trig_large:ww #1, #2#3#4#5#6;
{
\exp_after:wN \@@_trig_large_auxi:wwwwww
- \int_use:N \__int_eval:w (#1 - 32) / 64 \exp_after:wN ,
- \int_use:N \__int_eval:w (#1 - 4) / 8 \exp_after:wN ,
+ \__int_value:w \__int_eval:w (#1 - 32) / 64 \exp_after:wN ,
+ \__int_value:w \__int_eval:w (#1 - 4) / 8 \exp_after:wN ,
\__int_value:w #1 \@@_trig_inverse_two_pi: ;
{#2}{#3}{#4}{#5} ;
}
@@ -716,7 +716,7 @@
{
\exp_after:wN \@@_use_i_until_s:nw
\exp_after:wN \@@_trig_large_auxvii:w
- \int_use:N \__int_eval:w \c_@@_leading_shift_int
+ \__int_value:w \__int_eval:w \c_@@_leading_shift_int
\prg_replicate:nn { \c_thirteen }
{ \@@_trig_large_auxvi:wnnnnnnnn }
+ \c_@@_trailing_shift_int - \c_@@_middle_shift_int
@@ -726,7 +726,7 @@
\cs_new:Npn \@@_trig_large_auxvi:wnnnnnnnn #1; #2#3#4#5#6#7#8#9
{
\exp_after:wN \@@_trig_large_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_middle_shift_int
+ #2*#9 + #3*#8 + #4*#7 + #5*#6
#1; {#2}{#3}{#4}{#5} {#7}{#8}{#9}
}
@@ -764,7 +764,7 @@
\cs_new:Npn \@@_trig_large_auxvii:w #1#2#3
{
\exp_after:wN \@@_trig_large_auxviii:ww
- \int_use:N \__int_eval:w (#1#2#3 - 62) / 125 ;
+ \__int_value:w \__int_eval:w (#1#2#3 - 62) / 125 ;
#1#2#3
}
\cs_new:Npn \@@_trig_large_auxviii:ww #1;
@@ -782,7 +782,7 @@
{
\exp_after:wN \@@_use_i_until_s:nw
\exp_after:wN \@@_trig_large_auxxi:w
- \int_use:N \__int_eval:w \c_@@_leading_shift_int
+ \__int_value:w \__int_eval:w \c_@@_leading_shift_int
\prg_replicate:nn { \c_thirteen }
{ \@@_trig_large_auxx:wNNNNN }
+ \c_@@_trailing_shift_int - \c_@@_middle_shift_int
@@ -791,14 +791,14 @@
\cs_new:Npn \@@_trig_large_auxx:wNNNNN #1; #2 #3#4#5#6
{
\exp_after:wN \@@_trig_large_pack:NNNNNw
- \int_use:N \__int_eval:w \c_@@_middle_shift_int
+ \__int_value:w \__int_eval:w \c_@@_middle_shift_int
#2 \c_eight * #3#4#5#6
#1; #2
}
\cs_new:Npn \@@_trig_large_auxxi:w #1;
{
\exp_after:wN \@@_ep_mul_raw:wwwwN
- \int_use:N \__int_eval:w \c_zero \@@_ep_to_ep_loop:N #1 ; ; !
+ \__int_value:w \__int_eval:w \c_zero \@@_ep_to_ep_loop:N #1 ; ; !
0,{7853}{9816}{3397}{4483}{0961}{5661};
\@@_trig_small:ww
}
@@ -889,7 +889,7 @@
{
\exp_after:wN \@@_sanitize:Nw
\exp_after:wN #2
- \int_use:N \__int_eval:w #1
+ \__int_value:w \__int_eval:w #1
}
#2
}
@@ -968,7 +968,7 @@
{
\exp_after:wN \@@_sanitize:Nw
\exp_after:wN #1
- \int_use:N \__int_eval:w \@@_ep_to_float:wwN
+ \__int_value:w \__int_eval:w \@@_ep_to_float:wwN
}
#1
}
@@ -1134,7 +1134,7 @@
{
\exp_after:wN \@@_atan_combine_o:NwwwwwN
\exp_after:wN #2
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\if_meaning:w 2 #5 \c_seven - \fi: #3 \exp_after:wN ;
\c_@@_one_fixed_tl ;
{0000}{0000}{0000}{0000}{0000}{0000};
@@ -1181,7 +1181,7 @@
{
\exp_after:wN \@@_atan_combine_o:NwwwwwN
\exp_after:wN #1
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\if_meaning:w 2 #4
\c_seven - \__int_eval:w
\fi:
@@ -1279,7 +1279,7 @@
\@@_rrot:www \@@_fixed_mul_sub_back:wwwn #2; #3;
{
\exp_after:wN \@@_atan_Taylor_loop:www
- \int_use:N \__int_eval:w #1 - \c_two ;
+ \__int_value:w \__int_eval:w #1 - \c_two ;
}
#3;
}
@@ -1318,7 +1318,7 @@
{
\exp_after:wN \@@_sanitize:Nw
\exp_after:wN #1
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\if_meaning:w 0 #2
\exp_after:wN \use_i:nn
\else:
@@ -1329,7 +1329,7 @@
\@@_fixed_mul:wwn #3; #4;
{
\exp_after:wN \@@_atan_combine_aux:ww
- \int_use:N \__int_eval:w #2 / \c_two ; #2;
+ \__int_value:w \__int_eval:w #2 / \c_two ; #2;
}
}
{ #7 \@@_fixed_to_float:wN \@@_fixed_to_float_rad:wN }
diff --git a/l3kernel/l3int.dtx b/l3kernel/l3int.dtx
index 197686b..a671664 100644
--- a/l3kernel/l3int.dtx
+++ b/l3kernel/l3int.dtx
@@ -1038,7 +1038,7 @@
\cs_new:Npn \int_abs:n #1
{
\@@_value:w \exp_after:wN \@@_abs:N
- \int_use:N \@@_eval:w #1 \@@_eval_end:
+ \@@_value:w \@@_eval:w #1 \@@_eval_end:
\exp_stop_f:
}
\cs_new:Npn \@@_abs:N #1
@@ -1046,16 +1046,16 @@
\cs_set:Npn \int_max:nn #1#2
{
\@@_value:w \exp_after:wN \@@_maxmin:wwN
- \int_use:N \@@_eval:w #1 \exp_after:wN ;
- \int_use:N \@@_eval:w #2 ;
+ \@@_value:w \@@_eval:w #1 \exp_after:wN ;
+ \@@_value:w \@@_eval:w #2 ;
>
\exp_stop_f:
}
\cs_set:Npn \int_min:nn #1#2
{
\@@_value:w \exp_after:wN \@@_maxmin:wwN
- \int_use:N \@@_eval:w #1 \exp_after:wN ;
- \int_use:N \@@_eval:w #2 ;
+ \@@_value:w \@@_eval:w #1 \exp_after:wN ;
+ \@@_value:w \@@_eval:w #2 ;
<
\exp_stop_f:
}
@@ -1097,10 +1097,10 @@
% \begin{macrocode}
\cs_new:Npn \int_div_truncate:nn #1#2
{
- \int_use:N \@@_eval:w
+ \@@_value:w \@@_eval:w
\exp_after:wN \@@_div_truncate:NwNw
- \int_use:N \@@_eval:w #1 \exp_after:wN ;
- \int_use:N \@@_eval:w #2 ;
+ \@@_value:w \@@_eval:w #1 \exp_after:wN ;
+ \@@_value:w \@@_eval:w #2 ;
\@@_eval_end:
}
\cs_new:Npn \@@_div_truncate:NwNw #1#2; #3#4;
@@ -1439,7 +1439,7 @@
\prg_new_conditional:Npnn \int_compare:n #1 { p , T , F , TF }
{
\exp_after:wN \@@_compare:w
- \int_use:N \@@_eval:w #1 \__prg_compare_error:
+ \@@_value:w \@@_eval:w #1 \__prg_compare_error:
}
\cs_new:Npn \@@_compare:w #1 \__prg_compare_error:
{
@@ -1721,9 +1721,9 @@
\cs_new:Npn \int_step_function:nnnN #1#2#3
{
\exp_after:wN \@@_step:wwwN
- \int_use:N \@@_eval:w #1 \exp_after:wN ;
- \int_use:N \@@_eval:w #2 \exp_after:wN ;
- \int_use:N \@@_eval:w #3 ;
+ \@@_value:w \@@_eval:w #1 \exp_after:wN ;
+ \@@_value:w \@@_eval:w #2 \exp_after:wN ;
+ \@@_value:w \@@_eval:w #3 ;
}
\cs_new:Npn \@@_step:wwwN #1; #2; #3; #4
{
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 914bdba..29cf004 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -1024,7 +1024,7 @@
\cs_new:Npn \@@_item:nn #1#2
{
\exp_after:wN \@@_item:w
- \int_use:N \__int_eval:w #2 \exp_after:wN ;
+ \__int_value:w \__int_eval:w #2 \exp_after:wN ;
\__int_value:w \@@_count:n {#1} ;
#1 \q_stop
}
@@ -1037,7 +1037,7 @@
{
\exp_after:wN \use_i_delimit_by_q_stop:nw
\exp:w \exp_after:wN \@@_skip_exp_end:w
- \int_use:N \__int_eval:w #1 + #2 ;
+ \__int_value:w \__int_eval:w #1 + #2 ;
}
}
{
@@ -1076,12 +1076,12 @@
\exp_after:wN \@@_skip_loop:wNNNNNNNN
\else:
\exp_after:wN \@@_skip_end:w
- \int_use:N \__int_eval:w
+ \__int_value:w \__int_eval:w
\fi:
#1 ;
}
\cs_new:Npn \@@_skip_loop:wNNNNNNNN #1; #2#3#4#5#6#7#8#9
- { \exp_after:wN \@@_skip_exp_end:w \int_use:N \__int_eval:w #1 - \c_eight ; }
+ { \exp_after:wN \@@_skip_exp_end:w \__int_value:w \__int_eval:w #1 - \c_eight ; }
\cs_new:Npn \@@_skip_end:w #1 ;
{
\exp_after:wN \@@_skip_end:NNNNNNNN
@@ -1121,8 +1121,8 @@
{
\exp_after:wN \@@_range:w
\__int_value:w \@@_count:n {#1} \exp_after:wN ;
- \int_use:N \__int_eval:w #2 - \c_one \exp_after:wN ;
- \int_use:N \__int_eval:w #3 ;
+ \__int_value:w \__int_eval:w #2 - \c_one \exp_after:wN ;
+ \__int_value:w \__int_eval:w #3 ;
#1 \q_stop
}
\cs_new:Npn \@@_range:w #1; #2; #3;
@@ -1134,7 +1134,7 @@
\cs_new:Npn \@@_range:nnw #1#2
{
\exp_after:wN \@@_collect_delimit_by_q_stop:w
- \int_use:N \__int_eval:w #2 - #1 \exp_after:wN ;
+ \__int_value:w \__int_eval:w #2 - #1 \exp_after:wN ;
\exp:w \@@_skip_exp_end:w #1 ;
}
% \end{macrocode}
@@ -1200,7 +1200,7 @@
\cs_new:Npn \@@_collect_loop:wnNNNNNNN #1; #2 #3#4#5#6#7#8#9
{
\exp_after:wN \@@_collect_loop:wn
- \int_use:N \__int_eval:w #1 - \c_seven ;
+ \__int_value:w \__int_eval:w #1 - \c_seven ;
{ #2 #3#4#5#6#7#8#9 }
}
\cs_new:Npn \@@_collect_end:wn #1 ;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list