[latex3-commits] [git/LaTeX3-latex3-latex3] master: Rename _fast intarray functions to __kernel, omit \int_eval:n in them (d1095f9)
Bruno Le Floch
bruno at le-floch.fr
Sun Apr 1 20:58:56 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/d1095f9c97e38e5b0d2f944649596445f8a006dd
>---------------------------------------------------------------
commit d1095f9c97e38e5b0d2f944649596445f8a006dd
Author: Bruno Le Floch <bruno at le-floch.fr>
Date: Sat Mar 31 16:01:37 2018 -0400
Rename _fast intarray functions to __kernel, omit \int_eval:n in them
>---------------------------------------------------------------
d1095f9c97e38e5b0d2f944649596445f8a006dd
l3kernel/l3intarray.dtx | 54 +++++++++++----------
l3kernel/l3regex.dtx | 80 +++++++++++++++----------------
l3kernel/testfiles/m3expl001.luatex.tlg | 4 +-
l3kernel/testfiles/m3expl001.ptex.tlg | 4 +-
l3kernel/testfiles/m3expl001.tlg | 4 +-
l3kernel/testfiles/m3expl001.uptex.tlg | 4 +-
l3kernel/testfiles/m3expl001.xetex.tlg | 4 +-
l3kernel/testfiles/m3expl003.luatex.tlg | 4 +-
l3kernel/testfiles/m3expl003.ptex.tlg | 4 +-
l3kernel/testfiles/m3expl003.tlg | 4 +-
l3kernel/testfiles/m3expl003.uptex.tlg | 4 +-
l3kernel/testfiles/m3expl003.xetex.tlg | 4 +-
l3kernel/testfiles/m3intarray001.lvt | 24 +++++-----
13 files changed, 100 insertions(+), 98 deletions(-)
diff --git a/l3kernel/l3intarray.dtx b/l3kernel/l3intarray.dtx
index d5128f6..f0464be 100644
--- a/l3kernel/l3intarray.dtx
+++ b/l3kernel/l3intarray.dtx
@@ -80,30 +80,26 @@
% Contrarily to \cs{seq_count:N} this is performed in constant time.
% \end{function}
%
-% \begin{function}{\intarray_gset:Nnn, \intarray_gset_fast:Nnn}
+% \begin{function}{\intarray_gset:Nnn}
% \begin{syntax}
% \cs{intarray_gset:Nnn} \meta{intarray~var} \Arg{position} \Arg{value}
-% \cs{intarray_gset_fast:Nnn} \meta{intarray~var} \Arg{position} \Arg{value}
% \end{syntax}
% Stores the result of evaluating the integer expression \meta{value}
% into the \meta{integer array variable} at the (integer expression)
-% \meta{position}. While \cs{intarray_gset:Nnn} checks that the
-% \meta{position} is between $1$ and the \cs{intarray_count:N} and that
-% the \meta{value}'s absolute value is at most $2^{30}-1$, the
-% \enquote{fast} function performs no such bound check.
-% Assignments are always global.
+% \meta{position}. If the \meta{position} is not between $1$ and the
+% \cs{intarray_count:N}, or the \meta{value}'s absolute value is
+% bigger than $2^{30}-1$, an error occurs. Assignments are always
+% global.
% \end{function}
%
-% \begin{function}[EXP]{\intarray_item:Nn, \intarray_item_fast:Nn}
+% \begin{function}[EXP]{\intarray_item:Nn}
% \begin{syntax}
% \cs{intarray_item:Nn} \meta{intarray~var} \Arg{position}
-% \cs{intarray_item_fast:Nn} \meta{intarray~var} \Arg{position}
% \end{syntax}
% Expands to the integer entry stored at the (integer expression)
-% \meta{position} in the \meta{integer array variable}. While
-% \cs{intarray_item:Nn} checks that the \meta{position} is between $1$
-% and the \cs{intarray_count:N}, the \enquote{fast} function performs
-% no such bound check.
+% \meta{position} in the \meta{integer array variable}. If the
+% \meta{position} is not between $1$ and the \cs{intarray_count:N}, an
+% error occurs.
% \end{function}
%
% \subsection{Implementation notes}
@@ -184,13 +180,16 @@
%
% \subsection{Array items}
%
-% \begin{macro}{\intarray_gset:Nnn, \intarray_gset_fast:Nnn}
+% \begin{macro}{\intarray_gset:Nnn, \__kernel_intarray_gset:Nnn}
% \begin{macro}{\@@_gset:Nnn}
-% Set the appropriate \tn{fontdimen}. The slow version checks the
-% position and value are within bounds.
+% Set the appropriate \tn{fontdimen}. The
+% \cs{__kernel_intarray_gset:Nnn} function does not use
+% \cs{int_eval:n}, namely its arguments must be suitable for
+% \cs{int_value:w}. The user version checks the position and value
+% are within bounds.
% \begin{macrocode}
-\cs_new_protected:Npn \intarray_gset_fast:Nnn #1#2#3
- { \tex_fontdimen:D \int_eval:n {#2} #1 = \int_eval:n {#3} \c_@@_sp_dim }
+\cs_new_protected:Npn \__kernel_intarray_gset:Nnn #1#2#3
+ { \tex_fontdimen:D #2 #1 #3 \c_@@_sp_dim }
\cs_new_protected:Npn \intarray_gset:Nnn #1#2#3
{
\exp_args:Nff \@@_gset:Nnn #1
@@ -205,10 +204,10 @@
\__kernel_msg_error:nnxxxx { kernel } { overflow }
{ \token_to_str:N #1 } {#2} {#3}
{ \int_compare:nNnT {#3} < 0 { - } \int_value:w \c_max_dim }
- \intarray_gset_fast:Nnn #1 {#2}
- { \int_compare:nNnT {#3} < 0 { - } \c_max_dim }
+ \__kernel_intarray_gset:Nnn #1 {#2}
+ { \int_value:w \int_compare:nNnT {#3} < 0 { - } \c_max_dim }
}
- { \intarray_gset_fast:Nnn #1 {#2} {#3} }
+ { \__kernel_intarray_gset:Nnn #1 {#2} {#3} }
}
{
\__kernel_msg_error:nnxxx { kernel } { out-of-bounds }
@@ -219,18 +218,21 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}[EXP]{\intarray_item:Nn, \intarray_item_fast:Nn}
+% \begin{macro}[EXP]{\intarray_item:Nn, \__kernel_intarray_item:Nn}
% \begin{macro}{\@@_item:Nn}
-% Get the appropriate \tn{fontdimen} and perform bound checks if requested.
+% Get the appropriate \tn{fontdimen} and perform bound checks. The
+% \cs{__kernel_intarray_item:Nn} function omits bound checks and omits
+% \cs{int_eval:n}, namely its argument must be a \TeX{} integer
+% suitable for \cs{int_value:w}.
% \begin{macrocode}
-\cs_new:Npn \intarray_item_fast:Nn #1#2
- { \int_eval:n { \tex_fontdimen:D \int_eval:n {#2} #1 } }
+\cs_new:Npn \__kernel_intarray_item:Nn #1#2
+ { \int_value:w \tex_fontdimen:D #2 #1 }
\cs_new:Npn \intarray_item:Nn #1#2
{ \exp_args:Nf \@@_item:Nn #1 { \int_eval:n {#2} } }
\cs_new:Npn \@@_item:Nn #1#2
{
\int_compare:nTF { 1 <= #2 <= \intarray_count:N #1 }
- { \intarray_item_fast:Nn #1 {#2} }
+ { \__kernel_intarray_item:Nn #1 {#2} }
{
\__kernel_msg_expandable_error:nnnnn { kernel } { out-of-bounds }
{ \token_to_str:N #1 } {#2} { \intarray_count:N #1 }
diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index 6faf998..f39cae8 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -4569,7 +4569,7 @@
\bool_gset_false:N \g_@@_success_bool
\int_step_inline:nnnn
\l_@@_min_state_int { 1 } { \l_@@_max_state_int - 1 }
- { \intarray_gset_fast:Nnn \g_@@_state_active_intarray {##1} { 1 } }
+ { \__kernel_intarray_gset:Nnn \g_@@_state_active_intarray {##1} { 1 } }
\int_set_eq:NN \l_@@_min_active_int \l_@@_max_state_int
\int_zero:N \l_@@_step_int
\int_set_eq:NN \l_@@_success_pos_int \l_@@_min_pos_int
@@ -4684,7 +4684,7 @@
\cs_new:Npn \@@_match_one_active:n #1
{
\@@_use_state_and_submatches:nn
- { \intarray_item_fast:Nn \g_@@_thread_state_intarray {#1} }
+ { \__kernel_intarray_item:Nn \g_@@_thread_state_intarray {#1} }
{ \@@_toks_use:w #1 }
}
% \end{macrocode}
@@ -4700,11 +4700,11 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_query_set:nnn #1#2#3
{
- \intarray_gset_fast:Nnn \g_@@_charcode_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_charcode_intarray
{ \l_@@_curr_pos_int } {#3}
- \intarray_gset_fast:Nnn \g_@@_catcode_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_catcode_intarray
{ \l_@@_curr_pos_int } {#2}
- \intarray_gset_fast:Nnn \g_@@_balance_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_balance_intarray
{ \l_@@_curr_pos_int } { \l_@@_balance_int }
\@@_toks_set:Nn \l_@@_curr_pos_int {#1}
\int_incr:N \l_@@_curr_pos_int
@@ -4723,10 +4723,10 @@
\cs_new_protected:Npn \@@_query_get:
{
\l_@@_curr_char_int
- = \intarray_item_fast:Nn \g_@@_charcode_intarray
+ = \__kernel_intarray_item:Nn \g_@@_charcode_intarray
{ \l_@@_curr_pos_int } \scan_stop:
\l_@@_curr_catcode_int
- = \intarray_item_fast:Nn \g_@@_catcode_intarray
+ = \__kernel_intarray_item:Nn \g_@@_catcode_intarray
{ \l_@@_curr_pos_int } \scan_stop:
}
% \end{macrocode}
@@ -4747,11 +4747,11 @@
{ }
\cs_new_protected:Npn \@@_use_state:
{
- \intarray_gset_fast:Nnn \g_@@_state_active_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_state_active_intarray
{ \l_@@_curr_state_int } { \l_@@_step_int }
\@@_toks_use:w \l_@@_curr_state_int
- \intarray_gset_fast:Nnn \g_@@_state_active_intarray
- { \l_@@_curr_state_int } { \l_@@_step_int + 1 }
+ \__kernel_intarray_gset:Nnn \g_@@_state_active_intarray
+ { \l_@@_curr_state_int } { \int_eval:n { \l_@@_step_int + 1 } }
}
% \end{macrocode}
% \end{macro}
@@ -4766,7 +4766,7 @@
{
\int_set:Nn \l_@@_curr_state_int {#1}
\if_int_compare:w
- \intarray_item_fast:Nn \g_@@_state_active_intarray
+ \__kernel_intarray_item:Nn \g_@@_state_active_intarray
{ \l_@@_curr_state_int }
< \l_@@_step_int
\tl_set:Nn \l_@@_curr_submatches_prop {#2}
@@ -4823,7 +4823,7 @@
\exp_not:n
{
\if_int_compare:w
- \intarray_item_fast:Nn \g_@@_state_active_intarray
+ \__kernel_intarray_item:Nn \g_@@_state_active_intarray
{ \l_@@_curr_state_int }
#1
\exp_after:wN \@@_use_state:
@@ -4862,7 +4862,7 @@
\cs_new_protected:Npn \@@_store_state:n #1
{
\@@_store_submatches:
- \intarray_gset_fast:Nnn \g_@@_thread_state_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_thread_state_intarray
{ \l_@@_max_active_int } {#1}
\int_incr:N \l_@@_max_active_int
}
@@ -4992,8 +4992,8 @@
\cs_new:Npn \@@_replacement_do_one_match:n #1
{
\@@_query_range:nn
- { \intarray_item_fast:Nn \g_@@_submatch_prev_intarray {#1} }
- { \intarray_item_fast:Nn \g_@@_submatch_begin_intarray {#1} }
+ { \__kernel_intarray_item:Nn \g_@@_submatch_prev_intarray {#1} }
+ { \__kernel_intarray_item:Nn \g_@@_submatch_begin_intarray {#1} }
}
% \end{macrocode}
% \end{macro}
@@ -5053,8 +5053,8 @@
\cs_new:Npn \@@_query_submatch:n #1
{
\@@_query_range:nn
- { \intarray_item_fast:Nn \g_@@_submatch_begin_intarray {#1} }
- { \intarray_item_fast:Nn \g_@@_submatch_end_intarray {#1} }
+ { \__kernel_intarray_item:Nn \g_@@_submatch_begin_intarray {#1} }
+ { \__kernel_intarray_item:Nn \g_@@_submatch_end_intarray {#1} }
}
% \end{macrocode}
% \end{macro}
@@ -5073,19 +5073,19 @@
\int_eval:n
{
\int_compare:nNnTF
- { \intarray_item_fast:Nn \g_@@_submatch_end_intarray {#1} } = 0
+ { \__kernel_intarray_item:Nn \g_@@_submatch_end_intarray {#1} } = 0
{ 0 }
{
- \intarray_item_fast:Nn \g_@@_balance_intarray
- { \intarray_item_fast:Nn \g_@@_submatch_end_intarray {#1} }
+ \__kernel_intarray_item:Nn \g_@@_balance_intarray
+ { \__kernel_intarray_item:Nn \g_@@_submatch_end_intarray {#1} }
}
-
\int_compare:nNnTF
- { \intarray_item_fast:Nn \g_@@_submatch_begin_intarray {#1} } = 0
+ { \__kernel_intarray_item:Nn \g_@@_submatch_begin_intarray {#1} } = 0
{ 0 }
{
- \intarray_item_fast:Nn \g_@@_balance_intarray
- { \intarray_item_fast:Nn \g_@@_submatch_begin_intarray {#1} }
+ \__kernel_intarray_item:Nn \g_@@_balance_intarray
+ { \__kernel_intarray_item:Nn \g_@@_submatch_begin_intarray {#1} }
}
}
}
@@ -5154,8 +5154,8 @@
\cs_set:Npn \@@_replacement_do_one_match:n ##1
{
\@@_query_range:nn
- { \intarray_item_fast:Nn \g_@@_submatch_prev_intarray {##1} }
- { \intarray_item_fast:Nn \g_@@_submatch_begin_intarray {##1} }
+ { \__kernel_intarray_item:Nn \g_@@_submatch_prev_intarray {##1} }
+ { \__kernel_intarray_item:Nn \g_@@_submatch_begin_intarray {##1} }
#1
}
}
@@ -5228,7 +5228,7 @@
\cs_new_protected:Npn \@@_replacement_put_submatch:n #1
{
\if_int_compare:w #1 < \l_@@_capturing_group_int
- \tl_build_add:n { \@@_query_submatch:n { #1 + ##1 } }
+ \tl_build_add:n { \@@_query_submatch:n { \int_eval:n { #1 + ##1 } } }
\if_int_compare:w \l_@@_replacement_csnames_int = 0 \exp_stop_f:
\tl_put_right:Nn \l_@@_balance_tl
{
@@ -5897,15 +5897,15 @@
{
\if_int_compare:w \l_@@_start_pos_int < \l_@@_success_pos_int
\@@_extract:
- \intarray_gset_fast:Nnn \g_@@_submatch_prev_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_submatch_prev_intarray
{ \l_@@_zeroth_submatch_int } { 0 }
- \intarray_gset_fast:Nnn \g_@@_submatch_end_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_submatch_end_intarray
{ \l_@@_zeroth_submatch_int }
{
- \intarray_item_fast:Nn \g_@@_submatch_begin_intarray
+ \__kernel_intarray_item:Nn \g_@@_submatch_begin_intarray
{ \l_@@_zeroth_submatch_int }
}
- \intarray_gset_fast:Nnn \g_@@_submatch_begin_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_submatch_begin_intarray
{ \l_@@_zeroth_submatch_int }
{ \l_@@_start_pos_int }
\fi:
@@ -5913,12 +5913,12 @@
#1
\@@_match:n {#2}
%<assert>\assert_int:n { \l_@@_curr_pos_int = \l_@@_max_pos_int }
- \intarray_gset_fast:Nnn \g_@@_submatch_prev_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_submatch_prev_intarray
{ \l_@@_submatch_int } { 0 }
- \intarray_gset_fast:Nnn \g_@@_submatch_end_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_submatch_end_intarray
{ \l_@@_submatch_int }
{ \l_@@_max_pos_int }
- \intarray_gset_fast:Nnn \g_@@_submatch_begin_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_submatch_begin_intarray
{ \l_@@_submatch_int }
{ \l_@@_start_pos_int }
\int_incr:N \l_@@_submatch_int
@@ -6022,11 +6022,11 @@
\int_set_eq:NN \l_@@_zeroth_submatch_int \l_@@_submatch_int
\prg_replicate:nn \l_@@_capturing_group_int
{
- \intarray_gset_fast:Nnn \g_@@_submatch_begin_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_submatch_begin_intarray
{ \l_@@_submatch_int } { 0 }
- \intarray_gset_fast:Nnn \g_@@_submatch_end_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_submatch_end_intarray
{ \l_@@_submatch_int } { 0 }
- \intarray_gset_fast:Nnn \g_@@_submatch_prev_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_submatch_prev_intarray
{ \l_@@_submatch_int } { 0 }
\int_incr:N \l_@@_submatch_int
}
@@ -6039,14 +6039,14 @@
\fi:
\@@_int_eval:w \l_@@_zeroth_submatch_int + ##1 {##2}
}
- \intarray_gset_fast:Nnn \g_@@_submatch_prev_intarray
+ \__kernel_intarray_gset:Nnn \g_@@_submatch_prev_intarray
{ \l_@@_zeroth_submatch_int } { \l_@@_start_pos_int }
\fi:
}
\cs_new_protected:Npn \@@_extract_b:wn #1 < #2
- { \intarray_gset_fast:Nnn \g_@@_submatch_begin_intarray {#1} {#2} }
+ { \__kernel_intarray_gset:Nnn \g_@@_submatch_begin_intarray {#1} {#2} }
\cs_new_protected:Npn \@@_extract_e:wn #1 > #2
- { \intarray_gset_fast:Nnn \g_@@_submatch_end_intarray {#1} {#2} }
+ { \__kernel_intarray_gset:Nnn \g_@@_submatch_end_intarray {#1} {#2} }
% \end{macrocode}
% \end{macro}
%
@@ -6087,7 +6087,7 @@
\@@_replacement_do_one_match:n { \l_@@_zeroth_submatch_int }
\@@_query_range:nn
{
- \intarray_item_fast:Nn \g_@@_submatch_end_intarray
+ \__kernel_intarray_item:Nn \g_@@_submatch_end_intarray
{ \l_@@_zeroth_submatch_int }
}
{ \l_@@_max_pos_int }
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index be4c29f..177d2a4 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -4611,10 +4611,10 @@ Defining \g__intarray_font_int on line ...
\g__intarray_font_int=\count...
Defining \intarray_new:Nn on line ...
Defining \intarray_count:N on line ...
-Defining \intarray_gset_fast:Nnn on line ...
+Defining \__kernel_intarray_gset:Nnn on line ...
Defining \intarray_gset:Nnn on line ...
Defining \__intarray_gset:Nnn on line ...
-Defining \intarray_item_fast:Nn on line ...
+Defining \__kernel_intarray_item:Nn on line ...
Defining \intarray_item:Nn on line ...
Defining \__intarray_item:Nn on line ...
Defining \l__sort_length_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 0ef3097..8e757a3 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -4548,10 +4548,10 @@ Defining \g__intarray_font_int on line ...
\g__intarray_font_int=\count...
Defining \intarray_new:Nn on line ...
Defining \intarray_count:N on line ...
-Defining \intarray_gset_fast:Nnn on line ...
+Defining \__kernel_intarray_gset:Nnn on line ...
Defining \intarray_gset:Nnn on line ...
Defining \__intarray_gset:Nnn on line ...
-Defining \intarray_item_fast:Nn on line ...
+Defining \__kernel_intarray_item:Nn on line ...
Defining \intarray_item:Nn on line ...
Defining \__intarray_item:Nn on line ...
Defining \l__sort_length_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index aa8fc8b..3205a1e 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -4548,10 +4548,10 @@ Defining \g__intarray_font_int on line ...
\g__intarray_font_int=\count...
Defining \intarray_new:Nn on line ...
Defining \intarray_count:N on line ...
-Defining \intarray_gset_fast:Nnn on line ...
+Defining \__kernel_intarray_gset:Nnn on line ...
Defining \intarray_gset:Nnn on line ...
Defining \__intarray_gset:Nnn on line ...
-Defining \intarray_item_fast:Nn on line ...
+Defining \__kernel_intarray_item:Nn on line ...
Defining \intarray_item:Nn on line ...
Defining \__intarray_item:Nn on line ...
Defining \l__sort_length_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 1b04e4b..0ad53ce 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -4548,10 +4548,10 @@ Defining \g__intarray_font_int on line ...
\g__intarray_font_int=\count...
Defining \intarray_new:Nn on line ...
Defining \intarray_count:N on line ...
-Defining \intarray_gset_fast:Nnn on line ...
+Defining \__kernel_intarray_gset:Nnn on line ...
Defining \intarray_gset:Nnn on line ...
Defining \__intarray_gset:Nnn on line ...
-Defining \intarray_item_fast:Nn on line ...
+Defining \__kernel_intarray_item:Nn on line ...
Defining \intarray_item:Nn on line ...
Defining \__intarray_item:Nn on line ...
Defining \l__sort_length_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index e37b037..32e17f3 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -4588,10 +4588,10 @@ Defining \g__intarray_font_int on line ...
\g__intarray_font_int=\count...
Defining \intarray_new:Nn on line ...
Defining \intarray_count:N on line ...
-Defining \intarray_gset_fast:Nnn on line ...
+Defining \__kernel_intarray_gset:Nnn on line ...
Defining \intarray_gset:Nnn on line ...
Defining \__intarray_gset:Nnn on line ...
-Defining \intarray_item_fast:Nn on line ...
+Defining \__kernel_intarray_item:Nn on line ...
Defining \intarray_item:Nn on line ...
Defining \__intarray_item:Nn on line ...
Defining \l__sort_length_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index be4c29f..177d2a4 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -4611,10 +4611,10 @@ Defining \g__intarray_font_int on line ...
\g__intarray_font_int=\count...
Defining \intarray_new:Nn on line ...
Defining \intarray_count:N on line ...
-Defining \intarray_gset_fast:Nnn on line ...
+Defining \__kernel_intarray_gset:Nnn on line ...
Defining \intarray_gset:Nnn on line ...
Defining \__intarray_gset:Nnn on line ...
-Defining \intarray_item_fast:Nn on line ...
+Defining \__kernel_intarray_item:Nn on line ...
Defining \intarray_item:Nn on line ...
Defining \__intarray_item:Nn on line ...
Defining \l__sort_length_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 0ef3097..8e757a3 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -4548,10 +4548,10 @@ Defining \g__intarray_font_int on line ...
\g__intarray_font_int=\count...
Defining \intarray_new:Nn on line ...
Defining \intarray_count:N on line ...
-Defining \intarray_gset_fast:Nnn on line ...
+Defining \__kernel_intarray_gset:Nnn on line ...
Defining \intarray_gset:Nnn on line ...
Defining \__intarray_gset:Nnn on line ...
-Defining \intarray_item_fast:Nn on line ...
+Defining \__kernel_intarray_item:Nn on line ...
Defining \intarray_item:Nn on line ...
Defining \__intarray_item:Nn on line ...
Defining \l__sort_length_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index aa8fc8b..3205a1e 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -4548,10 +4548,10 @@ Defining \g__intarray_font_int on line ...
\g__intarray_font_int=\count...
Defining \intarray_new:Nn on line ...
Defining \intarray_count:N on line ...
-Defining \intarray_gset_fast:Nnn on line ...
+Defining \__kernel_intarray_gset:Nnn on line ...
Defining \intarray_gset:Nnn on line ...
Defining \__intarray_gset:Nnn on line ...
-Defining \intarray_item_fast:Nn on line ...
+Defining \__kernel_intarray_item:Nn on line ...
Defining \intarray_item:Nn on line ...
Defining \__intarray_item:Nn on line ...
Defining \l__sort_length_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 1b04e4b..0ad53ce 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -4548,10 +4548,10 @@ Defining \g__intarray_font_int on line ...
\g__intarray_font_int=\count...
Defining \intarray_new:Nn on line ...
Defining \intarray_count:N on line ...
-Defining \intarray_gset_fast:Nnn on line ...
+Defining \__kernel_intarray_gset:Nnn on line ...
Defining \intarray_gset:Nnn on line ...
Defining \__intarray_gset:Nnn on line ...
-Defining \intarray_item_fast:Nn on line ...
+Defining \__kernel_intarray_item:Nn on line ...
Defining \intarray_item:Nn on line ...
Defining \__intarray_item:Nn on line ...
Defining \l__sort_length_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index e37b037..32e17f3 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -4588,10 +4588,10 @@ Defining \g__intarray_font_int on line ...
\g__intarray_font_int=\count...
Defining \intarray_new:Nn on line ...
Defining \intarray_count:N on line ...
-Defining \intarray_gset_fast:Nnn on line ...
+Defining \__kernel_intarray_gset:Nnn on line ...
Defining \intarray_gset:Nnn on line ...
Defining \__intarray_gset:Nnn on line ...
-Defining \intarray_item_fast:Nn on line ...
+Defining \__kernel_intarray_item:Nn on line ...
Defining \intarray_item:Nn on line ...
Defining \__intarray_item:Nn on line ...
Defining \l__sort_length_int on line ...
diff --git a/l3kernel/testfiles/m3intarray001.lvt b/l3kernel/testfiles/m3intarray001.lvt
index 9746c4a..a21c6a8 100644
--- a/l3kernel/testfiles/m3intarray001.lvt
+++ b/l3kernel/testfiles/m3intarray001.lvt
@@ -49,20 +49,20 @@
{
\intarray_new:Nn \l_tmpb_intarray { 15 }
\group_begin:
- \intarray_gset_fast:Nnn \l_tmpb_intarray { 0 } { 2000000000 }
- \intarray_gset_fast:Nnn \l_tmpb_intarray { 1 } { -2000000000 }
- \intarray_gset_fast:Nnn \l_tmpb_intarray { 16 } { 123456 }
+ \__kernel_intarray_gset:Nnn \l_tmpb_intarray { 0 } { 2000000000 }
+ \__kernel_intarray_gset:Nnn \l_tmpb_intarray { 1 } { -2000000000 }
+ \__kernel_intarray_gset:Nnn \l_tmpb_intarray { 16 } { 123456 }
\group_end:
- \TYPE { \intarray_item_fast:Nn \l_tmpb_intarray { 0 } }
- \TYPE { \intarray_item_fast:Nn \l_tmpb_intarray { 1 } }
- \TYPE { \intarray_item_fast:Nn \l_tmpb_intarray { 15 } }
- \TYPE { \intarray_item_fast:Nn \l_tmpb_intarray { 16 } }
- \TYPE { \intarray_item_fast:Nn \l_tmpb_intarray { 17 } }
- \intarray_gset_fast:Nnn \l_tmpb_intarray { 17 } { 1234567 }
- \TYPE { \intarray_item_fast:Nn \l_tmpb_intarray { 17 } }
+ \TYPE { \__kernel_intarray_item:Nn \l_tmpb_intarray { 0 } }
+ \TYPE { \__kernel_intarray_item:Nn \l_tmpb_intarray { 1 } }
+ \TYPE { \__kernel_intarray_item:Nn \l_tmpb_intarray { 15 } }
+ \TYPE { \__kernel_intarray_item:Nn \l_tmpb_intarray { 16 } }
+ \TYPE { \__kernel_intarray_item:Nn \l_tmpb_intarray { 17 } }
+ \__kernel_intarray_gset:Nnn \l_tmpb_intarray { 17 } { 1234567 }
+ \TYPE { \__kernel_intarray_item:Nn \l_tmpb_intarray { 17 } }
\intarray_new:Nn \l_tmpc_intarray { -1 }
- \intarray_gset_fast:Nnn \l_tmpb_intarray { 18 } { 12345678 }
- \TYPE { \intarray_item_fast:Nn \l_tmpb_intarray { 18 } }
+ \__kernel_intarray_gset:Nnn \l_tmpb_intarray { 18 } { 12345678 }
+ \TYPE { \__kernel_intarray_item:Nn \l_tmpb_intarray { 18 } }
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
More information about the latex3-commits
mailing list