[latex3-commits] [git/LaTeX3-latex3-latex3] master: Replace some _tmp_ variables by _internal_ (59d947b)
Bruno Le Floch
bruno at le-floch.fr
Sun Sep 23 11:40:35 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/59d947b5e1182826c59eefeeaa90c2281949922c
>---------------------------------------------------------------
commit 59d947b5e1182826c59eefeeaa90c2281949922c
Author: Bruno Le Floch <bruno at le-floch.fr>
Date: Sun Sep 23 11:40:35 2018 +0200
Replace some _tmp_ variables by _internal_
>---------------------------------------------------------------
59d947b5e1182826c59eefeeaa90c2281949922c
l3kernel/l3file.dtx | 40 +++++++++++++++++--------------
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 ++--
11 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index ecacb84..fa1f3e9 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -667,6 +667,13 @@
%
% \subsubsection{Variables and constants}
%
+% \begin{variable}{\l_@@_internal_tl}
+% Used as a short-term scratch variable.
+% \begin{macrocode}
+\tl_new:N \l_@@_internal_tl
+% \end{macrocode}
+% \end{variable}
+%
% \begin{variable}{\c_term_ior}
% Reading from the terminal (with a prompt) is done using a positive
% but non-existent stream number. Unlike writing, there is no concept
@@ -955,7 +962,6 @@
% \begin{macro}{\@@_map_inline:NNn}
% \begin{macro}{\@@_map_inline:NNNn}
% \begin{macro}{\@@_map_inline_loop:NNN}
-% \begin{variable}{\l_@@_internal_tl}
% Mapping to an input stream can be done on either a token or a string
% basis, hence the set up. Within that, there is a check to avoid reading
% past the end of a file, hence the two applications of \cs{ior_if_eof:N}.
@@ -988,9 +994,7 @@
\@@_map_inline_loop:NNN #1#2#3
}
}
-\tl_new:N \l_@@_internal_tl
% \end{macrocode}
-% \end{variable}
% \end{macro}
% \end{macro}
% \end{macro}
@@ -1865,6 +1869,13 @@
%
% \subsection{File operations}
%
+% \begin{variable}{\l_@@_internal_tl}
+% Used as a short-term scratch variable.
+% \begin{macrocode}
+\tl_new:N \l_@@_internal_tl
+% \end{macrocode}
+% \end{variable}
+%
% \begin{variable}{\g_@@_internal_ior}
% A reserved stream to test for file existence.
% \begin{macrocode}
@@ -1952,13 +1963,6 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_@@_tmp_tl}
-% Used as a short-term scratch variable.
-% \begin{macrocode}
-\tl_new:N \l_@@_tmp_tl
-% \end{macrocode}
-% \end{variable}
-%
% \begin{variable}{\l_@@_base_name_str, \l_@@_full_name_str}
% For storing the basename and full path whilst passing data internally.
% \begin{macrocode}
@@ -2007,14 +2011,14 @@
\group_begin:
\seq_map_inline:Nn \l_char_active_seq
{
- \tl_set:Nx \l_@@_tmp_tl { \iow_char:N ##1 }
- \char_set_active_eq:NN ##1 \l_@@_tmp_tl
+ \tl_set:Nx \l_@@_internal_tl { \iow_char:N ##1 }
+ \char_set_active_eq:NN ##1 \l_@@_internal_tl
}
- \tl_set:Nx \l_@@_tmp_tl {#1}
- \tl_set:Nx \l_@@_tmp_tl
- { \tl_to_str:N \l_@@_tmp_tl }
+ \tl_set:Nx \l_@@_internal_tl {#1}
+ \tl_set:Nx \l_@@_internal_tl
+ { \tl_to_str:N \l_@@_internal_tl }
\exp_args:NNNV \group_end:
- \str_set:Nn #2 \l_@@_tmp_tl
+ \str_set:Nn #2 \l_@@_internal_tl
}
\cs_new_protected:Npn \@@_name_quote:nN #1#2
{
@@ -2174,8 +2178,8 @@
%</package>
\cs_new_protected:Npn \@@_input_pop:
{
- \seq_gpop:NN \g_@@_stack_seq \l_@@_tmp_tl
- \exp_after:wN \@@_input_pop:nnn \l_@@_tmp_tl
+ \seq_gpop:NN \g_@@_stack_seq \l_@@_internal_tl
+ \exp_after:wN \@@_input_pop:nnn \l_@@_internal_tl
}
%<*package>
\cs_new_eq:NN \__kernel_file_input_pop: \__file_input_pop:
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index d8c1d1f..30a551a 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2706,6 +2706,7 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
Defining \l__ior_stream_tl on line ...
@@ -2746,7 +2747,6 @@ Defining \ior_str_map_inline:Nn on line ...
Defining \__ior_map_inline:NNn on line ...
Defining \__ior_map_inline:NNNn on line ...
Defining \__ior_map_inline_loop:NNN on line ...
-Defining \l__ior_internal_tl on line ...
Defining \c_log_iow on line ...
\c_log_iow=\count...
Defining \c_term_iow on line ...
@@ -2836,13 +2836,13 @@ Defining \__iow_wrap_end:n on line ...
Defining \__iow_wrap_store_do:n on line ...
Defining \__iow_wrap_trim:N on line ...
Defining \__iow_wrap_trim:w on line ...
+Defining \l__file_internal_tl on line ...
Defining \g__file_internal_ior on line ...
Defining \g_file_curr_dir_str on line ...
Defining \g_file_curr_ext_str on line ...
Defining \g_file_curr_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
-Defining \l__file_tmp_tl on line ...
Defining \l__file_base_name_str on line ...
Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 14bf510..444e540 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2999,6 +2999,7 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
Defining \l__ior_stream_tl on line ...
@@ -3039,7 +3040,6 @@ Defining \ior_str_map_inline:Nn on line ...
Defining \__ior_map_inline:NNn on line ...
Defining \__ior_map_inline:NNNn on line ...
Defining \__ior_map_inline_loop:NNN on line ...
-Defining \l__ior_internal_tl on line ...
Defining \c_log_iow on line ...
\c_log_iow=\count...
Defining \c_term_iow on line ...
@@ -3129,13 +3129,13 @@ Defining \__iow_wrap_end:n on line ...
Defining \__iow_wrap_store_do:n on line ...
Defining \__iow_wrap_trim:N on line ...
Defining \__iow_wrap_trim:w on line ...
+Defining \l__file_internal_tl on line ...
Defining \g__file_internal_ior on line ...
Defining \g_file_curr_dir_str on line ...
Defining \g_file_curr_ext_str on line ...
Defining \g_file_curr_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
-Defining \l__file_tmp_tl on line ...
Defining \l__file_base_name_str on line ...
Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 334e562..6121ab5 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2999,6 +2999,7 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
Defining \l__ior_stream_tl on line ...
@@ -3039,7 +3040,6 @@ Defining \ior_str_map_inline:Nn on line ...
Defining \__ior_map_inline:NNn on line ...
Defining \__ior_map_inline:NNNn on line ...
Defining \__ior_map_inline_loop:NNN on line ...
-Defining \l__ior_internal_tl on line ...
Defining \c_log_iow on line ...
\c_log_iow=\count...
Defining \c_term_iow on line ...
@@ -3129,13 +3129,13 @@ Defining \__iow_wrap_end:n on line ...
Defining \__iow_wrap_store_do:n on line ...
Defining \__iow_wrap_trim:N on line ...
Defining \__iow_wrap_trim:w on line ...
+Defining \l__file_internal_tl on line ...
Defining \g__file_internal_ior on line ...
Defining \g_file_curr_dir_str on line ...
Defining \g_file_curr_ext_str on line ...
Defining \g_file_curr_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
-Defining \l__file_tmp_tl on line ...
Defining \l__file_base_name_str on line ...
Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 29ff463..0ea3b60 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2999,6 +2999,7 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
Defining \l__ior_stream_tl on line ...
@@ -3039,7 +3040,6 @@ Defining \ior_str_map_inline:Nn on line ...
Defining \__ior_map_inline:NNn on line ...
Defining \__ior_map_inline:NNNn on line ...
Defining \__ior_map_inline_loop:NNN on line ...
-Defining \l__ior_internal_tl on line ...
Defining \c_log_iow on line ...
\c_log_iow=\count...
Defining \c_term_iow on line ...
@@ -3129,13 +3129,13 @@ Defining \__iow_wrap_end:n on line ...
Defining \__iow_wrap_store_do:n on line ...
Defining \__iow_wrap_trim:N on line ...
Defining \__iow_wrap_trim:w on line ...
+Defining \l__file_internal_tl on line ...
Defining \g__file_internal_ior on line ...
Defining \g_file_curr_dir_str on line ...
Defining \g_file_curr_ext_str on line ...
Defining \g_file_curr_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
-Defining \l__file_tmp_tl on line ...
Defining \l__file_base_name_str on line ...
Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 55b3714..9874e56 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2744,6 +2744,7 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
Defining \l__ior_stream_tl on line ...
@@ -2784,7 +2785,6 @@ Defining \ior_str_map_inline:Nn on line ...
Defining \__ior_map_inline:NNn on line ...
Defining \__ior_map_inline:NNNn on line ...
Defining \__ior_map_inline_loop:NNN on line ...
-Defining \l__ior_internal_tl on line ...
Defining \c_log_iow on line ...
\c_log_iow=\count...
Defining \c_term_iow on line ...
@@ -2874,13 +2874,13 @@ Defining \__iow_wrap_end:n on line ...
Defining \__iow_wrap_store_do:n on line ...
Defining \__iow_wrap_trim:N on line ...
Defining \__iow_wrap_trim:w on line ...
+Defining \l__file_internal_tl on line ...
Defining \g__file_internal_ior on line ...
Defining \g_file_curr_dir_str on line ...
Defining \g_file_curr_ext_str on line ...
Defining \g_file_curr_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
-Defining \l__file_tmp_tl on line ...
Defining \l__file_base_name_str on line ...
Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index d8c1d1f..30a551a 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2706,6 +2706,7 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
Defining \l__ior_stream_tl on line ...
@@ -2746,7 +2747,6 @@ Defining \ior_str_map_inline:Nn on line ...
Defining \__ior_map_inline:NNn on line ...
Defining \__ior_map_inline:NNNn on line ...
Defining \__ior_map_inline_loop:NNN on line ...
-Defining \l__ior_internal_tl on line ...
Defining \c_log_iow on line ...
\c_log_iow=\count...
Defining \c_term_iow on line ...
@@ -2836,13 +2836,13 @@ Defining \__iow_wrap_end:n on line ...
Defining \__iow_wrap_store_do:n on line ...
Defining \__iow_wrap_trim:N on line ...
Defining \__iow_wrap_trim:w on line ...
+Defining \l__file_internal_tl on line ...
Defining \g__file_internal_ior on line ...
Defining \g_file_curr_dir_str on line ...
Defining \g_file_curr_ext_str on line ...
Defining \g_file_curr_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
-Defining \l__file_tmp_tl on line ...
Defining \l__file_base_name_str on line ...
Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 14bf510..444e540 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2999,6 +2999,7 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
Defining \l__ior_stream_tl on line ...
@@ -3039,7 +3040,6 @@ Defining \ior_str_map_inline:Nn on line ...
Defining \__ior_map_inline:NNn on line ...
Defining \__ior_map_inline:NNNn on line ...
Defining \__ior_map_inline_loop:NNN on line ...
-Defining \l__ior_internal_tl on line ...
Defining \c_log_iow on line ...
\c_log_iow=\count...
Defining \c_term_iow on line ...
@@ -3129,13 +3129,13 @@ Defining \__iow_wrap_end:n on line ...
Defining \__iow_wrap_store_do:n on line ...
Defining \__iow_wrap_trim:N on line ...
Defining \__iow_wrap_trim:w on line ...
+Defining \l__file_internal_tl on line ...
Defining \g__file_internal_ior on line ...
Defining \g_file_curr_dir_str on line ...
Defining \g_file_curr_ext_str on line ...
Defining \g_file_curr_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
-Defining \l__file_tmp_tl on line ...
Defining \l__file_base_name_str on line ...
Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 334e562..6121ab5 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2999,6 +2999,7 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
Defining \l__ior_stream_tl on line ...
@@ -3039,7 +3040,6 @@ Defining \ior_str_map_inline:Nn on line ...
Defining \__ior_map_inline:NNn on line ...
Defining \__ior_map_inline:NNNn on line ...
Defining \__ior_map_inline_loop:NNN on line ...
-Defining \l__ior_internal_tl on line ...
Defining \c_log_iow on line ...
\c_log_iow=\count...
Defining \c_term_iow on line ...
@@ -3129,13 +3129,13 @@ Defining \__iow_wrap_end:n on line ...
Defining \__iow_wrap_store_do:n on line ...
Defining \__iow_wrap_trim:N on line ...
Defining \__iow_wrap_trim:w on line ...
+Defining \l__file_internal_tl on line ...
Defining \g__file_internal_ior on line ...
Defining \g_file_curr_dir_str on line ...
Defining \g_file_curr_ext_str on line ...
Defining \g_file_curr_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
-Defining \l__file_tmp_tl on line ...
Defining \l__file_base_name_str on line ...
Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 29ff463..0ea3b60 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2999,6 +2999,7 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
Defining \l__ior_stream_tl on line ...
@@ -3039,7 +3040,6 @@ Defining \ior_str_map_inline:Nn on line ...
Defining \__ior_map_inline:NNn on line ...
Defining \__ior_map_inline:NNNn on line ...
Defining \__ior_map_inline_loop:NNN on line ...
-Defining \l__ior_internal_tl on line ...
Defining \c_log_iow on line ...
\c_log_iow=\count...
Defining \c_term_iow on line ...
@@ -3129,13 +3129,13 @@ Defining \__iow_wrap_end:n on line ...
Defining \__iow_wrap_store_do:n on line ...
Defining \__iow_wrap_trim:N on line ...
Defining \__iow_wrap_trim:w on line ...
+Defining \l__file_internal_tl on line ...
Defining \g__file_internal_ior on line ...
Defining \g_file_curr_dir_str on line ...
Defining \g_file_curr_ext_str on line ...
Defining \g_file_curr_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
-Defining \l__file_tmp_tl on line ...
Defining \l__file_base_name_str on line ...
Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 55b3714..9874e56 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2744,6 +2744,7 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
Defining \l__ior_stream_tl on line ...
@@ -2784,7 +2785,6 @@ Defining \ior_str_map_inline:Nn on line ...
Defining \__ior_map_inline:NNn on line ...
Defining \__ior_map_inline:NNNn on line ...
Defining \__ior_map_inline_loop:NNN on line ...
-Defining \l__ior_internal_tl on line ...
Defining \c_log_iow on line ...
\c_log_iow=\count...
Defining \c_term_iow on line ...
@@ -2874,13 +2874,13 @@ Defining \__iow_wrap_end:n on line ...
Defining \__iow_wrap_store_do:n on line ...
Defining \__iow_wrap_trim:N on line ...
Defining \__iow_wrap_trim:w on line ...
+Defining \l__file_internal_tl on line ...
Defining \g__file_internal_ior on line ...
Defining \g_file_curr_dir_str on line ...
Defining \g_file_curr_ext_str on line ...
Defining \g_file_curr_name_str on line ...
Defining \g__file_stack_seq on line ...
Defining \g__file_record_seq on line ...
-Defining \l__file_tmp_tl on line ...
Defining \l__file_base_name_str on line ...
Defining \l__file_full_name_str on line ...
Defining \l__file_dir_str on line ...
More information about the latex3-commits
mailing list