[latex3-commits] [l3svn] r5888 - changed \exp_end: to \exp_stop:

noreply at latex-project.org noreply at latex-project.org
Mon Aug 24 19:30:59 CEST 2015


Author: mittelba
Date: 2015-08-24 19:30:59 +0200 (Mon, 24 Aug 2015)
New Revision: 5888

Modified:
   trunk/l3experimental/l3str/l3str-expl.dtx
   trunk/l3kernel/l3basics.dtx
   trunk/l3kernel/l3candidates.dtx
   trunk/l3kernel/l3expan.dtx
   trunk/l3kernel/l3fp-parse.dtx
   trunk/l3kernel/l3msg.dtx
   trunk/l3kernel/l3prg.dtx
   trunk/l3kernel/l3tl.dtx
   trunk/l3kernel/testfiles/m3basics002.tlg
   trunk/l3kernel/testfiles/m3expan002.tlg
   trunk/l3leftovers/tl-act.dtx
   trunk/l3trial/l3bigint/l3bigint.dtx
   trunk/l3trial/l3check/l3check.dtx
   trunk/l3trial/l3fp-extras/l3fp-symbolic.dtx
   trunk/l3trial/l3fp-extras/l3fp-types.dtx
Log:
changed \exp_end: to \exp_stop:

Modified: trunk/l3experimental/l3str/l3str-expl.dtx
===================================================================
--- trunk/l3experimental/l3str/l3str-expl.dtx	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3experimental/l3str/l3str-expl.dtx	2015-08-24 17:30:59 UTC (rev 5888)
@@ -686,11 +686,11 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}[EXP, aux]{\@@_skip_exp_end:w}
+% \begin{macro}[EXP, aux]{\@@_skip_exp_stop:w}
 % \begin{macro}[EXP, aux]
 %   {\@@_skip_loop:wNNNNNNNN, \@@_skip_end:w, \@@_skip_end:NNNNNNNN}
 %   Removes |max(#1,0)| characters from the input stream, and then
-%   leaves \cs{exp_end:}.  This should be expanded using
+%   leaves \cs{exp_stop:}.  This should be expanded using
 %   \cs{exp:w}.  We remove characters $8$ at a time until
 %   there are at most $8$ to remove.  Then we do a dirty trick: the
 %   \cs{if_case:w} construction leaves between $0$ and $8$ times the
@@ -700,10 +700,10 @@
 %   of \cs{@@_skip_end:NNNNNNNN} are the two \cs{or:}, and $6$
 %   characters from the input stream, exactly what we wanted to
 %   remove. Then close the \cs{if_case:w} conditional with \cs{fi:}, and
-%   stop the initial expansion with \cs{exp_end:} (see places where
-%   \cs{@@_skip_exp_end:w} is called).
+%   stop the initial expansion with \cs{exp_stop:} (see places where
+%   \cs{@@_skip_exp_stop:w} is called).
 %    \begin{macrocode}
-\cs_new:Npn \@@_skip_exp_end:w #1;
+\cs_new:Npn \@@_skip_exp_stop:w #1;
   {
     \if_int_compare:w #1 > \c_eight
       \exp_after:wN \@@_skip_loop:wNNNNNNNN
@@ -714,13 +714,13 @@
     #1 ;
   }
 \cs_new:Npn \@@_skip_loop:wNNNNNNNN #1; #2#3#4#5#6#7#8#9
-  { \exp_after:wN \@@_skip_exp_end:w \int_use:N \__int_eval:w #1 - \c_eight ; }
+  { \exp_after:wN \@@_skip_exp_stop:w \int_use:N \__int_eval:w #1 - \c_eight ; }
 \cs_new:Npn \@@_skip_end:w #1 ;
   {
     \exp_after:wN \@@_skip_end:NNNNNNNN
     \if_case:w #1 \exp_stop_f: \or: \or: \or: \or: \or: \or: \or: \or:
   }
-\cs_new:Npn \@@_skip_end:NNNNNNNN #1#2#3#4#5#6#7#8 { \fi: \exp_end: }
+\cs_new:Npn \@@_skip_end:NNNNNNNN #1#2#3#4#5#6#7#8 { \fi: \exp_stop: }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -732,7 +732,7 @@
 %     \@@_collect_end:wn, \@@_collect_end:nnnnnnnnw
 %   }
 %   Collects |max(#1,0)| characters, and removes everything else until
-%   \cs{q_stop}. This is somewhat similar to \cs{@@_skip_exp_end:w}, but
+%   \cs{q_stop}. This is somewhat similar to \cs{@@_skip_exp_stop:w}, but
 %   accepts integer expression arguments.  This time we can only grab
 %   $7$ characters at a time.  At the end, we use an \cs{if_case:w}
 %   trick again, so that the $8$ first arguments of
@@ -815,7 +815,7 @@
           { \use_none_delimit_by_q_stop:w }
           {
             \exp_after:wN \use_i_delimit_by_q_stop:nw
-            \exp:w \exp_after:wN \@@_skip_exp_end:w
+            \exp:w \exp_after:wN \@@_skip_exp_stop:w
               \int_use:N \__int_eval:w #1 + #2 ;
           }
       }
@@ -824,7 +824,7 @@
           { \use_none_delimit_by_q_stop:w }
           {
             \exp_after:wN \use_i_delimit_by_q_stop:nw
-            \exp:w \@@_skip_exp_end:w #1 ; { }
+            \exp:w \@@_skip_exp_stop:w #1 ; { }
           }
       }
   }
