[latex3-commits] [latex3/latex3] e-type: Switch from x-type to e-type in l3experimental (6d732ca7e)

github at latex-project.org github at latex-project.org
Tue Sep 26 16:02:36 CEST 2023


Repository : https://github.com/latex3/latex3
On branch  : e-type
Link       : https://github.com/latex3/latex3/commit/6d732ca7e270eda1e2bf8baae3ac398018e007f5

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

commit 6d732ca7e270eda1e2bf8baae3ac398018e007f5
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Sep 25 22:15:44 2023 +0100

    Switch from x-type to e-type in l3experimental
    
    At this stage, just test files to adjust.


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

6d732ca7e270eda1e2bf8baae3ac398018e007f5
 .../l3benchmark/testfiles/m3benchmark001.lvt       |  2 +-
 .../l3benchmark/testfiles/m3benchmark002.lvt       |  2 +-
 l3experimental/l3bitset/testfiles/m3bitset001.lvt  | 14 +++---
 l3experimental/l3draw/testfiles/m3draw001.lvt      |  8 ++--
 l3experimental/l3draw/testfiles/m3draw002.lvt      | 54 +++++++++++-----------
 5 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/l3experimental/l3benchmark/testfiles/m3benchmark001.lvt b/l3experimental/l3benchmark/testfiles/m3benchmark001.lvt
index 30e52677a..27ed57f4c 100644
--- a/l3experimental/l3benchmark/testfiles/m3benchmark001.lvt
+++ b/l3experimental/l3benchmark/testfiles/m3benchmark001.lvt
@@ -25,7 +25,7 @@
 \fp_gset:Nn \g_benchmark_duration_target_fp { 0.01 }
 
 \OMIT
-\exp_args:NNx \seq_set_from_clist:Nn \l_tmpa_seq
+\exp_args:NNe \seq_set_from_clist:Nn \l_tmpa_seq
   { \prg_replicate:nn { 123 } { a , } }
 \cs_new_protected:Npn \test_slow_code:
   { \seq_reverse:N \l_tmpa_seq }
diff --git a/l3experimental/l3benchmark/testfiles/m3benchmark002.lvt b/l3experimental/l3benchmark/testfiles/m3benchmark002.lvt
index efad44ea8..49dbee087 100644
--- a/l3experimental/l3benchmark/testfiles/m3benchmark002.lvt
+++ b/l3experimental/l3benchmark/testfiles/m3benchmark002.lvt
@@ -18,7 +18,7 @@
 \OMIT
 \fp_new:N \l_test_fast_fp
 \fp_new:N \l_test_slow_fp
-\exp_args:NNx \seq_set_from_clist:Nn \l_tmpa_seq
+\exp_args:NNe \seq_set_from_clist:Nn \l_tmpa_seq
   { \prg_replicate:nn { 123 } { a , } }
 \cs_new_protected:Npn \test_slow_code:
   { \seq_reverse:N \l_tmpa_seq }
diff --git a/l3experimental/l3bitset/testfiles/m3bitset001.lvt b/l3experimental/l3bitset/testfiles/m3bitset001.lvt
index f1c7ad7ff..94b0f3743 100644
--- a/l3experimental/l3bitset/testfiles/m3bitset001.lvt
+++ b/l3experimental/l3bitset/testfiles/m3bitset001.lvt
@@ -144,8 +144,8 @@
  }
 
 \OMIT
-\exp_args:NNx \bitset_set_true:Nn   \l_my_test_bitset {\int_eval:n{2+2+8-4}}
-\exp_args:NNx\bitset_gset_true:Nn   \g_my_test_bitset {\int_eval:n{2+2+8-4}}
+\exp_args:NNe \bitset_set_true:Nn   \l_my_test_bitset {\int_eval:n{2+2+8-4}}
+\exp_args:NNe\bitset_gset_true:Nn   \g_my_test_bitset {\int_eval:n{2+2+8-4}}
 \TIMO
 
 \TESTEXP{add~index~8~with~sum}
@@ -168,8 +168,8 @@
 
 
 \OMIT
-\exp_args:NNx\bitset_set_true:Nn   \l_my_test_bitset { \int_max:nn{4}{15} }
-\exp_args:NNx\bitset_gset_true:Nn   \g_my_test_bitset { \int_max:nn{4}{15} }
+\exp_args:NNe\bitset_set_true:Nn   \l_my_test_bitset { \int_max:nn{4}{15} }
+\exp_args:NNe\bitset_gset_true:Nn   \g_my_test_bitset { \int_max:nn{4}{15} }
 \TIMO
 
 \TESTEXP{add~index~15~with~max-function}
@@ -215,8 +215,8 @@
 
 
 \OMIT
-\exp_args:NNx\bitset_set_false:Nn   \l_my_test_bitset { \int_eval:n{-1+2+3+6+5} }
-\exp_args:NNx\bitset_gset_false:Nn   \g_my_test_bitset {\int_eval:n{ -1+2+3+6+5} }
+\exp_args:NNe\bitset_set_false:Nn   \l_my_test_bitset { \int_eval:n{-1+2+3+6+5} }
+\exp_args:NNe\bitset_gset_false:Nn   \g_my_test_bitset {\int_eval:n{ -1+2+3+6+5} }
 \TIMO
 
 \TESTEXP{remove~index~15~with~sum}
