diff options
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/web2c/cwebdir/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/cwebdir/ctwill-mini.ch | 21 | ||||
-rw-r--r-- | Build/source/texk/web2c/cwebdir/cweave.w | 13 |
3 files changed, 18 insertions, 21 deletions
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index 7538f8d3a19..564d570c49a 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -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, diff --git a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch index acc6e0c3a87..6ed7400dc3c 100644 --- a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch +++ b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch @@ -27,13 +27,6 @@ Section 1. \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 @@ faithful overall rendering of {\itt CTWILL}'s code, though. \hfill 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 @@ Section 228. @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. diff --git a/Build/source/texk/web2c/cwebdir/cweave.w b/Build/source/texk/web2c/cwebdir/cweave.w index 84d9e742164..2eda9184716 100644 --- a/Build/source/texk/web2c/cwebdir/cweave.w +++ b/Build/source/texk/web2c/cwebdir/cweave.w @@ -3794,7 +3794,6 @@ max_stack_ptr=stack; @ @<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 @@ text_pointer p) @ 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: -@c -static void -pop_level(void) -{ - cur_end=(--stack_ptr)->end_field; - cur_tok=stack_ptr->tok_field; cur_mode=stack_ptr->mode_field; -} +@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 @@ static eight_bits 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; |