[latex3-commits] [git/LaTeX3-latex3-latex3] master: Remove unnecessary patches, add a check that scan marks start with s (d87c4d4)

[Bruno Le Floch]

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

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

commit d87c4d4502eb5011873fa74837d94c340b644d3b
Author: Bruno Le Floch <bruno at le-floch.fr>
Date:   Sun Apr 1 16:37:44 2018 -0400

    Remove unnecessary patches, add a check that scan marks start with s


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

d87c4d4502eb5011873fa74837d94c340b644d3b
 l3kernel/l3quark.dtx |    1 +
 l3kernel/l3str.dtx   |    7 ++-----
 l3kernel/l3token.dtx |    1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/l3kernel/l3quark.dtx b/l3kernel/l3quark.dtx
index 11071e1..a6ac689 100644
--- a/l3kernel/l3quark.dtx
+++ b/l3kernel/l3quark.dtx
@@ -590,6 +590,7 @@
 %   Check whether the variable is already a scan mark,
 %   then declare it to be equal to \cs{scan_stop:} globally.
 %    \begin{macrocode}
+\__kernel_patch:nnNNpn { \__kernel_chk_var_scope:NN s #1 } { }
 \cs_new_protected:Npn \scan_new:N #1
   {
     \tl_if_in:NnTF \g_@@_marks_tl { #1 }
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 261f59c..0d6e8d8 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -1457,11 +1457,10 @@
   }
 \cs_new:Npn \str_item_ignore_spaces:nn #1
   { \exp_args:No \@@_item:nn { \tl_to_str:n {#1} } }
-\__kernel_patch_args:nNNpn { {#1} { \int_eval:n {#2} } }
 \cs_new:Npn \@@_item:nn #1#2
   {
     \exp_after:wN \@@_item:w
-    \int_value:w \int_eval:w #2 \exp_after:wN ;
+    \int_value:w \int_eval:n {#2} \exp_after:wN ;
     \int_value:w \@@_count:n {#1} ;
     #1 \q_stop
   }
@@ -1554,13 +1553,11 @@
   }
 \cs_new:Npn \str_range_ignore_spaces:nnn #1
   { \exp_args:No \@@_range:nnn { \tl_to_str:n {#1} } }
-\__kernel_patch_args:nNNpn
-  { {#1} { \int_eval:n {#2} } { \int_eval:n {#3} } }
 \cs_new:Npn \@@_range:nnn #1#2#3
   {
     \exp_after:wN \@@_range:w
     \int_value:w \@@_count:n {#1} \exp_after:wN ;
-    \int_value:w \int_eval:n { #2 - 1 } \exp_after:wN ;
+    \int_value:w \int_eval:n { (#2) - 1 } \exp_after:wN ;
     \int_value:w \int_eval:n {#3} ;
     #1 \q_stop
   }
diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index c4763e9..52f9283 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -1376,7 +1376,6 @@
 %   the interface layer, turn the two arguments into integers up-front so
 %   this is only done once.
 %    \begin{macrocode}
-\__kernel_patch_args:nNNpn { { \int_eval:n {#1} } { \int_eval:n {#2} } }
 \cs_new:Npn \char_generate:nn #1#2
   {
     \exp:w \exp_after:wN \@@_generate_aux:w