@@ -246,7 +246,7 @@
    \int_step_inline:nn {40}
      {
        \bitset_show:N \l_my_testb_bitset
-       \exp_args:NNx\bitset_set_false:Nn \l_my_testb_bitset {\int_eval:n{#1-1}}
+       \exp_args:NNe\bitset_set_false:Nn \l_my_testb_bitset {\int_eval:n{#1-1}}
        \bitset_set_true:Nn \l_my_testb_bitset {#1}
      }
  }
diff --git a/l3experimental/l3draw/testfiles/m3draw001.lvt b/l3experimental/l3draw/testfiles/m3draw001.lvt
index 7afe855b0..60a2d128e 100644
--- a/l3experimental/l3draw/testfiles/m3draw001.lvt
+++ b/l3experimental/l3draw/testfiles/m3draw001.lvt
@@ -130,13 +130,13 @@
 
 \TEST { \draw_set_<axis>vec:n }
   {
-    \exp_args:Nx \tl_show:n { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
+    \tl_show:e { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
     \draw_xvec:n { 1cm , 1cm }
-    \exp_args:Nx \tl_show:n { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
+    \tl_show:e { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
     \draw_yvec:n { 1cm , 1cm }
-    \exp_args:Nx \tl_show:n { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
+    \tl_show:e { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
     \draw_zvec:n { 1cm , 1cm }
-    \exp_args:Nx \tl_show:n { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
+    \tl_show:e { \draw_point_vec:nnn { 1 } { 1 } { 1 } }
   }
 
 \OMIT
diff --git a/l3experimental/l3draw/testfiles/m3draw002.lvt b/l3experimental/l3draw/testfiles/m3draw002.lvt
index 7d0ba44ea..7074509a0 100644
--- a/l3experimental/l3draw/testfiles/m3draw002.lvt
+++ b/l3experimental/l3draw/testfiles/m3draw002.lvt
@@ -18,75 +18,75 @@
 
 \TEST { \draw_transform_matrix:nnnnn }
   {
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
     \draw_transform_matrix:nnnn { 1 } { 1 } { 1 } { 1 }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
+    \tl_show:e { \draw_point_transform:n { 1pt , 1pt } }
     \draw_transform_matrix:nnnn { 2 } { 0 } { 0 } { 1 }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
+    \tl_show:e { \draw_point_transform:n { 1pt , 1pt } }
   }
 
 \TEST { \draw_transform_matrix_absolute:nnnn }
   {
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
+    \tl_show:e { \draw_point_transform:n { 1pt , 1pt } }
     \draw_transform_matrix_absolute:nnnn { 1 } { 1 } { 1 } { 1 }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
+    \tl_show:e { \draw_point_transform:n { 1pt , 1pt } }
     \draw_transform_matrix_absolute:nnnn { 2 } { 0 } { 0 } { 1 }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1pt , 1pt } }
+    \tl_show:e { \draw_point_transform:n { 1pt , 1pt } }
   }
 
 \TEST { \draw_transform_triangle: }
   {
     \draw_transform_triangle:nnn { 0cm , 0cm } { 1cm , 1cm } { -1cm , 1cm }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 0.5 , 0.5 } }
+    \tl_show:e { \draw_point_transform:n { 0.5 , 0.5 } }
   }
 
 \TEST { \draw_transform_rotate:n }
   {
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
     \draw_transform_rotate:n { 30 }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { ( 1 , 1 ) } }
+    \tl_show:e { \draw_point_transform:n { ( 1 , 1 ) } }
     \draw_transform_rotate:n { -45 }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
   }
 
 \TEST { \draw_transform_scale:n }
   {
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
     \draw_transform_scale:n { 2 }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { ( 1 , 1 ) } }
+    \tl_show:e { \draw_point_transform:n { ( 1 , 1 ) } }
     \draw_transform_xscale:n { 2 }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
     \draw_transform_yscale:n { 1/3 }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
   }
 
 \TEST { \draw_transform_shift:n }
   {
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
     \draw_transform_shift:n { 10pt, 10pt }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { ( 1 , 1 ) } }
+    \tl_show:e { \draw_point_transform:n { ( 1 , 1 ) } }
     \draw_transform_xshift:n { -5pt }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
     \draw_transform_yshift:n { 12pt }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
   }
 
 \TEST { \draw_transform_shift_absolute:n }
   {
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
     \draw_transform_shift_absolute:n { 10pt, 10pt }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
     \draw_transform_shift_absolute:n { 10pt, 10pt }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
   }
 
 \TEST { \draw_transform_slant:n }
   {
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
     \draw_transform_xslant:n { 2 }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { ( 1 , 1 ) } }
+    \tl_show:e { \draw_point_transform:n { ( 1 , 1 ) } }
     \draw_transform_yslant:n { 3 }
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { ( 1 , 1 ) } }
+    \tl_show:e { \draw_point_transform:n { ( 1 , 1 ) } }
   }
 
 \TEST { \draw_transform_matrix_invert: }
@@ -95,21 +95,21 @@
     \tl_set:Ne \l_tmpa_tl { \draw_point_transform:n { 1 , 1 } }
     \tl_show:N \l_tmpa_tl
     \draw_transform_matrix_invert:
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { \l_tmpa_tl } }
+    \tl_show:e { \draw_point_transform:n { \l_tmpa_tl } }
   }
 
 \TEST { \draw_transform_matrix_reset: }
   {
     \draw_transform_matrix:nnnn { 1 } { 0 } { 1 } { 1 }
     \draw_transform_matrix_reset:
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
   }
 
 \TEST { \draw_transform_shift_reset: }
   {
     \draw_transform_shift:n { 10pt , 0pt }
     \draw_transform_shift_reset:
-    \exp_args:Nx \tl_show:n { \draw_point_transform:n { 1 , 1 } }
+    \tl_show:e { \draw_point_transform:n { 1 , 1 } }
   }
 
 \END





More information about the latex3-commits mailing list.