@@ -904,7 +904,7 @@
   {
     \exp_after:wN \@@_collect_delimit_by_q_stop:w
     \int_use:N \__int_eval:w #2 - #1 \exp_after:wN ;
-    \exp:w \@@_skip_exp_end:w #1 ;
+    \exp:w \@@_skip_exp_stop:w #1 ;
   }
 %    \end{macrocode}
 % \end{macro}

Modified: trunk/l3kernel/l3basics.dtx
===================================================================
--- trunk/l3kernel/l3basics.dtx	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3kernel/l3basics.dtx	2015-08-24 17:30:59 UTC (rev 5888)
@@ -1385,7 +1385,7 @@
 \tex_let:D \exp_not:N          \tex_noexpand:D
 \tex_let:D \exp_not:n          \etex_unexpanded:D
 \tex_let:D \exp:w              \tex_romannumeral:D
-\tex_chardef:D \exp_end:  = 0 ~
+\tex_chardef:D \exp_stop:  = 0 ~
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1722,7 +1722,7 @@
 % \begin{macro}[EXP]{\prg_return_true:, \prg_return_false:}
 %   The idea here is that \cs{exp:w} will expand fully any
 %   \cs{else:} and the \cs{fi:} that are waiting to be discarded,
-%   before reaching the \cs{exp_end:} which will leave the expansion null.
+%   before reaching the \cs{exp_stop:} which will leave the expansion null.
 %   The code can then leave either the first or second argument in the
 %   input stream. This means that all of the branching code has to contain
 %   at least two tokens: see how the logical tests are actually implemented
@@ -1898,7 +1898,7 @@
 %   following arguments: 1: \texttt{set} or \texttt{new}, 2: empty or
 %   \texttt{\_protected}, 3: function name 4: signature, 5: parameter
 %   text (or empty), 6: replacement. Remember that the logic-returning
-%   functions expect two arguments to be present after \cs{exp_end:}:
+%   functions expect two arguments to be present after \cs{exp_stop:}:
 %   notice the construction of the different variants relies on this,
 %   and that the |TF| variant will be slightly faster than the |T|
 %   version.  The |p| form is only valid for expandable tests, we check
