[latex3-commits] [latex3/latex3] main: Use \int_eval:n not \int_eval:w in re-entrant dim conversion code (81fa4b800)

[github at latex-project.org]

Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/81fa4b80032c5538820db9ea223aa93aaf2860b5

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

commit 81fa4b80032c5538820db9ea223aa93aaf2860b5
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed May 24 08:39:19 2023 +0100

    Use \int_eval:n not \int_eval:w in re-entrant dim conversion code


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

81fa4b80032c5538820db9ea223aa93aaf2860b5
 l3kernel/l3skip.dtx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/l3kernel/l3skip.dtx b/l3kernel/l3skip.dtx
index bf174f74d..442d1a0b8 100644
--- a/l3kernel/l3skip.dtx
+++ b/l3kernel/l3skip.dtx
@@ -1991,12 +1991,12 @@
         \token_if_eq_charcode:NNTF #1 -
           {
             \exp_after:wN \exp_after:wN \exp_after:wN \@@_get_remainder:w
-              \int_eval:w ( 2 * #2 - #3 ) / ( 2 * #3 ) ;
+              \int_eval:n {  ( 2 * #2 - #3 ) / ( 2 * #3 ) } ;
               #2 ; #3 ; - ;
           }
           {
             \exp_after:wN \exp_after:wN \exp_after:wN \@@_get_remainder:w
-              \int_eval:w ( 2 * #1#2 - #3 ) / ( 2 * #3 ) ;
+              \int_eval:n { ( 2 * #1#2 - #3 ) / ( 2 * #3 ) } ;
               #1#2 ; #3 ; ;
           }
       }
@@ -2012,7 +2012,7 @@
 \cs_new:Npn \@@_get_remainder:w #1;#2;#3;
   {
     \exp_after:wN \exp_after:wN \exp_after:wN \@@_convert_remainder:w
-      \int_eval:w #2 - #1 * #3 ;
+      \int_eval:n { #2 - #1 * #3 } ;
       #3 ; #1 ;
   }
 %    \end{macrocode}
@@ -2025,7 +2025,7 @@
 \cs_new:Npn \@@_convert_remainder:w #1;#2;
   {
     \exp_after:wN \exp_after:wN \exp_after:wN \@@_test_candidate:w
-      \int_eval:w #1 * 65536 / #2 ;
+      \int_eval:n { #1 * 65536 / #2 } ;
       #1 ; #2 ;
   }
 %    \end{macrocode}
@@ -2046,8 +2046,7 @@
       { \dim_to_decimal:n { #1sp } \@@_eval:w #3sp \@@_eval_end: }
       { \@@_parse_decimal:w #1 ; }
       {
-        \exp_after:wN \@@_parse_decimal:w
-          \int_eval:w #1 + 1 ;
+        \@@_parse_decimal:w \int_eval:n { #1 + 1 } ;
       }
   }
 %    \end{macrocode}