[latex3-commits] [git/LaTeX3-latex3-latex3] master: Add missing \exp_args:NNNv for \ior_get_term:nN (79b6b5cc5)

PhelypeOleinik tex.phelype at gmail.com
Sun Aug 23 18:00:24 CEST 2020


Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/79b6b5cc570f43a7489a2b6f90796c847fdd3593

>---------------------------------------------------------------

commit 79b6b5cc570f43a7489a2b6f90796c847fdd3593
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Sun Aug 23 13:00:24 2020 -0300

    Add missing \exp_args:NNNv for \ior_get_term:nN


>---------------------------------------------------------------

79b6b5cc570f43a7489a2b6f90796c847fdd3593
 l3kernel/l3expan.dtx                               | 11 +++++-
 l3kernel/testfiles/m3ior003.lvt                    | 42 ++++++++++++++++++++++
 .../testfiles/m3ior003.tlg                         | 12 ++++---
 3 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/l3kernel/l3expan.dtx b/l3kernel/l3expan.dtx
index d2ef71dac..94508694f 100644
--- a/l3kernel/l3expan.dtx
+++ b/l3kernel/l3expan.dtx
@@ -504,6 +504,7 @@
 %   {
 %     \exp_args:NNNo,
 %     \exp_args:NNNV,
+%     \exp_args:NNNv,
 %     \exp_args:Nccc,
 %     \exp_args:NcNc,
 %     \exp_args:NcNo,
@@ -1365,7 +1366,8 @@
 %
 % \begin{macro}[EXP]
 %   {
-%     \exp_args:NNNV, \exp_args:NcNc, \exp_args:NcNo,
+%     \exp_args:NNNV, \exp_args:NNNv,
+%     \exp_args:NcNc, \exp_args:NcNo,
 %     \exp_args:Ncco,
 %   }
 %   A few more that we can hand-tune.
@@ -1377,6 +1379,13 @@
     \exp_after:wN #3
     \exp_after:wN { \exp:w \@@_eval_register:N #4 }
   }
+\cs_new:Npn \exp_args:NNNv #1#2#3#4
+  {
+    \exp_after:wN #1
+    \exp_after:wN #2
+    \exp_after:wN #3
+    \exp_after:wN { \exp:w \@@_eval_register:c {#4} }
+  }
 \cs_new:Npn \exp_args:NcNc #1#2#3#4
   {
     \exp_after:wN #1
diff --git a/l3kernel/testfiles/m3ior003.lvt b/l3kernel/testfiles/m3ior003.lvt
new file mode 100644
index 000000000..b4a750ac4
--- /dev/null
+++ b/l3kernel/testfiles/m3ior003.lvt
@@ -0,0 +1,42 @@
+%
+% Copyright (C) 2020 The LaTeX3 Project
+%
+
+\documentclass{minimal}
+\input{regression-test}
+
+\RequirePackage[enable-debug]{expl3}
+\ExplSyntaxOn
+\debug_on:n { check-declarations , deprecation , log-functions }
+\ExplSyntaxOff
+
+\begin{document}
+\START
+\AUTHOR{Phelype Oleinik}
+\ExplSyntaxOn
+
+\TEST { \ior_(str_)get_term:nN }
+  {
+    % Faking terminal read from a file
+    \ior_new:N \tempread
+    \ior_open:Nn \tempread { filetest.txt }
+    \cs_set_eq:NN \c__ior_term_ior \tempread
+    %
+    % str_get_term
+    \ior_str_get_term:nN { ? ~ } \l_tmpa_tl
+    \TYPE { |\l_tmpa_tl| }
+    %
+    \ior_str_get_term:nN { ? ~ } \l_tmpa_tl
+    \TYPE { |\l_tmpa_tl| }
+    %
+    % get_term
+    \ior_get_term:nN { ? ~ } \l_tmpa_tl
+    \TYPE { |\l_tmpa_tl| }
+    %
+    \ior_get_term:nN { ? ~ } \l_tmpa_tl
+    \TYPE { |\l_tmpa_tl| }
+    %
+    \ior_close:N \tempread
+  }
+
+\END
diff --git a/l3experimental/l3sys-shell/testfiles/m3sys-shell002.tlg b/l3kernel/testfiles/m3ior003.tlg
similarity index 57%
copy from l3experimental/l3sys-shell/testfiles/m3sys-shell002.tlg
copy to l3kernel/testfiles/m3ior003.tlg
index ab6dda719..a56980ef9 100644
--- a/l3experimental/l3sys-shell/testfiles/m3sys-shell002.tlg
+++ b/l3kernel/testfiles/m3ior003.tlg
@@ -1,10 +1,12 @@
 This is a generated file for the LaTeX (2e + expl3) validation system.
 Don't change this file in any respect.
+Author: Phelype Oleinik
 ============================================================
-TEST 1: File Listing
+TEST 1: \ior_ (str_)get_term:nN
 ============================================================
-The sequence \l_tmpa_seq contains the items (without outer braces):
->  {m3sys-shell002.lvt}.
-<recently read> }
-l. ...  }
+Defining \tempread on line ...
+|\ExplSyntaxOff|
+|This file is needed by m3file001.lvt, m3ior001.lvt and m3ior002.lvt:|
+|Pleaseleaveitalone!|
+|\ExplSyntaxOn |
 ============================================================





More information about the latex3-commits mailing list.