texlive[67646] Build/source/texk/web2c/cwebdir: [CWEB] 'pop_level' is

[commits+ascherer at tug.org]

Revision: 67646
          http://tug.org/svn/texlive?view=revision&revision=67646
Author:   ascherer
Date:     2023-07-16 02:13:30 +0200 (Sun, 16 Jul 2023)
Log Message:
-----------
[CWEB] 'pop_level' is a macro (again).

See line 3944 of WEAVE.WEB.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/cwebdir/ChangeLog
    trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
    trunk/Build/source/texk/web2c/cwebdir/cweave.w

Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2023-07-16 00:00:53 UTC (rev 67645)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2023-07-16 00:13:30 UTC (rev 67646)
@@ -1,3 +1,8 @@
+2023-07-16  Andreas Scherer  <https://ascherer.github.io>
+
+	* ctwill-mini.ch,
+	* cweave.w: 'pop_level' is a macro (again).
+
 2023-07-14  Andreas Scherer  <https://ascherer.github.io>
 
 	* ctwill.bux,

Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch	2023-07-16 00:00:53 UTC (rev 67645)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch	2023-07-16 00:13:30 UTC (rev 67646)
@@ -27,13 +27,6 @@
   \else \global\hoffset=-1.54cm \global\voffset=-1.54cm \fi
 \fi
 
-@$ctangle {CTWILL}3 \&{enum} \&{cweb}@>
-@$ctwill {CTWILL}3 \&{enum} \&{cweb}@>
-@$cweave {CTWILL}3 \&{enum} \&{cweb}@>
-
-@$inner {CTWILL}223 \&{enum} \&{mode}@>
-@$outer {CTWILL}223 \&{enum} \&{mode}@>
-
 @** Introduction.
 @z
 
@@ -67,6 +60,13 @@
 The ``banner line'' defined here should be changed whenever \.{CTWILL} is
 @-banner@>
 @$banner {CTWILL}1 =\.{"This\ is\ CTWILL"}@>
+
+@$ctangle {CTWILL}3 \&{enum} \&{cweb}@>
+@$ctwill {CTWILL}3 \&{enum} \&{cweb}@>
+@$cweave {CTWILL}3 \&{enum} \&{cweb}@>
+
+@$inner {CTWILL}223 \&{enum} \&{mode}@>
+@$outer {CTWILL}223 \&{enum} \&{mode}@>
 @z
 
 Section 2.
@@ -1618,11 +1618,10 @@
 
 @x
 force when the current level was begun. This subroutine will never be
-called when |stack_ptr==1|.
+called when |stack_ptr==1|. It is so simple, we declare it as a macro:
 @y
-force when the current level was begun.
-
-This subroutine will never be called when |stack_ptr==1|.
+force when the current level was begun.  It is so simple, we declare it as a
+macro.  This subroutine will never be called when |stack_ptr==1|.
 @z
 
 Section 233--234.

Modified: trunk/Build/source/texk/web2c/cwebdir/cweave.w
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cweave.w	2023-07-16 00:00:53 UTC (rev 67645)
+++ trunk/Build/source/texk/web2c/cwebdir/cweave.w	2023-07-16 00:13:30 UTC (rev 67646)
@@ -3794,7 +3794,6 @@
 
 @ @<Predecl...@>=
 static void push_level(text_pointer);@/
-static void pop_level(void);
 
 @ To insert token-list |p| into the output, the |push_level| subroutine
 is called; it saves the old level of output and gets a new one going.
@@ -3818,15 +3817,9 @@
 
 @ Conversely, the |pop_level| routine restores the conditions that were in
 force when the current level was begun. This subroutine will never be
-called when |stack_ptr==1|.
+called when |stack_ptr==1|. It is so simple, we declare it as a macro:
 
- at c
-static void
-pop_level(void)
-{
-  cur_end=(--stack_ptr)->end_field;
-  cur_tok=stack_ptr->tok_field; cur_mode=stack_ptr->mode_field;
-}
+ at d pop_level cur_state = *(--stack_ptr)
 
 @ The |get_output| function returns the next byte of output that is not a
 reference to a token list. It returns the values |identifier| or |res_word|
@@ -3852,7 +3845,7 @@
 get_output(void) /* returns the next token of output */
 {
   sixteen_bits a; /* current item read from |tok_mem| */
-  restart: while (cur_tok==cur_end) pop_level();
+  restart: while (cur_tok==cur_end) pop_level;
   a=*(cur_tok++);
   if (a>=0400) {
     cur_name=a % id_flag + name_dir;