@@ -1914,7 +1914,7 @@
     \fi:
       {
         \exp_args:cc { cs_ #2 #3 :Npn } { #4 _p: #5 } #6
-          { #7 \exp_end: \c_true_bool \c_false_bool }
+          { #7 \exp_stop: \c_true_bool \c_false_bool }
       }
       {
         \__msg_kernel_error:nnx { kernel } { protected-predicate }
@@ -1925,19 +1925,19 @@
     #1 \q_stop #2#3#4#5#6#7
   {
     \exp_args:cc { cs_ #2 #3 :Npn } { #4 : #5 T } #6
-      { #7 \exp_end: \use:n \use_none:n }
+      { #7 \exp_stop: \use:n \use_none:n }
   }
 \cs_set_protected:Npn \__prg_generate_F_form:wnnnnnn
     #1 \q_stop #2#3#4#5#6#7
   {
     \exp_args:cc { cs_ #2 #3 :Npn } { #4 : #5 F } #6
-      { #7 \exp_end: { } }
+      { #7 \exp_stop: { } }
   }
 \cs_set_protected:Npn \__prg_generate_TF_form:wnnnnnn
     #1 \q_stop #2#3#4#5#6#7
   {
     \exp_args:cc { cs_ #2 #3 :Npn } { #4 : #5 TF } #6
-      { #7 \exp_end: }
+      { #7 \exp_stop: }
   }
 %    \end{macrocode}
 % \end{macro}
@@ -2098,10 +2098,10 @@
 %   \verb*|\token_to_str:N \ |, and the auxiliary \cs{__cs_to_str:w}
 %   is expanded, feeding |-| as a second character for the test;
 %   the test is false, and \TeX{} skips to \cs{fi:}, then performs
-%   \cs{token_to_str:N}, and stops the \cs{exp:w} with \cs{exp_end:}.
+%   \cs{token_to_str:N}, and stops the \cs{exp:w} with \cs{exp_stop:}.
 %   The last case is that the escape character is itself a space. In this
 %   case, the \cs{if:w} test is true, and the auxiliary \cs{__cs_to_str:w}
-%   comes into play, inserting |-\__int_value:w|, which expands \cs{exp_end:}
+%   comes into play, inserting |-\__int_value:w|, which expands \cs{exp_stop:}
 %   to the character |0|. The initial \cs{exp:w} then sees
 %   |0|, which is not a terminated number, followed by the escape character,
 %   a space, which is removed, terminating the expansion of
@@ -2115,14 +2115,14 @@
       \if:w \token_to_str:N \ \__cs_to_str:w \fi:
       \exp_after:wN \__cs_to_str:N \token_to_str:N
   }
-\cs_set:Npn \__cs_to_str:N #1 { \exp_end: }
+\cs_set:Npn \__cs_to_str:N #1 { \exp_stop: }
 \cs_set:Npn \__cs_to_str:w #1 \__cs_to_str:N
-  { \exp_continue_f:w \exp_after:wN \use_none:nn \fi: \exp_after:wN \exp_end: }
+  { \exp_continue_f:w \exp_after:wN \use_none:nn \fi: \exp_after:wN \exp_stop: }
 %    \end{macrocode}
 %    A slightly more compact coding would be using the fact that we
-%    know how \cs{exp_end:} is implemented.
+%    know how \cs{exp_stop:} is implemented.
 %    \begin{macrocode}
-%  { - \__int_value:w \fi: \exp_after:wN \exp_end: }
+%  { - \__int_value:w \fi: \exp_after:wN \exp_stop: }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}

Modified: trunk/l3kernel/l3candidates.dtx
===================================================================
--- trunk/l3kernel/l3candidates.dtx	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3kernel/l3candidates.dtx	2015-08-24 17:30:59 UTC (rev 5888)
@@ -2799,8 +2799,8 @@
 %     \@@_act_count_group:nn, \@@_act_count_space:n}
 %   The token count is computed through an \cs{int_eval:n} construction.
 %   Each \texttt{1+} is output to the \emph{left}, into the integer
-%   expression, and the sum is ended by the \cs{exp_end:} inserted by
-%   \cs{@@_act_end:wn} (which is technically implemented as  \cs{c_zero}).
+%   expression, and the sum is ended by the \cs{exp_stop:} inserted by
+%   \cs{@@_act_end:wn} (which is technically implemented as \cs{c_zero}).
 %   Somewhat a hack!
 %    \begin{macrocode}
 \cs_new:Npn \tl_count_tokens:n #1
@@ -3096,7 +3096,7 @@
 \cs_new:Npn \@@_change_case_end:wn #1 \@@_change_case_result:n #2
   {
     \group_align_safe_end:
-    \exp_end:
+    \exp_stop:
     #2
   }
 %    \end{macrocode}

Modified: trunk/l3kernel/l3expan.dtx
===================================================================
--- trunk/l3kernel/l3expan.dtx	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3kernel/l3expan.dtx	2015-08-24 17:30:59 UTC (rev 5888)
@@ -650,19 +650,19 @@
 % \begin{function}[added=2015-08-23,EXP]
 %       {
 %         \exp:w ,
-%         \exp_end: 
+%         \exp_stop: 
 %       }
 %   \begin{syntax}
-%     \cs{exp:w} \meta{expandable-tokens} \cs{exp_end:} \\
+%     \cs{exp:w} \meta{expandable-tokens} \cs{exp_stop:} \\
 %   \end{syntax}
-%   Expands \meta{expandable-tokens} until reaching \cs{exp_end:} at
+%   Expands \meta{expandable-tokens} until reaching \cs{exp_stop:} at
 %   which point expansion stops.
 %   If any token in \meta{expandable-tokens} or any token generated by
 %   expanding the tokens therein is not expandable the expansion will end
-%   prematurely and as a result \cs{exp_end:} will be misinterpreted
+%   prematurely and as a result \cs{exp_stop:} will be misinterpreted
 %   later on.\footnotemark
 %
-%   In typical use cases the \cs{exp_end:} will be  hidden somewhere
+%   In typical use cases the \cs{exp_stop:} will be  hidden somewhere
 %   in the replacement text of \meta{expandable-tokens} rather than
 %   being on the same expansion level than \cs{exp:w}, e.g., you may
 %   see code such as
@@ -670,7 +670,7 @@
 %    \exp:w \@@_case:NnTF #1 {#2} { } { }
 %\end{verbatim}
 %   where somewhere during the expansion of |\@@_case:NnTF| the
-%   \cs{exp_end:} gets generated.
+%   \cs{exp_stop:} gets generated.
 % \end{function}
 % \footnotetext{Due to the implementation you might get the character
 %   in position 0 in the current font (typically ``\texttt`'')
@@ -711,7 +711,7 @@
 %   You might wonder why there are two different approaches available,
 %   after all the effect of
 %   \begin{quote}
-%     \cs{exp:w} \meta{expandable-tokens} \cs{exp_end:}
+%     \cs{exp:w} \meta{expandable-tokens} \cs{exp_stop:}
 %   \end{quote}
 %   can be alternatively achieved through an f-type expansion by using
 %   \cs{exp_stop_f:}, i.e.
@@ -914,7 +914,7 @@
 %   its argument given in braces and then evaluates it as if it was a
 %   |V|. The \cs{exp:w} sets off an expansion
 %   similar to an |f| type expansion, which we will terminate using
-%   \cs{exp_end:}. The argument is returned in braces.
+%   \cs{exp_stop:}. The argument is returned in braces.
 %    \begin{macrocode}
 \cs_new:Npn \::V #1 \::: #2#3
   {
@@ -967,19 +967,19 @@
 %    \end{macrocode}
 %   The next bit requires some explanation. The function must be
 %   initiated by \cs{exp:w} and we want to
-%   terminate this expansion chain by inserting the \cs{exp_end:}
+%   terminate this expansion chain by inserting the \cs{exp_stop:}
 %    token.
 %   However, we have to expand the register |#1| before we do
 %   that. If it is a \TeX{} register, we need to execute the sequence
-%   |\exp_after:wN \exp_end: \tex_the:D #1| and if it is a macro we
-%   need to execute |\exp_after:wN \exp_end: #1|. We therefore issue
+%   |\exp_after:wN \exp_stop: \tex_the:D #1| and if it is a macro we
+%   need to execute |\exp_after:wN \exp_stop: #1|. We therefore issue
 %   the longer of the two sequences and if the register is a macro, we
 %   remove the \cs{tex_the:D}.
 %    \begin{macrocode}
     \else:
       \exp_after:wN \use_i_ii:nnn
     \fi:
-    \exp_after:wN \exp_end: \tex_the:D #1
+    \exp_after:wN \exp_stop: \tex_the:D #1
   }
 \cs_new:Npn \@@_eval_register:c #1
   { \exp_after:wN \@@_eval_register:N \cs:w #1 \cs_end: }
@@ -998,7 +998,7 @@
       \fi:
     \fi:
     \__msg_kernel_expandable_error:nnn { kernel } { bad-variable } {#2}
-    \exp_end:
+    \exp_stop:
   }
 %    \end{macrocode}
 % \end{macro}
@@ -1393,7 +1393,7 @@
 % \subsection{Controlled expansion}
 %
 % \begin{macro}{\exp:w}
-% \begin{macro}{\exp_end:}
+% \begin{macro}{\exp_stop:}
 % \begin{macro}{\exp_continue_f:w}
 %
 %    To trigger a sequence of ``arbitrary'' many expansions we need a
@@ -1413,12 +1413,14 @@
 %    \begin{macrocode}
 %\cs_new_eq:NN \exp:w    \tex_romannumeral:D
 %    \end{macrocode}
-%    So to stop the expansion sequence in a controlled way all we need
+%    (The actual definition is already in \pkg{l3basics} so we show it here
+%    commented out; same for the next one.)  
+%    To stop the expansion sequence in a controlled way all we need
 %    to provide is \cs{c_zero} as part of expanded tokens. As this is
 %    an integer constant it will immediately stop
 %    \cs{tex_romannumerl:D}'s search for a number.
 %    \begin{macrocode}
-%\cs_new_eq:NN \exp_end: \c_zero
+%\cs_new_eq:NN \exp_stop: \c_zero
 %    \end{macrocode}
 %    (Note that according to our specification all tokens we expand
 %    initiated by \cs{exp:w} are supposed to be expandable (as well as

Modified: trunk/l3kernel/l3fp-parse.dtx
===================================================================
--- trunk/l3kernel/l3fp-parse.dtx	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3kernel/l3fp-parse.dtx	2015-08-24 17:30:59 UTC (rev 5888)
@@ -2073,7 +2073,7 @@
 %   parsed version of an infix operator, and \cs{@@_parse_infix_end:N}
 %   has infinitely negative precedence.  Finally, clean up a
 %   (well-defined) set of extra tokens and stop the initial expansion
-%   with \cs{exp_end:}.
+%   with \cs{exp_stop:}.
 %    \begin{macrocode}
 \cs_new:Npn \@@_parse:n #1
   {
@@ -2087,7 +2087,7 @@
   }
 \cs_new:Npn \@@_parse_after:ww
     #1@ \@@_parse_infix_end:N \s_@@_stop
-  { \exp_end: #1 }
+  { \exp_stop: #1 }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}

Modified: trunk/l3kernel/l3msg.dtx
===================================================================
--- trunk/l3kernel/l3msg.dtx	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3kernel/l3msg.dtx	2015-08-24 17:30:59 UTC (rev 5888)
@@ -2003,7 +2003,7 @@
 %   is an extra subtlety: if the user inserts tokens for error recovery,
 %   they should be kept. Thus we also use an odd space character
 %   (with category code $7$) and keep tokens until that space character,
-%   dropping everything else until \cs{q_stop}. The \cs{exp_end:} prevents
+%   dropping everything else until \cs{q_stop}. The \cs{exp_stop:} prevents
 %   losing braces around the user-inserted text if any, and stops the
 %   expansion of \cs{exp:w}.
 %    \begin{macrocode}
@@ -2023,7 +2023,7 @@
             \exp_after:wN \exp_after:wN
             \exp_after:wN \@@_expandable_error:w
             \exp_after:wN \exp_after:wN
-            \exp_after:wN \exp_end:
+            \exp_after:wN \exp_stop:
           }
         \exp_not:N \use:n { \exp_not:c { LaTeX3~error: } ^ #1 } ^
       }

Modified: trunk/l3kernel/l3prg.dtx
===================================================================
--- trunk/l3kernel/l3prg.dtx	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3kernel/l3prg.dtx	2015-08-24 17:30:59 UTC (rev 5888)
@@ -1449,19 +1449,19 @@
 %    \begin{macrocode}
 \cs_new:cpn { @@_replicate_first_-:n } #1
   {
-    \exp_end:
+    \exp_stop:
     \__msg_kernel_expandable_error:nn { kernel } { negative-replication }
   }
-\cs_new:cpn { @@_replicate_first_0:n } #1 { \exp_end: }
-\cs_new:cpn { @@_replicate_first_1:n } #1 { \exp_end: #1 }
-\cs_new:cpn { @@_replicate_first_2:n } #1 { \exp_end: #1#1 }
-\cs_new:cpn { @@_replicate_first_3:n } #1 { \exp_end: #1#1#1 }
-\cs_new:cpn { @@_replicate_first_4:n } #1 { \exp_end: #1#1#1#1 }
-\cs_new:cpn { @@_replicate_first_5:n } #1 { \exp_end: #1#1#1#1#1 }
-\cs_new:cpn { @@_replicate_first_6:n } #1 { \exp_end: #1#1#1#1#1#1 }
-\cs_new:cpn { @@_replicate_first_7:n } #1 { \exp_end: #1#1#1#1#1#1#1 }
-\cs_new:cpn { @@_replicate_first_8:n } #1 { \exp_end: #1#1#1#1#1#1#1#1 }
-\cs_new:cpn { @@_replicate_first_9:n } #1 { \exp_end: #1#1#1#1#1#1#1#1#1 }
+\cs_new:cpn { @@_replicate_first_0:n } #1 { \exp_stop: }
+\cs_new:cpn { @@_replicate_first_1:n } #1 { \exp_stop: #1 }
+\cs_new:cpn { @@_replicate_first_2:n } #1 { \exp_stop: #1#1 }
+\cs_new:cpn { @@_replicate_first_3:n } #1 { \exp_stop: #1#1#1 }
+\cs_new:cpn { @@_replicate_first_4:n } #1 { \exp_stop: #1#1#1#1 }
+\cs_new:cpn { @@_replicate_first_5:n } #1 { \exp_stop: #1#1#1#1#1 }
+\cs_new:cpn { @@_replicate_first_6:n } #1 { \exp_stop: #1#1#1#1#1#1 }
+\cs_new:cpn { @@_replicate_first_7:n } #1 { \exp_stop: #1#1#1#1#1#1#1 }
+\cs_new:cpn { @@_replicate_first_8:n } #1 { \exp_stop: #1#1#1#1#1#1#1#1 }
+\cs_new:cpn { @@_replicate_first_9:n } #1 { \exp_stop: #1#1#1#1#1#1#1#1#1 }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -1476,7 +1476,7 @@
 %   For testing vertical mode. Strikes me here on the bus with David,
 %   that as long as we are just talking about returning true and
 %   false states, we can just use the primitive conditionals for this
-%   and gobbling the \cs{exp_end:} in the input stream. However this
+%   and gobbling the \cs{exp_stop:} in the input stream. However this
 %   requires knowledge of the implementation so we keep things nice
 %   and clean and use the return statements.
 %    \begin{macrocode}

Modified: trunk/l3kernel/l3tl.dtx
===================================================================
--- trunk/l3kernel/l3tl.dtx	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3kernel/l3tl.dtx	2015-08-24 17:30:59 UTC (rev 5888)
@@ -2506,7 +2506,7 @@
 % \begin{macro}[EXP,aux]{\@@_act_space:wwnNNN}
 % \begin{macro}[EXP,aux]{\@@_act_end:w}
 %   To help control the expansion, \cs{@@_act:NNNnn} should always
-%   be proceeded by \cs{exp:w} and ends by producing \cs{exp_end:}
+%   be proceeded by \cs{exp:w} and ends by producing \cs{exp_stop:}
 %   once the result has been obtained. Then loop over tokens,
 %   groups, and spaces in |#5|. The marker \cs{q_@@_act_mark}
 %   is used both to avoid losing outer braces and to detect the
@@ -2524,7 +2524,7 @@
 %   In the loop, we check how the token list begins and act
 %   accordingly. In the \enquote{normal} case, we may have
 %   reached \cs{q_@@_act_mark}, the end of the list. Then
-%   leave \cs{exp_end:} and the result in the input stream,
+%   leave \cs{exp_stop:} and the result in the input stream,
 %   to terminate the expansion of \cs{exp:w}.
 %   Otherwise, apply the relevant function to the
 %   \enquote{arguments}, |#3|
@@ -2554,7 +2554,7 @@
     {#3} #4
   }
 \cs_new:Npn \@@_act_end:wn #1 \@@_act_result:n #2
-  { \group_align_safe_end: \exp_end: #2 }
+  { \group_align_safe_end: \exp_stop: #2 }
 \cs_new:Npn \@@_act_group:nwnNNN #1 #2 \q_@@_act_stop #3#4#5
   {
     #5 {#3} {#1}
@@ -2907,7 +2907,7 @@
 %   |\if_false: { \fi: ... }| construction) both to hide potential
 %   alignment tab characters from \TeX{} in a table, and to allow for
 %   removing what remains of the token list after its first space.  The
-%   \cs{exp:w} and \cs{exp_end:} ensure that the result of a
+%   \cs{exp:w} and \cs{exp_stop:} ensure that the result of a
 %   single step of expansion directly yields a balanced token list (no
 %   trailing closing brace).
 %    \begin{macrocode}
@@ -2919,8 +2919,8 @@
 \cs_new:Npn \@@_if_head_is_space:w #1 ~
   {
     \tl_if_empty:oTF { \use_none:n #1 }
-      { \exp_after:wN \exp_end: \exp_after:wN \prg_return_true: }
-      { \exp_after:wN \exp_end: \exp_after:wN \prg_return_false: }
+      { \exp_after:wN \exp_stop: \exp_after:wN \prg_return_true: }
+      { \exp_after:wN \exp_stop: \exp_after:wN \prg_return_false: }
     \exp_after:wN \use_none:n \exp_after:wN { \if_false: } \fi:
   }
 %    \end{macrocode}

Modified: trunk/l3kernel/testfiles/m3basics002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3basics002.tlg	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3kernel/testfiles/m3basics002.tlg	2015-08-24 17:30:59 UTC (rev 5888)
@@ -149,16 +149,16 @@
 Defining \foo:nnnF on line ...
 Defining \foo:nnnTF on line ...
 > \foo:nnnT=\protected\long macro:#1#2#3->\tl_show:n {#1#2#3}\prg_return_true:
-\exp_end: \use:n \use_none:n .
+\exp_stop: \use:n \use_none:n .
 > \foo:nnnF=\protected\long macro:#1#2#3->\tl_show:n {#1#2#3}\prg_return_true:
-\exp_end: {}.
+\exp_stop: {}.
 > \foo:nnnTF=\protected\long macro:#1#2#3->\tl_show:n
-{#1#2#3}\prg_return_true: \exp_end: .
+{#1#2#3}\prg_return_true: \exp_stop: .
 Defining \bar:nnnT on line ...
 Defining \bar:nnnF on line ...
-> \bar:nnnT=\long macro:#1#2#3->\prg_return_true: \exp_end: \use:n \use_none:n
-.
-> \bar:nnnF=\long macro:#1#2#3->\prg_return_true: \exp_end: {}.
+> \bar:nnnT=\long macro:#1#2#3->\prg_return_true: \exp_stop: \use:n
+\use_none:n .
+> \bar:nnnF=\long macro:#1#2#3->\prg_return_true: \exp_stop: {}.
 Defining \bar:nTF on line ...
 ============================================================
 ============================================================
@@ -238,7 +238,7 @@
 |...............................................
 Defining \baz:nTF on line ...
 > \baz_p:n=\relax.
-> \baz:nTF=\protected\long macro:#1->\prg_return_true: \exp_end: .
+> \baz:nTF=\protected\long macro:#1->\prg_return_true: \exp_stop: .
 ============================================================
 ============================================================
 TEST 8: prg_set_eq_conditional:NNn

Modified: trunk/l3kernel/testfiles/m3expan002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expan002.tlg	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3kernel/testfiles/m3expan002.tlg	2015-08-24 17:30:59 UTC (rev 5888)
@@ -137,7 +137,7 @@
 \protected macro:->\::N \::p \::o \::x \::: 
 Defining \foo_bar:wF on line ...
 undefined
-\long macro:#1;->\prg_return_true: \exp_end: {}
+\long macro:#1;->\prg_return_true: \exp_stop: {}
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/invalid-variant"

Modified: trunk/l3leftovers/tl-act.dtx
===================================================================
--- trunk/l3leftovers/tl-act.dtx	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3leftovers/tl-act.dtx	2015-08-24 17:30:59 UTC (rev 5888)
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: tl-act.dtx Copyright (C) 2011 The LaTeX3 Project
+%% File: tl-act.dtx Copyright (C) 2011,2015 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -213,7 +213,7 @@
 %       { \tl_act_expand_filler_aux_ii:N }
 %       {
 %         \tl_if_head_begin_group:nTF {#1}
-%           { \exp_end: }
+%           { \exp_stop: }
 %           {
 %             \exp_after:wN \tl_act_expand_filler:w
 %             \exp:w \exp_continue_f:w
@@ -230,7 +230,7 @@
 %         ...
 %         \token_if_eq_catcode:NNTF #1 \c_space_token
 %           { \exp_after:wN \tl_act_expand_filler:w \use_none:n }
-%           { \exp_end: }
+%           { \exp_stop: }
 %       }
 %   }
 %    \end{macrocode}

Modified: trunk/l3trial/l3bigint/l3bigint.dtx
===================================================================
--- trunk/l3trial/l3bigint/l3bigint.dtx	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3trial/l3bigint/l3bigint.dtx	2015-08-24 17:30:59 UTC (rev 5888)
@@ -669,7 +669,7 @@
 % Most of these are now available from pkg{l3expan}
 %    \begin{macrocode}
 %\cs_new_eq:NN \@@_exp:w \exp:w
-%\cs_new_eq:NN \@@_exp_stop: \exp_end:
+%\cs_new_eq:NN \@@_exp_stop: \exp_stop:
 %\cs_new_eq:NN \@@_exp_to_f:w \exp_continue_f:w
 \cs_new:Npn \@@_exp_to_f:n #1 { -`0 #1 }         % not provided in l3expan
 %    \end{macrocode}
@@ -904,7 +904,7 @@
 %   parsed version of an infix operator, and \cs{@@_parse_infix_end:N}
 %   has infinitely negative precedence.  Finally, clean up a
 %   (well-defined) set of extra tokens and stop the initial expansion
-%   with \cs{exp_end:}.
+%   with \cs{exp_stop:}.
 %    \begin{macrocode}
 \cs_new:Npn \@@_parse:n #1
   {
@@ -917,7 +917,7 @@
   }
 \cs_new:Npn \@@_parse_after:ww
     #1@ \@@_parse_infix_end:N \s_@@_stop
-  { \exp_end: #1 }
+  { \exp_stop: #1 }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}

Modified: trunk/l3trial/l3check/l3check.dtx
===================================================================
--- trunk/l3trial/l3check/l3check.dtx	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3trial/l3check/l3check.dtx	2015-08-24 17:30:59 UTC (rev 5888)
@@ -602,7 +602,7 @@
 %   to make sure that the redefinition of expandable macros does not
 %   alter their expansion properties.  Namely, it is important for some
 %   macros that |o|-expanding them twice fully expands them, so the
-%   redefined macro uses \cs{exp:w} and \cs{exp_end:} to make
+%   redefined macro uses \cs{exp:w} and \cs{exp_stop:} to make
 %   sure that its second expansion is the same as the second expansion
 %   of the original macro.
 %
@@ -643,7 +643,7 @@
       {
         \exp:w
         \@@_if_on:nT {#2} { \if_false: { \fi: #6 \if_false: } \fi: }
-        \exp_after:wN \exp_after:wN \exp_after:wN \exp_end:
+        \exp_after:wN \exp_after:wN \exp_after:wN \exp_stop:
         #1 #5
       }
   }

Modified: trunk/l3trial/l3fp-extras/l3fp-symbolic.dtx
===================================================================
--- trunk/l3trial/l3fp-extras/l3fp-symbolic.dtx	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3trial/l3fp-extras/l3fp-symbolic.dtx	2015-08-24 17:30:59 UTC (rev 5888)
@@ -215,7 +215,7 @@
     \exp:w
     \@@_exp_after_symbolic_loop:N #2
       { , \exp:w \use_none:nn }
-    \exp_after:wN \exp_end: \exp_after:wN
+    \exp_after:wN \exp_stop: \exp_after:wN
       {
         \exp:w \exp_continue_f:w
         \@@_exp_after_array_f:w #3 \s_@@_stop
@@ -232,7 +232,7 @@
   }
 \cs_new:Npn \@@_exp_after_symbolic_loop:N #1
   {
-    \exp_after:wN \exp_end:
+    \exp_after:wN \exp_stop:
     \exp_after:wN #1
     \exp:w
     \@@_exp_after_symbolic_loop:N
@@ -556,7 +556,7 @@
             \exp:w
             \@@_exp_after_symbolic_loop:N #1
               { , \exp:w \use_none:nn }
-            \exp_after:wN \exp_end:
+            \exp_after:wN \exp_stop:
             \exp_after:wN { \exp_after:wN } \exp_after:wN ;
             #2
           }

Modified: trunk/l3trial/l3fp-extras/l3fp-types.dtx
===================================================================
--- trunk/l3trial/l3fp-extras/l3fp-types.dtx	2015-08-24 16:00:09 UTC (rev 5887)
+++ trunk/l3trial/l3fp-extras/l3fp-types.dtx	2015-08-24 17:30:59 UTC (rev 5888)
@@ -1,6 +1,6 @@
 % \iffalse
 %
-%% File l3fp-types.dtx (C) Copyright 2012 The LaTeX3 Project
+%% File l3fp-types.dtx (C) Copyright 2012,2015 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -444,11 +444,11 @@
     \exp:w
     \@@_exp_after_tokens_aux:N #2
       { \s_@@_tokens \exp:w \use_none:nn }
-    \exp_after:wN \exp_end: #1
+    \exp_after:wN \exp_stop: #1
   }
 \cs_new:Npn \@@_exp_after_tokens_aux:N #1
   {
-    \exp_after:wN \exp_end:
+    \exp_after:wN \exp_stop:
     \exp_after:wN #1
     \exp:w
     \@@_exp_after_tokens_aux:N



More information about the latex3-commits mailing list