CWEB - release 4.2, 2021-02-25.

This second service release wraps up the major code overhaul after CWEB 4.0.

Andreas Scherer committed 5 years ago

Commit 78e1eee1 parent 659f08423 files · +772 −810Browse files

Unified · Split

23 files

Makefile +4 −1
README.md +2 −2
comm-mac.ch +2 −2
comm-ql.ch +4 −4
common.c +167 −171
common.h +45 −45
common.w +29 −33
ctang-bs.ch +8 −8
ctang-pc.ch +2 −2
ctang-ql.ch +4 −4
ctang-vms.ch +2 −2
ctang-w32.ch +2 −2
ctangle.c +216 −225
ctangle.w +83 −92
cweav-bs.ch +23 −23
cweav-man.ch +1 −1
cweav-pc.ch +2 −2
cweav-ql.ch +4 −4
cweav-vms.ch +2 −2
cweav-w32.ch +2 −2
cweave.w +151 −166
cwebmac.tex +2 −2
cwebman.tex +15 −15

 # This file is part of CWEB.
 # It is distributed WITHOUT ANY WARRANTY, express or implied.
-# Version 4.1 --- February 2021
+# Version 4.2 --- February 2021
 # Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
 CP= /bin/cp
 # uncomment the second line if you use pdftex to bypass .dvi files
+# uncomment the third line if you use xetex to bypass .dvi files
 PDFTEX = dvipdfm
 #PDFTEX = pdftex
+#PDFTEX = xetex
 ##########  You shouldn't have to change anything after this point #######
 	case "$(PDFTEX)" in \
 	 dvipdfm ) tex "\let\pdf+ \input $*"; dvipdfm $* ;; \
 	 pdftex ) pdftex $* ;; \
+	 xetex ) xetex $* ;; \
 	esac
 all: ctangle cweave

README.md+2−2

@@ -1,4 +1,4 @@
1	# cweb 4.1	1	# cweb 4.2
2		2
3	people have been accumulating several decades of experience with	3	people have been accumulating several decades of experience with
4	[cweb](http://www-cs-faculty.stanford.edu/~uno/cweb.html), and we know that	4	[cweb](http://www-cs-faculty.stanford.edu/~uno/cweb.html), and we know that
@@ -16,7 +16,7 @@ in fact, now to be found in this cweb development project. · 11 unmodified lines
16	besides for further development, this ‘project’ is used as an – obviously	16	besides for further development, this ‘project’ is used as an – obviously
17	incomplete – repository of original release versions of levy/knuth	17	incomplete – repository of original release versions of levy/knuth
18	[cweb](http://www-cs-faculty.stanford.edu/~uno/cweb.html). you can either	18	[cweb](http://www-cs-faculty.stanford.edu/~uno/cweb.html). you can either
19	compile these sources directly or stick the recent version “cweb-4.1” into my	19	compile these sources directly or stick the recent version “cweb-4.2” into my
20	[cwebbin](https://github.com/ascherer/cwebbin), which introduces convenient	20	[cwebbin](https://github.com/ascherer/cwebbin), which introduces convenient
21	extensions and prepares cweb for inclusion in the “tex live” distribution.	21	extensions and prepares cweb for inclusion in the “tex live” distribution.
22		22

comm-mac.ch+2−2

@@ -4,9 +4,9 @@ No changes to CTANGLE or CWEAVE are needed. · 3 unmodified lines
4	(Contributed 13 Oct 2000 by AndPio@aol.com; slightly edited by Don Knuth)	4	(Contributed 13 Oct 2000 by AndPio@aol.com; slightly edited by Don Knuth)
5		5
6	@x in limbo, change the title page document to specify Mac version	6	@x in limbo, change the title page document to specify Mac version
7	\centerline{(Version 4.1)}	7	\centerline{(Version 4.2)}
8	@y	8	@y
9	\centerline{(Version 4.1 for MacOS)}	9	\centerline{(Version 4.2 for MacOS)}
10	@z	10	@z
11		11
12	@x sections 23/24: Make input_ln accept \n, \r, \n\r, or \r\n as line endings	12	@x sections 23/24: Make input_ln accept \n, \r, \n\r, or \r\n as line endings

comm-ql.ch+4−4

@@ -10,24 +10,24 @@ ex <dev_>cc;'-v -h -c -=500000 -DCWEBINPUTS=flp2_ common_c' · 9 unmodified lines
10	@x	10	@x
11	\def\v{\char'174} % vertical (\|) in typewriter font	11	\def\v{\char'174} % vertical (\|) in typewriter font
12		12
13	\def\title{Common code for CTANGLE and CWEAVE (Version 4.1)}	13	\def\title{Common code for CTANGLE and CWEAVE (Version 4.2)}
14	\def\topofcontents{\null\vfill	14	\def\topofcontents{\null\vfill
15	\centerline{\titlefont Common code for {\ttitlefont CTANGLE} and	15	\centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
16	{\ttitlefont CWEAVE}}	16	{\ttitlefont CWEAVE}}
17	\vskip 15pt	17	\vskip 15pt
18	\centerline{(Version 4.1)}	18	\centerline{(Version 4.2)}
19	\vfill}	19	\vfill}
20	\def\botofcontents{\vfill	20	\def\botofcontents{\vfill
21	\noindent	21	\noindent
22	@y	22	@y
23	\def\v{\char'174} % vertical (\|) in typewriter font	23	\def\v{\char'174} % vertical (\|) in typewriter font
24		24
25	\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.1)}	25	\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.2)}
26	\def\topofcontents{\null\vfill	26	\def\topofcontents{\null\vfill
27	\centerline{\titlefont Common code for {\ttitlefont CTANGLE} and	27	\centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
28	{\ttitlefont CWEAVE}}	28	{\ttitlefont CWEAVE}}
29	\vskip 15pt	29	\vskip 15pt
30	\centerline{(Version 4.1)}	30	\centerline{(Version 4.2)}
31	\vfill}	31	\vfill}
32	\def\botofcontents{\vfill	32	\def\botofcontents{\vfill
33	\noindent	33	\noindent

common.c+167−171

 #define xisupper(c) (isupper((eight_bits) c) &&((eight_bits) c<0200) )
 #define xisxdigit(c) (isxdigit((eight_bits) c) &&((eight_bits) c<0200) )  \
+#define max_include_depth 10 \
+#define max_file_name_length 1024
+#define cur_file file[include_depth]
+#define cur_file_name file_name[include_depth]
+#define cur_line line[include_depth]
+#define web_file file[0]
+#define web_file_name file_name[0] \
 #define length(c) (size_t) ((c+1) ->byte_start-(c) ->byte_start)
 #define print_id(c) term_write((c) ->byte_start,length((c) ) )
 #define llink link
 #define confusion(s) fatal("! This can't happen: ",s)  \
  \
-#define max_include_depth 10 \
-#define max_file_name_length 1024
-#define cur_file file[include_depth]
-#define cur_file_name file_name[include_depth]
-#define cur_line line[include_depth]
-#define web_file file[0]
-#define web_file_name file_name[0] \
 #define show_banner flags['b']
 #define show_progress flags['p']
 #define show_stats flags['s']
 extern char*limit;
 /*:5*//*6:*/
-#line 102 "common.h"
+#line 105 "common.h"
+extern int include_depth;
+extern FILE*file[];
+extern FILE*change_file;
+extern char file_name[][max_file_name_length];
+extern char change_file_name[];
+extern int line[];
+extern int change_line;
+extern int change_depth;
+extern boolean input_has_ended;
+extern boolean changing;
+extern boolean web_file_open;
+/*:6*//*8:*/
+#line 125 "common.h"
+extern sixteen_bits section_count;
+extern boolean changed_section[];
+extern boolean change_pending;
+extern boolean print_where;
+/*:8*//*9:*/
+#line 139 "common.h"
 typedef struct name_info{
 char*byte_start;
 extern hash_pointer hash_end;
 extern hash_pointer h;
-/*:6*//*8:*/
+/*:9*//*11:*/
-#line 146 "common.h"
+#line 183 "common.h"
 extern int history;
-/*:8*//*10:*/
+/*:11*//*13:*/
-#line 166 "common.h"
+#line 199 "common.h"
-extern int include_depth;
+extern int argc;
-extern FILE*file[];
+extern char**argv;
-extern FILE*change_file;
 extern char C_file_name[];
 extern char tex_file_name[];
 extern char idx_file_name[];
 extern char scn_file_name[];
-extern char file_name[][max_file_name_length];
-extern char change_file_name[];
-extern int line[];
-extern int change_line;
-extern int change_depth;
-extern boolean input_has_ended;
-extern boolean changing;
-extern boolean web_file_open;
-/*:10*//*12:*/
-#line 190 "common.h"
-extern sixteen_bits section_count;
-extern boolean changed_section[];
-extern boolean change_pending;
-extern boolean print_where;
-/*:12*//*13:*/
-#line 203 "common.h"
-extern int argc;
-extern char**argv;
 extern boolean flags[];
 /*:13*//*14:*/
 /*:18*//*19:*/
 #line 92 "common.w"
 int phase;
 /*:19*//*21:*/
-#line 129 "common.w"
+#line 130 "common.w"
 char section_text[longest_name+1];
 char*section_text_end= section_text+longest_name;
 char*id_loc;
 /*:21*//*22:*/
-#line 149 "common.w"
+#line 150 "common.w"
 char buffer[long_buf_size];
 char*buffer_end= buffer+buf_size-2;
-char*limit= buffer;
 char*loc= buffer;
+char*limit= buffer;
 /*:22*//*25:*/
 #line 194 "common.w"
 char file_name[max_include_depth][max_file_name_length];
 char change_file_name[max_file_name_length];
-char alt_web_file_name[max_file_name_length];
+static char alt_web_file_name[max_file_name_length];
 int line[max_include_depth];
 int change_line;
 int change_depth;
 /*:25*//*26:*/
 #line 220 "common.w"
-char change_buffer[buf_size];
+static char change_buffer[buf_size];
-char*change_limit;
+static char*change_limit;
 /*:26*//*37:*/
-#line 401 "common.w"
+#line 399 "common.w"
 sixteen_bits section_count;
 boolean changed_section[max_sections];
 boolean print_where= false;
 /*:37*//*43:*/
-#line 598 "common.w"
+#line 596 "common.w"
 char byte_mem[max_bytes];
 char*byte_mem_end= byte_mem+max_bytes-1;
 name_pointer name_dir_end= name_dir+max_names-1;
 /*:43*//*44:*/
-#line 609 "common.w"
+#line 607 "common.w"
-name_pointer name_ptr;
 char*byte_ptr;
+name_pointer name_ptr;
 /*:44*//*46:*/
-#line 629 "common.w"
+#line 627 "common.w"
 name_pointer hash[hash_size];
 hash_pointer hash_end= hash+hash_size-1;
 hash_pointer h;
 /*:46*//*65:*/
-#line 1017 "common.w"
+#line 1014 "common.w"
 int history= spotless;
 /*:65*//*73:*/
-#line 1138 "common.w"
+#line 1135 "common.w"
 int argc;
 char**argv;
 boolean flags[128];
 /*:73*//*83:*/
-#line 1286 "common.w"
+#line 1282 "common.w"
 FILE*C_file;
 FILE*tex_file;
 #line 70 "common.w"
 /*7:*/
-#line 125 "common.h"
+#line 119 "common.h"
+extern boolean get_line(void);
+extern void check_complete(void);
+extern void reset_input(void);
+/*:7*//*10:*/
+#line 162 "common.h"
 extern boolean names_match(name_pointer,const char*,size_t,eight_bits);
 extern name_pointer id_lookup(const char*,const char*,char);
 extern void print_section_name(name_pointer);
 extern void sprint_section_name(char*,name_pointer);
-/*:7*//*9:*/
+/*:10*//*12:*/
-#line 149 "common.h"
+#line 186 "common.h"
 extern int wrap_up(void);
 extern void err_print(const char*);
 extern void fatal(const char*,const char*);
 extern void overflow(const char*);
-/*:9*//*11:*/
+/*:12*//*15:*/
-#line 184 "common.h"
-extern boolean get_line(void);
-extern void check_complete(void);
-extern void reset_input(void);
-/*:11*//*15:*/
 #line 223 "common.h"
 extern void common_init(void);
 extern void print_stats(void);
-/*:15*//*23:*/
+/*:15*//*24:*/
-#line 159 "common.w"
+#line 180 "common.w"
 static boolean input_ln(FILE*);
-/*:23*//*27:*/
+/*:24*//*28:*/
-#line 231 "common.w"
+#line 241 "common.w"
 static void prime_the_change_buffer(void);
-/*:27*//*32:*/
+/*:28*//*33:*/
-#line 303 "common.w"
+#line 340 "common.w"
 static void check_change(void);
-/*:32*//*55:*/
+/*:33*//*55:*/
-#line 776 "common.w"
+#line 774 "common.w"
 static int web_strcmp(char*,int,char*,int);
 static name_pointer add_section_name(name_pointer,int,char*,char*,int);
 static void extend_section_name(name_pointer,char*,char*,int);
-/*:55*//*63:*/
+/*:55*//*64:*/
-#line 972 "common.w"
+#line 1002 "common.w"
 static int section_name_cmp(char**,int,name_pointer);
-/*:63*//*75:*/
+/*:64*//*76:*/
-#line 1170 "common.w"
+#line 1197 "common.w"
 static void scan_args(void);
-/*:75*/
+/*:76*/
 #line 71 "common.w"
 /*:1*//*20:*/
-#line 98 "common.w"
+#line 99 "common.w"
 void
 common_init(void)
 {
 /*45:*/
-#line 613 "common.w"
+#line 611 "common.w"
 name_dir->byte_start= byte_ptr= byte_mem;
 name_ptr= name_dir+1;
 root= NULL;
 /*:45*//*47:*/
-#line 636 "common.w"
+#line 634 "common.w"
 for(h= hash;h<=hash_end;*h++= NULL);
 /*:47*/
-#line 102 "common.w"
+#line 103 "common.w"
 /*74:*/
-#line 1151 "common.w"
+#line 1148 "common.w"
 show_banner= show_happiness= show_progress= make_xrefs= true;
 show_stats= false;
 /*:74*/
-#line 103 "common.w"
+#line 104 "common.w"
 /*84:*/
-#line 1293 "common.w"
+#line 1289 "common.w"
 scan_args();
 if(program==ctangle){
 }
 /*:84*/
-#line 104 "common.w"
+#line 105 "common.w"
 }
-/*:20*//*24:*/
+/*:20*//*23:*/
-#line 162 "common.w"
+#line 160 "common.w"
 static boolean input_ln(
 FILE*fp)
 return true;
 }
-/*:24*//*28:*/
+/*:23*//*27:*/
-#line 234 "common.w"
+#line 231 "common.w"
 static void
 prime_the_change_buffer(void)
 {
 change_limit= change_buffer;
 /*29:*/
-#line 248 "common.w"
+#line 247 "common.w"
 while(true){
 change_line++;
 }
 /*:29*/
-#line 239 "common.w"
+#line 236 "common.w"
 /*30:*/
-#line 265 "common.w"
+#line 264 "common.w"
 do{
 change_line++;
 }while(limit==buffer);
 /*:30*/
-#line 240 "common.w"
+#line 237 "common.w"
 /*31:*/
-#line 275 "common.w"
+#line 274 "common.w"
 {
 change_limit= change_buffer+(ptrdiff_t)(limit-buffer);
 }
 /*:31*/
-#line 241 "common.w"
+#line 238 "common.w"
 }
-/*:28*//*33:*/
+/*:27*//*32:*/
-#line 306 "common.w"
+#line 302 "common.w"
 static void
 check_change(void)
 if(limit> buffer+1&&buffer[0]=='@'){
 char xyz_code= xisupper(buffer[1])?tolower((eight_bits)buffer[1]):buffer[1];
 /*34:*/
-#line 344 "common.w"
+#line 342 "common.w"
 if(xyz_code=='x'||xyz_code=='z'){
 loc= buffer+2;err_print("! Where is the matching @y?");
 }
 /*:34*/
-#line 328 "common.w"
+#line 324 "common.w"
 }
 /*31:*/
-#line 275 "common.w"
+#line 274 "common.w"
 {
 change_limit= change_buffer+(ptrdiff_t)(limit-buffer);
 }
 /*:31*/
-#line 330 "common.w"
+#line 326 "common.w"
 changing= false;cur_line++;
 while(!input_ln(cur_file)){
 }
 }
-/*:33*//*35:*/
+/*:32*//*35:*/
-#line 364 "common.w"
+#line 362 "common.w"
 void
 reset_input(void)
 {
 limit= buffer;loc= buffer+1;buffer[0]= ' ';
 /*36:*/
-#line 379 "common.w"
+#line 377 "common.w"
 if((web_file= fopen(web_file_name,"r"))==NULL){
 strcpy(web_file_name,alt_web_file_name);
 fatal("! Cannot open change file ",change_file_name);
 /*:36*/
-#line 369 "common.w"
+#line 367 "common.w"
 include_depth= 0;cur_line= 0;change_line= 0;
 change_depth= include_depth;
 }
 /*:35*//*38:*/
-#line 408 "common.w"
+#line 406 "common.w"
 boolean get_line(void)
 {
 restart:
 if(changing&&include_depth==change_depth)
 /*41:*/
-#line 516 "common.w"
+#line 514 "common.w"
 {
 change_line++;
 if(!input_ln(change_file)){
 }
 /*:41*/
-#line 413 "common.w"
+#line 411 "common.w"
 if(!changing||include_depth> change_depth){
 /*40:*/
-#line 499 "common.w"
+#line 497 "common.w"
 {
 cur_line++;
 while(!input_ln(cur_file)){
 }
 /*:40*/
-#line 415 "common.w"
+#line 413 "common.w"
 if(changing&&include_depth==change_depth)goto restart;
 }
 }
 include_depth++;
 /*39:*/
-#line 453 "common.w"
+#line 451 "common.w"
 {
 char temp_file_name[max_file_name_length];
 char*cur_file_name_end= cur_file_name+max_file_name_length-1;
 }
 /*:39*/
-#line 434 "common.w"
+#line 432 "common.w"
 }
 return true;
 }
 /*:38*//*42:*/
-#line 548 "common.w"
+#line 546 "common.w"
 void
 check_complete(void){
 }
 /*:42*//*48:*/
-#line 641 "common.w"
+#line 639 "common.w"
 name_pointer
 id_lookup(
 if(last==NULL)for(last= first;*last!='\0';last++);
 l= (int)(last-first);
 /*49:*/
-#line 664 "common.w"
+#line 662 "common.w"
 h= (eight_bits)*i;
 while(++i<last)h= (h+h+(int)((eight_bits)*i))%hash_size;
 /*:49*/
-#line 654 "common.w"
+#line 652 "common.w"
 /*50:*/
-#line 672 "common.w"
+#line 670 "common.w"
 p= hash[h];
 while(p&&!names_match(p,first,l,t))p= p->link;
 }
 /*:50*/
-#line 655 "common.w"
+#line 653 "common.w"
 if(p==name_ptr)/*51:*/
-#line 683 "common.w"
+#line 681 "common.w"
 {
 if(byte_ptr+l> byte_mem_end)overflow("byte memory");
 if(name_ptr>=name_dir_end)overflow("name");
 }
 /*:51*/
-#line 656 "common.w"
+#line 654 "common.w"
 return p;
 }
 /*:48*//*52:*/
-#line 715 "common.w"
+#line 713 "common.w"
 void
 print_section_name(
 }
 /*:52*//*53:*/
-#line 734 "common.w"
+#line 732 "common.w"
 void
 sprint_section_name(
 }
 /*:53*//*54:*/
-#line 755 "common.w"
+#line 753 "common.w"
 void
 print_prefix_name(
 }
 /*:54*//*56:*/
-#line 781 "common.w"
+#line 779 "common.w"
 static int web_strcmp(
 char*j,
 }
 /*:56*//*57:*/
-#line 810 "common.w"
+#line 808 "common.w"
 static name_pointer
 add_section_name(
 }
 /*:57*//*58:*/
-#line 839 "common.w"
+#line 837 "common.w"
 static void
 extend_section_name(
 }
 /*:58*//*59:*/
-#line 867 "common.w"
+#line 865 "common.w"
 name_pointer
 section_lookup(
 int name_len= (int)(last-first)+1;
 /*60:*/
-#line 891 "common.w"
+#line 889 "common.w"
 while(p){
 c= web_strcmp(first,name_len,first_chunk(p),prefix_length(p));
 }
 /*:60*/
-#line 881 "common.w"
+#line 879 "common.w"
 /*61:*/
-#line 916 "common.w"
+#line 914 "common.w"
 if(r==NULL)
 return add_section_name(par,c,first,last+1,ispref);
 /*:61*/
-#line 882 "common.w"
+#line 880 "common.w"
 /*62:*/
-#line 924 "common.w"
+#line 922 "common.w"
 switch(section_name_cmp(&first,name_len,r)){
 }
 /*:62*/
-#line 883 "common.w"
+#line 881 "common.w"
 }
-/*:59*//*64:*/
+/*:59*//*63:*/
-#line 975 "common.w"
+#line 970 "common.w"
 static int section_name_cmp(
 char**pfirst,
 }
 }
-/*:64*//*66:*/
+/*:63*//*66:*/
-#line 1027 "common.w"
+#line 1024 "common.w"
 void
 err_print(
 char*k,*l;
 printf(*s=='!'?"\n%s":"%s",s);
 if(web_file_open)/*67:*/
-#line 1047 "common.w"
+#line 1044 "common.w"
 {if(changing&&include_depth==change_depth)
 printf(". (l. %d of change file)\n",change_line);
 }
 /*:67*/
-#line 1034 "common.w"
+#line 1031 "common.w"
 update_terminal;mark_error;
 }
 /*:66*//*68:*/
-#line 1079 "common.w"
+#line 1076 "common.w"
 int wrap_up(void){
 if(show_progress)new_line;
 if(show_stats)
 print_stats();
 /*69:*/
-#line 1089 "common.w"
+#line 1086 "common.w"
 switch(history){
 case spotless:if(show_happiness)puts("(No errors were found.)");break;
 }
 /*:69*/
-#line 1084 "common.w"
+#line 1081 "common.w"
 if(history> harmless_message)return EXIT_FAILURE;
 else return EXIT_SUCCESS;
 }
 /*:68*//*70:*/
-#line 1105 "common.w"
+#line 1102 "common.w"
 void
 fatal(
 const char*s,const char*t)
 }
 /*:70*//*71:*/
-#line 1116 "common.w"
+#line 1113 "common.w"
 void
 overflow(
 const char*t)
 }
-/*:71*//*76:*/
+/*:71*//*75:*/
-#line 1173 "common.w"
+#line 1167 "common.w"
 static void
 scan_args(void)
 strcpy(change_file_name,"/dev/null");
 while(--argc> 0){
 if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*80:*/
-#line 1262 "common.w"
+#line 1258 "common.w"
 {
 for(dot_pos= *argv+1;*dot_pos> '\0';dot_pos++)
 }
 /*:80*/
-#line 1185 "common.w"
+#line 1179 "common.w"
 else{
 s= name_pos= *argv;dot_pos= NULL;
 else s++;
 }
 if(!found_web)/*77:*/
-#line 1210 "common.w"
+#line 1206 "common.w"
 {
 if(s-*argv> max_file_name_length-5)
 /*82:*/
-#line 1280 "common.w"
+#line 1276 "common.w"
 fatal("! Filename too long\n",*argv);
 /*:82*/
-#line 1213 "common.w"
+#line 1209 "common.w"
 if(dot_pos==NULL)
 sprintf(web_file_name,"%s.w",*argv);
 }
 /*:77*/
-#line 1194 "common.w"
+#line 1188 "common.w"
 else if(!found_change)/*78:*/
-#line 1228 "common.w"
+#line 1224 "common.w"
 {
 if(strcmp(*argv,"-")!=0){
 if(s-*argv> max_file_name_length-4)
 /*82:*/
-#line 1280 "common.w"
+#line 1276 "common.w"
 fatal("! Filename too long\n",*argv);
 /*:82*/
-#line 1232 "common.w"
+#line 1228 "common.w"
 if(dot_pos==NULL)
 sprintf(change_file_name,"%s.ch",*argv);
 }
 /*:78*/
-#line 1195 "common.w"
+#line 1189 "common.w"
 else if(!found_out)/*79:*/
-#line 1240 "common.w"
+#line 1236 "common.w"
 {
 if(s-*argv> max_file_name_length-5)
 /*82:*/
-#line 1280 "common.w"
+#line 1276 "common.w"
 fatal("! Filename too long\n",*argv);
 /*:82*/
-#line 1243 "common.w"
+#line 1239 "common.w"
 if(dot_pos==NULL){
 sprintf(tex_file_name,"%s.tex",*argv);
 }
 /*:79*/
-#line 1196 "common.w"
+#line 1190 "common.w"
 else/*81:*/
-#line 1268 "common.w"
+#line 1264 "common.w"
 {
 if(program==ctangle)
 }
 /*:81*/
-#line 1197 "common.w"
+#line 1191 "common.w"
 }
 }
 if(!found_web)/*81:*/
-#line 1268 "common.w"
+#line 1264 "common.w"
 {
 if(program==ctangle)
 }
 /*:81*/
-#line 1200 "common.w"
+#line 1194 "common.w"
 }
-/*:76*/
+/*:75*/

common.h+45−45

 % This program by Silvio Levy and Donald E. Knuth
 % is based on a program by Knuth.
 % It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.1 --- February 2021 (works also with later versions)
+% Version 4.2 --- February 2021 (works also with later versions)
 % Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth
 extern char *loc; /* points to the next character to be read from the buffer */
 extern char *limit; /* points to the last character in the buffer */
+@ Code related to file handling:
+@f line x /* make |line| an unreserved word */
+@d max_include_depth 10 /* maximum number of source files open
+  simultaneously, not counting the change file */
+@d max_file_name_length 1024
+@d cur_file file[include_depth] /* current file */
+@d cur_file_name file_name[include_depth] /* current file name */
+@d cur_line line[include_depth] /* number of current line in current file */
+@d web_file file[0] /* main source file */
+@d web_file_name file_name[0] /* main source file name */
+@<Common code...@>=
+extern int include_depth; /* current level of nesting */
+extern FILE *file[]; /* stack of non-change files */
+extern FILE *change_file; /* change file */
+extern char file_name[][max_file_name_length];
+  /* stack of non-change file names */
+extern char change_file_name[]; /* name of change file */
+extern int line[]; /* number of current line in the stacked files */
+extern int change_line; /* number of current line in change file */
+extern int change_depth; /* where \.{@@y} originated during a change */
+extern boolean input_has_ended; /* if there is no more input */
+extern boolean changing; /* if the current line is from |change_file| */
+extern boolean web_file_open; /* if the web file is being read */
+@ @<Predecl...@>=
+extern boolean get_line(void); /* inputs the next line */
+extern void check_complete(void); /* checks that all changes were picked up */
+extern void reset_input(void); /* initialize to read the web file and change file */
+@ Code related to section numbers:
+@<Common code...@>=
+extern sixteen_bits section_count; /* the current section number */
+extern boolean changed_section[]; /* is the section changed? */
+extern boolean change_pending; /* is a decision about change still unclear? */
+extern boolean print_where; /* tells \.{CTANGLE} to print line and file info */
 @ Code related to identifier and section name storage:
 @d length(c) (size_t)((c+1)->byte_start-(c)->byte_start) /* the length of a name */
 @d print_id(c) term_write((c)->byte_start,length((c))) /* print identifier */
 extern void init_p(name_pointer,eight_bits);@/
 extern void print_prefix_name(name_pointer);@/
 extern void print_section_name(name_pointer);@/
-extern void sprint_section_name(char *,name_pointer);@/
+extern void sprint_section_name(char *,name_pointer);
 @ Code related to error handling:
 @d spotless 0 /* |history| value for normal jobs */
 extern void fatal(const char *,const char *); /* issue error message and die */
 extern void overflow(const char *); /* succumb because a table has overflowed */
-@ Code related to file handling:
-@f line x /* make |line| an unreserved word */
-@d max_include_depth 10 /* maximum number of source files open
-  simultaneously, not counting the change file */
-@d max_file_name_length 1024
-@d cur_file file[include_depth] /* current file */
-@d cur_file_name file_name[include_depth] /* current file name */
-@d cur_line line[include_depth] /* number of current line in current file */
-@d web_file file[0] /* main source file */
-@d web_file_name file_name[0] /* main source file name */
-@<Common code...@>=
-extern int include_depth; /* current level of nesting */
-extern FILE *file[]; /* stack of non-change files */
-extern FILE *change_file; /* change file */
-extern char C_file_name[]; /* name of |C_file| */
-extern char tex_file_name[]; /* name of |tex_file| */
-extern char idx_file_name[]; /* name of |idx_file| */
-extern char scn_file_name[]; /* name of |scn_file| */
-extern char file_name[][max_file_name_length];
-  /* stack of non-change file names */
-extern char change_file_name[]; /* name of change file */
-extern int line[]; /* number of current line in the stacked files */
-extern int change_line; /* number of current line in change file */
-extern int change_depth; /* where \.{@@y} originated during a change */
-extern boolean input_has_ended; /* if there is no more input */
-extern boolean changing; /* if the current line is from |change_file| */
-extern boolean web_file_open; /* if the web file is being read */
-@ @<Predecl...@>=
-extern boolean get_line(void); /* inputs the next line */
-extern void check_complete(void); /* checks that all changes were picked up */
-extern void reset_input(void); /* initialize to read the web file and change file */
-@ Code related to section numbers:
-@<Common code...@>=
-extern sixteen_bits section_count; /* the current section number */
-extern boolean changed_section[]; /* is the section changed? */
-extern boolean change_pending; /* is a decision about change still unclear? */
-extern boolean print_where; /* tells \.{CTANGLE} to print line and file info */
 @ Code related to command line arguments:
 @d show_banner flags['b'] /* should the banner line be printed? */
 @d show_progress flags['p'] /* should progress reports be printed? */
 @<Common code...@>=
 extern int argc; /* copy of |ac| parameter to |main| */
 extern char **argv; /* copy of |av| parameter to |main| */
+extern char C_file_name[]; /* name of |C_file| */
+extern char tex_file_name[]; /* name of |tex_file| */
+extern char idx_file_name[]; /* name of |idx_file| */
+extern char scn_file_name[]; /* name of |scn_file| */
 extern boolean flags[]; /* an option for each 7-bit code */
-@ Code relating to output:
+@ Code related to output:
 @d update_terminal fflush(stdout) /* empty the terminal output buffer */
 @d new_line putchar('\n') @d putxchar putchar
 @d term_write(a,b) fflush(stdout),fwrite(a,sizeof(char),b,stdout)
 @ The procedure that gets everything rolling:
 @<Predecl...@>=
 extern void common_init(void);@/
-extern void print_stats(void);@/
+extern void print_stats(void);
 @ The following parameters were sufficient in the original \.{WEB} to
 handle \TEX/, so they should be sufficient for most applications of

common.w+29−33

 % This program by Silvio Levy and Donald E. Knuth
 % is based on a program by Knuth.
 % It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.1 --- February 2021
+% Version 4.2 --- February 2021
 % Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
 \def\v{\char'174} % vertical (|) in typewriter font
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.1)}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.2)}
 \def\topofcontents{\null\vfill
   \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
     {\ttitlefont CWEAVE}}
   \vskip 15pt
-  \centerline{(Version 4.1)}
+  \centerline{(Version 4.2)}
   \vfill}
 \def\botofcontents{\vfill
 \noindent
 @h
 @<Common code for \.{CWEAVE} and \.{CTANGLE}@>@/
 @<Global variables@>@/
-@<Predeclaration of procedures@>@/
+@<Predeclaration of procedures@>
 @ The details will be filled in due course.  The interface of this module
 is included first.  It is also used by the main programs.
 Similarly, \.{CTANGLE} operates in two phases.
 The global variable |phase| tells which phase we are in.
-@<Global var...@>= int phase; /* which phase are we in? */
+@<Global var...@>=
+int phase; /* which phase are we in? */
 @ There's an initialization procedure that gets both \.{CTANGLE} and
 \.{CWEAVE} off to a good start. We will fill in the details of this
 @<Global var...@>=
 char buffer[long_buf_size]; /* where each line of input goes */
 char *buffer_end=buffer+buf_size-2; /* end of |buffer| */
-char *limit=buffer; /* points to the last character in the buffer */
 char *loc=buffer; /* points to the next character to be read from the buffer */
+char *limit=buffer; /* points to the last character in the buffer */
 @ In the unlikely event that your standard I/O library does not
 support |feof|, |getc|, and |ungetc| you may have to change things here.
 @^system dependencies@>
-@<Predecl...@>=
+@c
-static boolean input_ln(FILE *);@/
-@ @c
 static boolean input_ln(@t\1\1@> /* copies a line into |buffer| or returns |false| */
 FILE *fp@t\2\2@>) /* what file to read from */
 {
   return true;
 }
+@ @<Predecl...@>=@+static boolean input_ln(FILE *);
 @ Now comes the problem of deciding which file to read from next.
 Recall that the actual text that \.{CWEB} should process comes from two
 streams: a |web_file|, which can contain possibly nested include
 char file_name[max_include_depth][max_file_name_length];
   /* stack of non-change file names */
 char change_file_name[max_file_name_length]; /* name of change file */
-char alt_web_file_name[max_file_name_length]; /* alternate name to try */
+static char alt_web_file_name[max_file_name_length]; /* alternate name to try */
 int line[max_include_depth]; /* number of current line in the stacked files */
 int change_line; /* number of current line in change file */
 int change_depth; /* where \.{@@y} originated during a change */
   strncmp(buffer, change_buffer, (size_t)(limit-buffer)))
 @<Global var...@>=
-char change_buffer[buf_size]; /* next line of |change_file| */
+static char change_buffer[buf_size]; /* next line of |change_file| */
-char *change_limit; /* points to the last character in |change_buffer| */
+static char *change_limit; /* points to the last character in |change_buffer| */
 @ Procedure |prime_the_change_buffer|
 sets |change_buffer| in preparation for the next matching operation.
 the change file is exhausted. This procedure is called only when
 |changing| is |true|; hence error messages will be reported correctly.
-@<Predecl...@>=
+@c
-static void prime_the_change_buffer(void);@/
-@ @c
 static void
 prime_the_change_buffer(void)
 {
   @<Move |buffer| and |limit| to |change_buffer| and |change_limit|@>@;
 }
+@ @<Predecl...@>=@+static void prime_the_change_buffer(void);
 @ While looking for a line that begins with \.{@@x} in the change file, we
 allow lines that begin with \.{@@}, as long as they don't begin with \.{@@y},
 \.{@@z}, or \.{@@i} (which would probably mean that the change file is fouled up).
 When a match is found, the current section is marked as changed unless
 the first line after the \.{@@x} and after the \.{@@y} both start with
-either |'@@*'| or |'@@ '| (possibly preceded by whitespace).
+either `\.{@@*}' or `\.{@@\ }' (possibly preceded by whitespace).
 This procedure is called only when |buffer<limit|, i.e., when the
 current line is nonempty.
   if (*loc=='@@' && (xisspace(*(loc+1)) || *(loc+1)=='*')) change_pending=b;
 }
-@<Predecl...@>=
+@c
-static void check_change(void);@/
-@ @c
 static void
 check_change(void) /* switches to |change_file| if the buffers match */
 {
   }
 }
+@ @<Predecl...@>=@+static void check_change(void);
 @ @<If the current line starts with \.{@@y}...@>=
 if (xyz_code=='x' || xyz_code=='z') {
   loc=buffer+2; err_print("! Where is the matching @@y?");
 we want to keep |name_ptr<=name_dir_end| and |byte_ptr<=byte_mem_end|.
 @<Global var...@>=
-name_pointer name_ptr; /* first unused position in |name_dir| */
 char *byte_ptr; /* first unused position in |byte_mem| */
+name_pointer name_ptr; /* first unused position in |name_dir| */
 @ @<Init...@>=
 name_dir->byte_start=byte_ptr=byte_mem; /* position zero in both arrays */
 @<Predecl...@>=
 static int web_strcmp(char *,int,char *,int);@/
 static name_pointer add_section_name(name_pointer,int,char *,char *,int);@/
-static void extend_section_name(name_pointer,char *,char *,int);@/
+static void extend_section_name(name_pointer,char *,char *,int);
 @ @c
 static int web_strcmp(@t\1\1@> /* fuller comparison than |strcmp| */
 @d bad_extension 5
-@<Predec...@>=
+@c
-static int section_name_cmp(char **,int,name_pointer);@/
-@ @c
 static int section_name_cmp(@t\1\1@>
 char **pfirst, /* pointer to beginning of comparison string */
 int len, /* length of string */
   }
 }
+@ @<Predec...@>=@+static int section_name_cmp(char **,int,name_pointer);
 @** Reporting errors to the user.
 A global variable called |history| will contain one of four values
 at the end of every run: |spotless| means that no unusual messages were
 @<Set the default options common to \.{CTANGLE} and \.{CWEAVE}@>=
 show_banner=show_happiness=show_progress=make_xrefs=true;@/
-show_stats=false;@/
+show_stats=false;
 @ We now must look at the command line arguments and set the file names
 accordingly.  At least one file name must be present: the \.{CWEB}
 If there's a third file name, it will be the output file.
-@<Pred...@>=
+@c
-static void scan_args(void);@/
-@ @c
 static void
 scan_args(void)
 {
   if (!found_web) @<Print usage error message and quit@>@;
 }
+@ @<Pred...@>=@+static void scan_args(void);
 @ We use all of |*argv| for the |web_file_name| if there is a |'.'| in it,
 otherwise we add |".w"|. If this file can't be opened, we prepare an
 |alt_web_file_name| by adding |"web"| after the dot.

ctang-bs.ch+8−8

@@ -17,12 +17,12 @@ by using "huge" pointers. · 16 unmodified lines
17	The ``banner line'' defined here should be changed whenever \.{CTANGLE}	17	The ``banner line'' defined here should be changed whenever \.{CTANGLE}
18	is modified.	18	is modified.
19		19
20	@d banner "This is CTANGLE (Version 4.1)"	20	@d banner "This is CTANGLE (Version 4.2)"
21	@y	21	@y
22	The ``banner line'' defined here should be changed whenever \.{CTANGLE}	22	The ``banner line'' defined here should be changed whenever \.{CTANGLE}
23	is modified.	23	is modified.
24		24
25	@d banner "This is CTANGLE (Version 4.1pc/big)"	25	@d banner "This is CTANGLE (Version 4.2pc/big)"
26	@z	26	@z
27		27
28		28
@@ -141,13 +141,13 @@ typedef text *text_pointer; · 112 unmodified lines
141		141
142		142
143	@x Section 17.	143	@x Section 17.
144	eight_bits tok_mem[max_toks];	144	static eight_bits tok_mem[max_toks];
145	eight_bits *tok_mem_end=tok_mem+max_toks-1;	145	static eight_bits *tok_mem_end=tok_mem+max_toks-1;
146	eight_bits tok_ptr; / first unused position in \|tok_mem\| */	146	static eight_bits tok_ptr; / first unused position in \|tok_mem\| */
147	@y	147	@y
148	eight_bits huge tok_mem[max_toks];	148	static eight_bits huge tok_mem[max_toks];
149	eight_bits huge* tok_mem_end;	149	static eight_bits huge* tok_mem_end;
150	eight_bits huge* tok_ptr; /* first unused position in \|tok_mem\| */	150	static eight_bits huge* tok_ptr; /* first unused position in \|tok_mem\| */
151	@z	151	@z
152		152
153		153

ctang-pc.ch+2−2

@@ -9,9 +9,9 @@ that allows >64K arrays. If you need lots of bytes and toks, try the · 8 unmodified lines
9	alternate change files with -bs suffix instead of -pc.	9	alternate change files with -bs suffix instead of -pc.
10		10
11	@x section 1	11	@x section 1
12	@d banner "This is CTANGLE (Version 4.1)"	12	@d banner "This is CTANGLE (Version 4.2)"
13	@y	13	@y
14	@d banner "This is CTANGLE (Version 4.1pc)"	14	@d banner "This is CTANGLE (Version 4.2pc)"
15	@z	15	@z
16	@x section 4	16	@x section 4
17	@d max_bytes 1000000 /* the number of bytes in identifiers,	17	@d max_bytes 1000000 /* the number of bytes in identifiers,

ctang-ql.ch+4−4

@@ -7,15 +7,15 @@ ex <dev_>cc;"-v -h -c -=500000 ctangle_c" · 6 unmodified lines
7		7
8		8
9	@x	9	@x
10	\def\title{CTANGLE (Version 4.1)}	10	\def\title{CTANGLE (Version 4.2)}
11	@y	11	@y
12	\def\title{CTANGLE (QL Version 4.1)}	12	\def\title{CTANGLE (QL Version 4.2)}
13	@z	13	@z
14		14
15	@x section 1	15	@x section 1
16	@d banner "This is CTANGLE (Version 4.1)"	16	@d banner "This is CTANGLE (Version 4.2)"
17	@y	17	@y
18	@d banner "This is CTANGLE (QL Version 4.1)"	18	@d banner "This is CTANGLE (QL Version 4.2)"
19	@z	19	@z
20		20
21	@x	21	@x

ctang-vms.ch+2−2

@@ -10,9 +10,9 @@ created: · 9 unmodified lines
10	(these changes not necessary for initial bootstrapping)	10	(these changes not necessary for initial bootstrapping)
11		11
12	@x section 1 (01-FEB-1992 ST)	12	@x section 1 (01-FEB-1992 ST)
13	@d banner "This is CTANGLE (Version 4.1)"	13	@d banner "This is CTANGLE (Version 4.2)"
14	@y	14	@y
15	@d banner "This is CTANGLE (VAX/VMS Version 4.1)"	15	@d banner "This is CTANGLE (VAX/VMS Version 4.2)"
16	@z	16	@z
17		17
18	@x section 3 (01-FEB-1992 ST)	18	@x section 3 (01-FEB-1992 ST)

ctang-w32.ch+2−2

@@ -4,9 +4,9 @@ This is the change file for CWEB's CTANGLE under Win32 · 3 unmodified lines
4	Changes necessary for compiling with Borland C/C++	4	Changes necessary for compiling with Borland C/C++
5		5
6	@x section 1	6	@x section 1
7	@d banner "This is CTANGLE (Version 4.1)"	7	@d banner "This is CTANGLE (Version 4.2)"
8	@y	8	@y
9	@d banner "This is CTANGLE (Version 4.1win32)"	9	@d banner "This is CTANGLE (Version 4.2win32)"
10	@z	10	@z
11		11
12	@x	12	@x

ctangle.c+216−225

 /*:4*/
 #line 67 "ctangle.w"
-#define banner "This is CTANGLE (Version 4.1)" \
+#define banner "This is CTANGLE (Version 4.2)" \
 #define ctangle false
 #define cweave true \
 #define xisupper(c) (isupper((eight_bits) c) &&((eight_bits) c<0200) )
 #define xisxdigit(c) (isxdigit((eight_bits) c) &&((eight_bits) c<0200) )  \
+#define max_include_depth 10 \
+#define max_file_name_length 1024
+#define cur_file file[include_depth]
+#define cur_file_name file_name[include_depth]
+#define cur_line line[include_depth]
+#define web_file file[0]
+#define web_file_name file_name[0] \
 #define length(c) (size_t) ((c+1) ->byte_start-(c) ->byte_start)
 #define print_id(c) term_write((c) ->byte_start,length((c) ) )
 #define llink link
 #define confusion(s) fatal("! This can't happen: ",s)  \
  \
-#define max_include_depth 10 \
-#define max_file_name_length 1024
-#define cur_file file[include_depth]
-#define cur_file_name file_name[include_depth]
-#define cur_line line[include_depth]
-#define web_file file[0]
-#define web_file_name file_name[0] \
 #define show_banner flags['b']
 #define show_progress flags['p']
 #define show_stats flags['s']
 extern char*limit;
 /*:6*//*7:*/
-#line 102 "common.h"
+#line 105 "common.h"
+extern int include_depth;
+extern FILE*file[];
+extern FILE*change_file;
+extern char file_name[][max_file_name_length];
+extern char change_file_name[];
+extern int line[];
+extern int change_line;
+extern int change_depth;
+extern boolean input_has_ended;
+extern boolean changing;
+extern boolean web_file_open;
+/*:7*//*9:*/
+#line 125 "common.h"
+extern sixteen_bits section_count;
+extern boolean changed_section[];
+extern boolean change_pending;
+extern boolean print_where;
+/*:9*//*10:*/
+#line 139 "common.h"
 typedef struct name_info{
 char*byte_start;
 extern hash_pointer hash_end;
 extern hash_pointer h;
-/*:7*//*9:*/
+/*:10*//*12:*/
-#line 146 "common.h"
+#line 183 "common.h"
 extern int history;
-/*:9*//*11:*/
+/*:12*//*14:*/
-#line 166 "common.h"
+#line 199 "common.h"
-extern int include_depth;
+extern int argc;
-extern FILE*file[];
+extern char**argv;
-extern FILE*change_file;
 extern char C_file_name[];
 extern char tex_file_name[];
 extern char idx_file_name[];
 extern char scn_file_name[];
-extern char file_name[][max_file_name_length];
-extern char change_file_name[];
-extern int line[];
-extern int change_line;
-extern int change_depth;
-extern boolean input_has_ended;
-extern boolean changing;
-extern boolean web_file_open;
-/*:11*//*13:*/
-#line 190 "common.h"
-extern sixteen_bits section_count;
-extern boolean changed_section[];
-extern boolean change_pending;
-extern boolean print_where;
-/*:13*//*14:*/
-#line 203 "common.h"
-extern int argc;
-extern char**argv;
 extern boolean flags[];
 /*:14*//*15:*/
 typedef text*text_pointer;
 /*:19*//*31:*/
-#line 270 "ctangle.w"
+#line 269 "ctangle.w"
 typedef struct{
 eight_bits*end_field;
 /*20:*/
 #line 129 "ctangle.w"
-text text_info[max_texts];
+static text text_info[max_texts];
-text_pointer text_info_end= text_info+max_texts-1;
+static text_pointer text_info_end= text_info+max_texts-1;
-text_pointer text_ptr;
+static text_pointer text_ptr;
-eight_bits tok_mem[max_toks];
+static eight_bits tok_mem[max_toks];
-eight_bits*tok_mem_end= tok_mem+max_toks-1;
+static eight_bits*tok_mem_end= tok_mem+max_toks-1;
-eight_bits*tok_ptr;
+static eight_bits*tok_ptr;
 /*:20*//*26:*/
 #line 198 "ctangle.w"
-text_pointer last_unnamed;
+static text_pointer last_unnamed;
 /*:26*//*32:*/
-#line 286 "ctangle.w"
+#line 285 "ctangle.w"
-output_state cur_state;
+static output_state cur_state;
-output_state stack[stack_size+1];
+static output_state stack[stack_size+1];
-stack_pointer stack_end= stack+stack_size;
+static stack_pointer stack_end= stack+stack_size;
-stack_pointer stack_ptr;
+static stack_pointer stack_ptr;
 /*:32*//*37:*/
-#line 362 "ctangle.w"
+#line 361 "ctangle.w"
-int cur_val;
+static int cur_val;
 /*:37*//*42:*/
-#line 454 "ctangle.w"
+#line 452 "ctangle.w"
-eight_bits out_state;
+static eight_bits out_state;
-boolean protect;
+static boolean protect;
 /*:42*//*45:*/
-#line 486 "ctangle.w"
+#line 483 "ctangle.w"
-name_pointer output_files[max_files];
+static name_pointer output_files[max_files];
-name_pointer*cur_out_file,*end_output_files,*an_output_file;
+static name_pointer*cur_out_file,*end_output_files,*an_output_file;
-char cur_section_name_char;
+static char cur_section_name_char;
-char output_file_name[longest_name+1];
+static char output_file_name[longest_name+1];
 /*:45*//*52:*/
-#line 586 "ctangle.w"
+#line 582 "ctangle.w"
-boolean output_defs_seen= false;
+static boolean output_defs_seen= false;
 /*:52*//*57:*/
-#line 695 "ctangle.w"
+#line 691 "ctangle.w"
-char translit[128][translit_length];
+static char translit[128][translit_length];
 /*:57*//*62:*/
-#line 774 "ctangle.w"
+#line 770 "ctangle.w"
-eight_bits ccode[256];
+static eight_bits ccode[256];
 /*:62*//*66:*/
-#line 834 "ctangle.w"
+#line 830 "ctangle.w"
-boolean comment_continues= false;
+static boolean comment_continues= false;
 /*:66*//*68:*/
-#line 873 "ctangle.w"
+#line 869 "ctangle.w"
-name_pointer cur_section_name;
+static name_pointer cur_section_name;
-boolean no_where;
+static boolean no_where;
 /*:68*//*82:*/
-#line 1187 "ctangle.w"
+#line 1182 "ctangle.w"
-text_pointer cur_text;
+static text_pointer cur_text;
-eight_bits next_control;
+static eight_bits next_control;
 /*:82*/
 #line 71 "ctangle.w"
 /*8:*/
-#line 125 "common.h"
+#line 119 "common.h"
+extern boolean get_line(void);
+extern void check_complete(void);
+extern void reset_input(void);
+/*:8*//*11:*/
+#line 162 "common.h"
 extern boolean names_match(name_pointer,const char*,size_t,eight_bits);
 extern name_pointer id_lookup(const char*,const char*,char);
 extern void print_section_name(name_pointer);
 extern void sprint_section_name(char*,name_pointer);
-/*:8*//*10:*/
+/*:11*//*13:*/
-#line 149 "common.h"
+#line 186 "common.h"
 extern int wrap_up(void);
 extern void err_print(const char*);
 extern void fatal(const char*,const char*);
 extern void overflow(const char*);
-/*:10*//*12:*/
+/*:13*//*16:*/
-#line 184 "common.h"
-extern boolean get_line(void);
-extern void check_complete(void);
-extern void reset_input(void);
-/*:12*//*16:*/
 #line 223 "common.h"
 extern void common_init(void);
 extern void print_stats(void);
-/*:16*//*29:*/
+/*:16*//*30:*/
-#line 231 "ctangle.w"
+#line 241 "ctangle.w"
 static void store_two_bytes(sixteen_bits);
-/*:29*//*34:*/
+/*:30*//*35:*/
-#line 310 "ctangle.w"
+#line 324 "ctangle.w"
 static void push_level(name_pointer);
 static void pop_level(boolean);
-/*:34*//*38:*/
+/*:35*//*39:*/
-#line 369 "ctangle.w"
+#line 397 "ctangle.w"
 static void get_output(void);
-/*:38*//*43:*/
+/*:39*//*44:*/
-#line 462 "ctangle.w"
+#line 473 "ctangle.w"
 static void flush_buffer(void);
-/*:43*//*48:*/
+/*:44*//*49:*/
-#line 517 "ctangle.w"
+#line 549 "ctangle.w"
 static void phase_two(void);
-/*:48*//*53:*/
+/*:49*//*53:*/
-#line 589 "ctangle.w"
+#line 585 "ctangle.w"
 static void output_defs(void);
 static void out_char(eight_bits);
-/*:53*//*64:*/
+/*:53*//*65:*/
-#line 798 "ctangle.w"
+#line 810 "ctangle.w"
 static eight_bits skip_ahead(void);
 static boolean skip_comment(boolean);
-/*:64*//*69:*/
+/*:65*//*70:*/
-#line 885 "ctangle.w"
+#line 924 "ctangle.w"
 static eight_bits get_next(void);
-/*:69*//*83:*/
+/*:70*//*84:*/
-#line 1191 "ctangle.w"
+#line 1208 "ctangle.w"
 static void scan_repl(eight_bits);
-/*:83*//*90:*/
+/*:84*//*91:*/
-#line 1348 "ctangle.w"
+#line 1379 "ctangle.w"
 static void scan_section(void);
-/*:90*//*98:*/
+/*:91*//*99:*/
-#line 1455 "ctangle.w"
+#line 1460 "ctangle.w"
 static void phase_one(void);
-/*:98*//*100:*/
+/*:99*//*101:*/
-#line 1473 "ctangle.w"
+#line 1494 "ctangle.w"
 static void skip_limbo(void);
-/*:100*/
+/*:101*/
 #line 72 "ctangle.w"
 last_unnamed= text_info;text_info->text_link= 0;
 /*:27*//*46:*/
-#line 496 "ctangle.w"
+#line 493 "ctangle.w"
 cur_out_file= end_output_files= output_files+max_files;
 /*:46*//*58:*/
-#line 698 "ctangle.w"
+#line 694 "ctangle.w"
 {
 int i;
 }
 /*:58*//*63:*/
-#line 777 "ctangle.w"
+#line 773 "ctangle.w"
 {
 int c;
 for(c= 0;c<256;c++)ccode[c]= ignore;
 }
 /*:63*//*78:*/
-#line 1108 "ctangle.w"
+#line 1103 "ctangle.w"
 section_text[0]= ' ';
 /*:78*/
 void
 init_p(name_pointer p,eight_bits t){(void)p;(void)t;}
-/*:25*//*30:*/
+/*:25*//*29:*/
-#line 234 "ctangle.w"
+#line 231 "ctangle.w"
-void
+static void
 store_two_bytes(
 sixteen_bits x)
 {
 *tok_ptr++= x&0377;
 }
-/*:30*//*35:*/
+/*:29*//*34:*/
-#line 314 "ctangle.w"
+#line 309 "ctangle.w"
 static void
 push_level(
 }
 }
-/*:35*//*36:*/
+/*:34*//*36:*/
-#line 333 "ctangle.w"
+#line 332 "ctangle.w"
 static void
 pop_level(
 if(stack_ptr> stack)cur_state= *stack_ptr;
 }
-/*:36*//*39:*/
+/*:36*//*38:*/
-#line 372 "ctangle.w"
+#line 368 "ctangle.w"
 static void
 get_output(void)
 case 0:cur_val= a;out_char(identifier);break;
 case 1:if(a==output_defs_flag)output_defs();
 else/*40:*/
-#line 404 "ctangle.w"
+#line 402 "ctangle.w"
 {
 a-= 024000;
 }
 /*:40*/
-#line 393 "ctangle.w"
+#line 389 "ctangle.w"
 break;
 default:cur_val= a-050000;if(cur_val> 0)cur_section= cur_val;
 }
 }
-/*:39*//*44:*/
+/*:38*//*43:*/
-#line 465 "ctangle.w"
+#line 460 "ctangle.w"
 static void
 flush_buffer(void)
 cur_line++;
 }
-/*:44*//*49:*/
+/*:43*//*48:*/
-#line 520 "ctangle.w"
+#line 514 "ctangle.w"
 static void
 phase_two(void){
 web_file_open= false;
 cur_line= 1;
 /*33:*/
-#line 299 "ctangle.w"
+#line 298 "ctangle.w"
 stack_ptr= stack+1;cur_name= name_dir;cur_repl= text_info->text_link+text_info;
 cur_byte= cur_repl->tok_start;cur_end= (cur_repl+1)->tok_start;cur_section= 0;
 /*:33*/
-#line 525 "ctangle.w"
+#line 519 "ctangle.w"
 /*51:*/
-#line 582 "ctangle.w"
+#line 578 "ctangle.w"
 if(!output_defs_seen)
 output_defs();
 /*:51*/
-#line 526 "ctangle.w"
+#line 520 "ctangle.w"
 if(text_info->text_link==0&&cur_out_file==end_output_files){
 fputs("\n! No program text was specified.",stdout);mark_harmless;
 while(stack_ptr> stack)get_output();
 flush_buffer();
 writeloop:/*50:*/
-#line 559 "ctangle.w"
+#line 555 "ctangle.w"
 for(an_output_file= end_output_files;an_output_file> cur_out_file;){
 an_output_file--;
 }
 /*:50*/
-#line 547 "ctangle.w"
+#line 541 "ctangle.w"
 if(show_happiness){
 if(show_progress)new_line;
 }
 }
-/*:49*//*54:*/
+/*:48*//*54:*/
-#line 593 "ctangle.w"
+#line 589 "ctangle.w"
 static void
 output_defs(void)
 }
 /*:54*//*55:*/
-#line 636 "ctangle.w"
+#line 632 "ctangle.w"
 static void
 out_char(
 if(protect||out_state==verbatim)C_putc('\\');
 flush_buffer();if(out_state!=verbatim)out_state= normal;break;
 /*59:*/
-#line 704 "ctangle.w"
+#line 700 "ctangle.w"
 case identifier:
 if(out_state==num_or_id)C_putc(' ');
 out_state= num_or_id;break;
 /*:59*/
-#line 647 "ctangle.w"
+#line 643 "ctangle.w"
 /*60:*/
-#line 717 "ctangle.w"
+#line 713 "ctangle.w"
 case section_number:
 if(cur_val> 0)C_printf("/*%d:*/",cur_val);
 break;
 /*:60*/
-#line 648 "ctangle.w"
+#line 644 "ctangle.w"
 /*56:*/
-#line 666 "ctangle.w"
+#line 662 "ctangle.w"
 case plus_plus:C_putc('+');C_putc('+');out_state= normal;break;
 case minus_minus:C_putc('-');C_putc('-');out_state= normal;break;
 break;
 /*:56*/
-#line 649 "ctangle.w"
+#line 645 "ctangle.w"
 case'=':case'>':C_putc(cur_char);C_putc(' ');
 out_state= normal;break;
 }
 }
-/*:55*//*65:*/
+/*:55*//*64:*/
-#line 802 "ctangle.w"
+#line 794 "ctangle.w"
 static eight_bits
 skip_ahead(void)
 }
 }
-/*:65*//*67:*/
+/*:64*//*67:*/
-#line 837 "ctangle.w"
+#line 833 "ctangle.w"
 static boolean skip_comment(
 boolean is_long_comment)
 }
 }
-/*:67*//*70:*/
+/*:67*//*69:*/
-#line 888 "ctangle.w"
+#line 881 "ctangle.w"
 static eight_bits
 get_next(void)
 else if(print_where&&!no_where){
 print_where= false;
 /*85:*/
-#line 1220 "ctangle.w"
+#line 1214 "ctangle.w"
 store_two_bytes(0150000);
 if(changing&&include_depth==change_depth){
 app_repl(a_l%0400);}
 /*:85*/
-#line 900 "ctangle.w"
+#line 893 "ctangle.w"
 }
 else return'\n';
 }
 loc++;
 if(xisdigit(c)||c=='.')/*73:*/
-#line 969 "ctangle.w"
+#line 964 "ctangle.w"
 {
 id_first= loc-1;
 if(*id_first=='.'&&!xisdigit(*loc))goto mistake;
 }
 /*:73*/
-#line 912 "ctangle.w"
+#line 905 "ctangle.w"
 else if(c=='\''||c=='"'
 ||((c=='L'||c=='u'||c=='U')&&(*loc=='\''||*loc=='"'))
 ||((c=='u'&&*loc=='8')&&(*(loc+1)=='\''||*(loc+1)=='"')))
 /*74:*/
-#line 997 "ctangle.w"
+#line 992 "ctangle.w"
 {
 char delim= c;
 id_first= section_text+1;
 }
 /*:74*/
-#line 916 "ctangle.w"
+#line 909 "ctangle.w"
 else if(isalpha(c)||isxalpha(c)||ishigh(c))
 /*72:*/
-#line 962 "ctangle.w"
+#line 957 "ctangle.w"
 {
 id_first= --loc;
 while(isalpha((eight_bits)*++loc)||isdigit((eight_bits)*loc)
 }
 /*:72*/
-#line 918 "ctangle.w"
+#line 911 "ctangle.w"
 else if(c=='@')/*75:*/
-#line 1042 "ctangle.w"
+#line 1037 "ctangle.w"
 {
 c= ccode[(eight_bits)*loc++];
 switch(c){
 case section_name:
 cur_section_name_char= *(loc-1);
 /*77:*/
-#line 1090 "ctangle.w"
+#line 1085 "ctangle.w"
 {
 char*k;
 /*79:*/
-#line 1110 "ctangle.w"
+#line 1105 "ctangle.w"
 k= section_text;
 while(true){
 }
 c= *loc;
 /*80:*/
-#line 1134 "ctangle.w"
+#line 1129 "ctangle.w"
 if(c=='@'){
 c= *(loc+1);
 }
 /*:80*/
-#line 1119 "ctangle.w"
+#line 1114 "ctangle.w"
 loc++;if(k<section_text_end)k++;
 if(xisspace(c)){
 if(*k==' '&&k> section_text)k--;
 /*:79*/
-#line 1092 "ctangle.w"
+#line 1087 "ctangle.w"
 if(k-section_text> 3&&strncmp(k-2,"...",3)==0)
 cur_section_name= section_lookup(section_text+1,k-3,1);
 else cur_section_name= section_lookup(section_text+1,k,0);
 if(cur_section_name_char=='(')
 /*47:*/
-#line 500 "ctangle.w"
+#line 497 "ctangle.w"
 {
 for(an_output_file= cur_out_file;
 }
 /*:47*/
-#line 1098 "ctangle.w"
+#line 1093 "ctangle.w"
 return section_name;
 }
 /*:77*/
-#line 1056 "ctangle.w"
+#line 1051 "ctangle.w"
 case string:/*81:*/
-#line 1156 "ctangle.w"
+#line 1151 "ctangle.w"
 {
 id_first= loc++;*(limit+1)= '@';*(limit+2)= '>';
 while(*loc!='@'||*(loc+1)!='>')loc++;
 }
 /*:81*/
-#line 1057 "ctangle.w"
+#line 1052 "ctangle.w"
 case ord:/*76:*/
-#line 1069 "ctangle.w"
+#line 1064 "ctangle.w"
 id_first= loc;
 if(*loc=='\\'){
 return ord;
 /*:76*/
-#line 1058 "ctangle.w"
+#line 1053 "ctangle.w"
 default:return c;
 }
 }
 /*:75*/
-#line 919 "ctangle.w"
+#line 912 "ctangle.w"
 else if(xisspace(c)){
 if(!preprocessing||loc> limit)continue;
 }
 else if(c=='#'&&loc==buffer+1)preprocessing= 1;
 mistake:/*71:*/
-#line 940 "ctangle.w"
+#line 935 "ctangle.w"
 switch(c){
 case'+':if(*loc=='+')compress(plus_plus);break;
 }
 /*:71*/
-#line 926 "ctangle.w"
+#line 919 "ctangle.w"
 return c;
 }
 }
-/*:70*//*84:*/
+/*:69*//*83:*/
-#line 1194 "ctangle.w"
+#line 1186 "ctangle.w"
 static void
 scan_repl(
 {
 sixteen_bits a;
 if(t==section_name){/*85:*/
-#line 1220 "ctangle.w"
+#line 1214 "ctangle.w"
 store_two_bytes(0150000);
 if(changing&&include_depth==change_depth){
 app_repl(a_l%0400);}
 /*:85*/
-#line 1200 "ctangle.w"
+#line 1192 "ctangle.w"
 }
 while(true)switch(a= get_next()){
 /*86:*/
-#line 1233 "ctangle.w"
+#line 1227 "ctangle.w"
 case identifier:a= id_lookup(id_first,id_loc,0)-name_dir;
 app_repl((a/0400)+0200);
 case section_name:if(t!=section_name)goto done;
 else{
 /*87:*/
-#line 1266 "ctangle.w"
+#line 1260 "ctangle.w"
 {
 char*try_loc= loc;
 while(*try_loc==' '&&try_loc<limit)try_loc++;
 }
 /*:87*/
-#line 1239 "ctangle.w"
+#line 1233 "ctangle.w"
 a= cur_section_name-name_dir;
 app_repl((a/0400)+0250);
 app_repl(a%0400);
 /*85:*/
-#line 1220 "ctangle.w"
+#line 1214 "ctangle.w"
 store_two_bytes(0150000);
 if(changing&&include_depth==change_depth){
 app_repl(a_l%0400);}
 /*:85*/
-#line 1243 "ctangle.w"
+#line 1237 "ctangle.w"
 break;
 }
 case output_defs_code:if(t!=section_name)err_print("! Misplaced @h");
 app_repl((a/0400)+0200);
 app_repl(a%0400);
 /*85:*/
-#line 1220 "ctangle.w"
+#line 1214 "ctangle.w"
 store_two_bytes(0150000);
 if(changing&&include_depth==change_depth){
 app_repl(a_l%0400);}
 /*:85*/
-#line 1252 "ctangle.w"
+#line 1246 "ctangle.w"
 }
 break;
 case constant:case string:
 /*88:*/
-#line 1277 "ctangle.w"
+#line 1271 "ctangle.w"
 app_repl(a);
 while(id_first<id_loc){
 app_repl(a);break;
 /*:88*/
-#line 1256 "ctangle.w"
+#line 1250 "ctangle.w"
 case ord:
 /*89:*/
-#line 1293 "ctangle.w"
+#line 1287 "ctangle.w"
 {
 int c= (eight_bits)*id_first;
 if(c=='\\'){
 break;
 /*:89*/
-#line 1258 "ctangle.w"
+#line 1252 "ctangle.w"
 case definition:case format_code:case begin_C:if(t!=section_name)goto done;
 else{
 case new_section:goto done;
 /*:86*/
-#line 1205 "ctangle.w"
+#line 1197 "ctangle.w"
 case')':app_repl(a);
 if(t==macro)app_repl(' ');
 cur_text= text_ptr;(++text_ptr)->tok_start= tok_ptr;
 }
-/*:84*//*91:*/
+/*:83*//*90:*/
-#line 1355 "ctangle.w"
+#line 1346 "ctangle.w"
 static void
 scan_section(void)
 next_control= 0;
 while(true){
 /*92:*/
-#line 1394 "ctangle.w"
+#line 1387 "ctangle.w"
 while(next_control<definition)
 }
 /*:92*/
-#line 1369 "ctangle.w"
+#line 1360 "ctangle.w"
 if(next_control==definition){
 /*93:*/
-#line 1401 "ctangle.w"
+#line 1394 "ctangle.w"
 {
 while((next_control= get_next())=='\n');
 if(next_control!=identifier){
 }
 /*:93*/
-#line 1371 "ctangle.w"
+#line 1362 "ctangle.w"
 continue;
 }
 if(next_control==section_name){
 p= cur_section_name;
 /*94:*/
-#line 1426 "ctangle.w"
+#line 1419 "ctangle.w"
 while((next_control= get_next())=='+');
 if(next_control!='='&&next_control!=eq_eq)
 continue;
 /*:94*/
-#line 1379 "ctangle.w"
+#line 1370 "ctangle.w"
 break;
 }
 }
 no_where= print_where= false;
 /*95:*/
-#line 1431 "ctangle.w"
+#line 1424 "ctangle.w"
 /*96:*/
-#line 1436 "ctangle.w"
+#line 1429 "ctangle.w"
 store_two_bytes((sixteen_bits)(0150000+section_count));
 /*:96*/
-#line 1432 "ctangle.w"
+#line 1425 "ctangle.w"
 scan_repl(section_name);
 /*97:*/
-#line 1440 "ctangle.w"
+#line 1433 "ctangle.w"
 if(p==name_dir||p==0){
 (last_unnamed)->text_link= cur_text-text_info;last_unnamed= cur_text;
 /*:97*/
-#line 1434 "ctangle.w"
+#line 1427 "ctangle.w"
 /*:95*/
-#line 1385 "ctangle.w"
+#line 1376 "ctangle.w"
 }
-/*:91*//*99:*/
+/*:90*//*98:*/
-#line 1458 "ctangle.w"
+#line 1448 "ctangle.w"
 static void
 phase_one(void){
 phase= 2;
 }
-/*:99*//*101:*/
+/*:98*//*100:*/
-#line 1476 "ctangle.w"
+#line 1465 "ctangle.w"
 static void
 skip_limbo(void)
 if(ccode[(eight_bits)c]==new_section)break;
 switch(ccode[(eight_bits)c]){
 case translit_code:/*102:*/
-#line 1505 "ctangle.w"
+#line 1496 "ctangle.w"
 while(xisspace(*loc)&&loc<limit)loc++;
 loc+= 3;
 }
 /*:102*/
-#line 1489 "ctangle.w"
+#line 1478 "ctangle.w"
 break;
 case format_code:case'@':break;
 case control_text:if(c=='q'||c=='Q'){
 }
 }
-/*:101*//*103:*/
+/*:100*//*103:*/
-#line 1531 "ctangle.w"
+#line 1522 "ctangle.w"
 void
 print_stats(void){

ctangle.w+83−92

 % This program by Silvio Levy and Donald E. Knuth
 % is based on a program by Knuth.
 % It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.1 --- February 2021
+% Version 4.2 --- February 2021
 % Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
 \mathchardef\RA="3221 % right arrow
 \mathchardef\BA="3224 % double arrow
-\def\title{CTANGLE (Version 4.1)}
+\def\title{CTANGLE (Version 4.2)}
 \def\topofcontents{\null\vfill
   \centerline{\titlefont The {\ttitlefont CTANGLE} processor}
   \vskip 15pt
-  \centerline{(Version 4.1)}
+  \centerline{(Version 4.2)}
   \vfill}
 \def\botofcontents{\vfill
 \noindent
 The ``banner line'' defined here should be changed whenever \.{CTANGLE}
 is modified.
-@d banner "This is CTANGLE (Version 4.1)"
+@d banner "This is CTANGLE (Version 4.2)"
 @c
 @<Include files@>@/
 @h
 @<Common code for \.{CWEAVE} and \.{CTANGLE}@>@/
 @<Typedef declarations@>@/
-@<Global variables@>@/
+@<Private variables@>@/
-@<Predeclaration of procedures@>@/
+@<Predeclaration of procedures@>
 @ \.{CTANGLE} has a fairly straightforward outline.  It operates in
 two phases: First it reads the source file, saving the \CEE/ code in
 } text;
 typedef text *text_pointer;
-@ @<Glob...@>=
+@ @<Private...@>=
-text text_info[max_texts];
+static text text_info[max_texts];
-text_pointer text_info_end=text_info+max_texts-1;
+static text_pointer text_info_end=text_info+max_texts-1;
-text_pointer text_ptr; /* first unused position in |text_info| */
+static text_pointer text_ptr; /* first unused position in |text_info| */
-eight_bits tok_mem[max_toks];
+static eight_bits tok_mem[max_toks];
-eight_bits *tok_mem_end=tok_mem+max_toks-1;
+static eight_bits *tok_mem_end=tok_mem+max_toks-1;
-eight_bits *tok_ptr; /* first unused position in |tok_mem| */
+static eight_bits *tok_ptr; /* first unused position in |tok_mem| */
 @ @<Set init...@>=
 text_info->tok_start=tok_ptr=tok_mem;
 @d section_flag max_texts /* final |text_link| in section replacement texts */
-@<Glob...@>=
+@<Private...@>=
-text_pointer last_unnamed; /* most recent replacement text of unnamed section */
+static text_pointer last_unnamed; /* most recent replacement text of unnamed section */
 @ @<Set init...@>= last_unnamed=text_info; text_info->text_link=0;
 @ The following procedure is used to enter a two-byte value into
 |tok_mem| when a replacement text is being generated.
-@<Predecl...@>=
+@c
-static void store_two_bytes(sixteen_bits);@/
+static void
-@ @c
-void
 store_two_bytes(
 sixteen_bits x)
 {
   *tok_ptr++=x&0377; /* store low byte */
 }
+@ @<Predecl...@>=@+static void store_two_bytes(sixteen_bits);
 @** Stacks for output.  The output process uses a stack to keep track
 of what is going on at different ``levels'' as the sections are being
 written out.  Entries on this stack have five parts:
 @d cur_repl cur_state.repl_field /* pointer to current replacement text */
 @d cur_section cur_state.section_field /* current section number being expanded */
-@<Global...@>=
+@<Private...@>=
-output_state cur_state; /* |cur_end|, |cur_byte|, |cur_name|, |cur_repl|,
+static output_state cur_state; /* |cur_end|, |cur_byte|, |cur_name|, |cur_repl|,
   and |cur_section| */
-output_state stack[stack_size+1]; /* info for non-current levels */
+static output_state stack[stack_size+1]; /* info for non-current levels */
-stack_pointer stack_end=stack+stack_size; /* end of |stack| */
+static stack_pointer stack_end=stack+stack_size; /* end of |stack| */
-stack_pointer stack_ptr; /* first unused location in the output state stack */
+static stack_pointer stack_ptr; /* first unused location in the output state stack */
 @ To get the output process started, we will perform the following
 initialization steps. We may assume that |text_info->text_link| is nonzero,
 We assume that the \CEE/ compiler can copy structures.
 @^system dependencies@>
-@<Predecl...@>=
+@c
-static void push_level(name_pointer);@/
-static void pop_level(boolean);@/
-@ @c
 static void
 push_level(@t\1\1@> /* suspends the current level */
 name_pointer p@t\2\2@>)
   }
 }
+@ @<Predecl...@>=
+static void push_level(name_pointer);@/
+static void pop_level(boolean);
 @ When we come to the end of a replacement text, the |pop_level| subroutine
 does the right thing: It either moves to the continuation of this replacement
 text or returns the state to the most recently stacked level.
 @d section_number 0201 /* code returned by |get_output| for section numbers */
 @d identifier 0202 /* code returned by |get_output| for identifiers */
-@<Global...@>=
+@<Private...@>=
-int cur_val; /* additional information corresponding to output token */
+static int cur_val; /* additional information corresponding to output token */
 @ If |get_output| finds that no more output remains, it returns with
 |stack_ptr==stack|.
 @^high-bit character handling@>
-@<Predecl...@>=
+@c
-static void get_output(void);@/
-@ @c
 static void
 get_output(void) /* sends next token to |out_char| */
 {
   }
 }
+@ @<Predecl...@>=@+static void get_output(void);
 @ The user may have forgotten to give any \CEE/ text for a section name,
 or the \CEE/ text may have been associated with a different name by mistake.
 @d unbreakable 3 /* state associated with \.{@@\&} */
 @d verbatim 4 /* state in the middle of a string */
-@<Global...@>=
+@<Private...@>=
-eight_bits out_state; /* current status of partial output */
+static eight_bits out_state; /* current status of partial output */
-boolean protect; /* should newline characters be quoted? */
+static boolean protect; /* should newline characters be quoted? */
 @ Here is a routine that is invoked when we want to output the current line.
 During the output process, |cur_line| equals the number of the next line
 to be output.
-@<Predecl...@>=
+@c
-static void flush_buffer(void);@/
-@ @c
 static void
 flush_buffer(void) /* writes one line to output file */
 {
   cur_line++;
 }
+@ @<Predecl...@>=@+static void flush_buffer(void);
 @ Second, we have modified the original \.{TANGLE} so that it will write output
 on multiple files.
 If a section name is introduced in at least one place by \.{@@(}
 We write them out after we've done the unnamed section.
 @d max_files 256
-@<Glob...@>=
+@<Private...@>=
-name_pointer output_files[max_files];
+static name_pointer output_files[max_files];
-name_pointer *cur_out_file, *end_output_files, *an_output_file;
+static name_pointer *cur_out_file, *end_output_files, *an_output_file;
-char cur_section_name_char; /* is it |'<'| or |'('| */
+static char cur_section_name_char; /* is it |'<'| or |'('| */
-char output_file_name[longest_name+1]; /* name of the file */
+static char output_file_name[longest_name+1]; /* name of the file */
 @ We make |end_output_files| point just beyond the end of
 |output_files|. The stack pointer
 @* The big output switch.  Here then is the routine that does the
 output.
-@<Predecl...@>=
+@c
-static void phase_two(void);@/
-@ @c
 static void
 phase_two (void) {
   web_file_open=false;
   }
 }
+@ @<Predecl...@>=@+static void phase_two(void);
 @ To write the named output files, we proceed as for the unnamed
 section.
 The only subtlety is that we have to open each one.
   if (!output_defs_seen)
     output_defs();
-@ @<Glob...@>=
+@ @<Private...@>=
-boolean output_defs_seen=false;
+static boolean output_defs_seen=false;
 @ @<Predecl...@>=
 static void output_defs(void);@/
-static void out_char(eight_bits);@/
+static void out_char(eight_bits);
 @ @c
 static void
 @d translit_length 10
-@<Glo...@>=
+@<Private...@>=
-char translit[128][translit_length];
+static char translit[128][translit_length];
 @ @<Set init...@>=
 {
 @d section_name 0311 /* control code for `\.{@@<}' */
 @d new_section 0312 /* control code for `\.{@@\ }' and `\.{@@*}' */
-@<Global...@>=
+@<Private...@>=
-eight_bits ccode[256]; /* meaning of a char following \.{@@} */
+static eight_bits ccode[256]; /* meaning of a char following \.{@@} */
 @ @<Set ini...@>= {
   int c; /* must be |int| so the |for| loop will end */
 @ The |skip_ahead| procedure reads through the input at fairly high speed
 until finding the next non-ignorable control code, which it returns.
-@<Predecl...@>=
+@c
-static eight_bits skip_ahead(void);@/
-static boolean skip_comment(boolean);@/
-@ @c
 static eight_bits
 skip_ahead(void) /* skip to next control code */
 {
   }
 }
+@ @<Predecl...@>=
+static eight_bits skip_ahead(void);@/
+static boolean skip_comment(boolean);
 @ The |skip_comment| procedure reads through the input at somewhat high
 speed in order to pass over comments, which \.{CTANGLE} does not transmit
 to the output. If the comment is introduced by \.{/*}, |skip_comment|
 If |skip_comment| comes to the end of the section, it prints an error message.
 No comment, long or short, is allowed to contain `\.{@@\ }' or `\.{@@*}'.
-@<Global...@>=
+@<Private...@>=
-boolean comment_continues=false; /* are we scanning a comment? */
+static boolean comment_continues=false; /* are we scanning a comment? */
 @ @c
 static boolean skip_comment(@t\1\1@> /* skips over comments */
 @d constant 03
-@<Global...@>=
+@<Private...@>=
-name_pointer cur_section_name; /* name of section just scanned */
+static name_pointer cur_section_name; /* name of section just scanned */
-boolean no_where; /* suppress |print_where|? */
+static boolean no_where; /* suppress |print_where|? */
 @ As one might expect, |get_next| consists mostly of a big switch
 that branches to the various special cases that can arise.
 @d ishigh(c) ((eight_bits)(c)>0177)
 @^high-bit character handling@>
-@<Predecl...@>=
+@c
-static eight_bits get_next(void);@/
-@ @c
 static eight_bits
 get_next(void) /* produces the next input token */
 {
   }
 }
+@ @<Predecl...@>=@+static eight_bits get_next(void);
 @ The following code assigns values to the combinations \.{++},
 \.{--}, \.{->}, \.{>=}, \.{<=}, \.{==}, \.{<<}, \.{>>}, \.{!=}, \.{||} and
 \.{\&\&}, and to the \CPLUSPLUS/
 @d macro  0
 @d app_repl(c)  {if (tok_ptr==tok_mem_end) overflow("token"); *tok_ptr++=c;}
-@<Global...@>=
+@<Private...@>=
-text_pointer cur_text; /* replacement text formed by |scan_repl| */
+static text_pointer cur_text; /* replacement text formed by |scan_repl| */
-eight_bits next_control;
+static eight_bits next_control;
-@ @<Predecl...@>=
-static void scan_repl(eight_bits);@/
 @ @c
 static void
   cur_text=text_ptr; (++text_ptr)->tok_start=tok_ptr;
 }
+@ @<Predecl...@>=@+static void scan_repl(eight_bits);
 @ Here is the code for the line number: first a |sixteen_bits| equal
 to |0150000|; then the numeric line number; then a pointer to the
 file name.
   app_repl(a % 0400); break;
 case section_name: if (t!=section_name) goto done;
   else {
-    @<Was an `@@' missed here?@>@;
+    @<Was an `\.{@@}' missed here?@>@;
     a=cur_section_name-name_dir;
     app_repl((a / 0400)+0250);
     app_repl(a % 0400);
   }
 case new_section: goto done;
-@ @<Was an `@@'...@>= {
+@ @<Was an `\.{@@}'...@>= {
   char *try_loc=loc;
   while (*try_loc==' ' && try_loc<limit) try_loc++;
   if (*try_loc=='+' && try_loc<limit) try_loc++;
 uses |section_count| to keep track of the current section number; with luck,
 \.{CWEAVE} and \.{CTANGLE} will both assign the same numbers to sections.
-@<Predecl...@>=
+The body of |scan_section| is a loop where we look for control codes
-static void scan_section(void);@/
-@ The body of |scan_section| is a loop where we look for control codes
 that are significant to \.{CTANGLE}: those
 that delimit a definition, the \CEE/ part of a module, or a new module.
   @<Scan the \CEE/ part of the current section@>@;
 }
+@ @<Predecl...@>=@+static void scan_section(void);
 @ At the top of this loop, if |next_control==section_name|, the
 section name has already been scanned (see |@<Get control code
 and...@>|).  Thus, if we encounter |next_control==section_name| in the
 cur_text->text_link=section_flag;
   /* mark this replacement text as a nonmacro */
-@ @<Predec...@>=
-static void phase_one(void);@/
 @ @c
 static void
 phase_one(void) {
   phase=2;
 }
+@ @<Predec...@>=@+static void phase_one(void);
 @ Only a small subset of the control codes is legal in limbo, so limbo
 processing is straightforward.
-@<Predecl...@>=
+@c
-static void skip_limbo(void);@/
-@ @c
 static void
 skip_limbo(void)
 {
   }
 }
+@ @<Predecl...@>=@+static void skip_limbo(void);
 @ @<Read in transliteration of a character@>=
   while(xisspace(*loc)&&loc<limit) loc++;
   loc+=3;

cweav-bs.ch+23−23

cweav-man.ch+1−1

@@ -16,7 +16,7 @@ under the terms of a permission notice identical to this one. · 15 unmodified lines
16	}	16	}
17	@y	17	@y
18	\def\botofcontents{\vfill\titlefalse}	18	\def\botofcontents{\vfill\titlefalse}
19	\def\contentspagenumber{110}	19	\def\contentspagenumber{111}
20	\def\title{APPENDIX F: CWEAVE}	20	\def\title{APPENDIX F: CWEAVE}
21	\let\K=\leftarrow	21	\let\K=\leftarrow
22	@z	22	@z

cweav-pc.ch+2−2

@@ -11,9 +11,9 @@ that allows >64K arrays. (If you need lots more bytes, try the alternate · 10 unmodified lines
11	change files that have -bs in their name instead of -pc.)	11	change files that have -bs in their name instead of -pc.)
12		12
13	@x section 1	13	@x section 1
14	@d banner "This is CWEAVE (Version 4.1)"	14	@d banner "This is CWEAVE (Version 4.2)"
15	@y	15	@y
16	@d banner "This is CWEAVE (Version 4.1pc)"	16	@d banner "This is CWEAVE (Version 4.2pc)"
17	@z	17	@z
18		18
19	@x section 4	19	@x section 4

cweav-ql.ch+4−4

@@ -7,15 +7,15 @@ ex <dev_>cc;"-v -h -c =500000 cweave_c" · 6 unmodified lines
7		7
8		8
9	@x	9	@x
10	\def\title{CWEAVE (Version 4.1)}	10	\def\title{CWEAVE (Version 4.2)}
11	@y	11	@y
12	\def\title{CWEAVE (QL Version 4.1)}	12	\def\title{CWEAVE (QL Version 4.2)}
13	@z	13	@z
14		14
15	@x section 1	15	@x section 1
16	@d banner "This is CWEAVE (Version 4.1)"	16	@d banner "This is CWEAVE (Version 4.2)"
17	@y	17	@y
18	@d banner "This is CWEAVE (QL Version 4.1)"	18	@d banner "This is CWEAVE (QL Version 4.2)"
19	@z	19	@z
20		20
21	@x	21	@x

cweav-vms.ch+2−2

@@ -13,9 +13,9 @@ modified: · 12 unmodified lines
13	(also modified by Don Knuth to keep version numbers uptodate)	13	(also modified by Don Knuth to keep version numbers uptodate)
14		14
15	@x section 1 (01-FEB-1992 ST)	15	@x section 1 (01-FEB-1992 ST)
16	@d banner "This is CWEAVE (Version 4.1)"	16	@d banner "This is CWEAVE (Version 4.2)"
17	@y	17	@y
18	@d banner "This is CWEAVE (VAX/VMS Version 4.1)"	18	@d banner "This is CWEAVE (VAX/VMS Version 4.2)"
19	@z	19	@z
20		20
21	@x section 3 (01-FEB-1992 ST)	21	@x section 3 (01-FEB-1992 ST)

cweav-w32.ch+2−2

@@ -2,9 +2,9 @@ This is the change file for CWEB's CWEAVE under Win32 · 1 unmodified line
2	(Contributed by Fabrice Popineau, February 2002)	2	(Contributed by Fabrice Popineau, February 2002)
3		3
4	@x section 1	4	@x section 1
5	@d banner "This is CWEAVE (Version 4.1)"	5	@d banner "This is CWEAVE (Version 4.2)"
6	@y	6	@y
7	@d banner "This is CWEAVE (Version 4.1win32)"	7	@d banner "This is CWEAVE (Version 4.2win32)"
8	@z	8	@z
9		9
10	@x	10	@x

cweave.w+151−166

 % This program by Silvio Levy and Donald E. Knuth
 % is based on a program by Knuth.
 % It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.1 --- February 2021
+% Version 4.2 --- February 2021
 % Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
 \def\skipxTeX{\\{skip\_\TEX/}}
 \def\copyxTeX{\\{copy\_\TEX/}}
-\def\title{CWEAVE (Version 4.1)}
+\def\title{CWEAVE (Version 4.2)}
 \def\topofcontents{\null\vfill
   \centerline{\titlefont The {\ttitlefont CWEAVE} processor}
   \vskip 15pt
-  \centerline{(Version 4.1)}
+  \centerline{(Version 4.2)}
   \vfill}
 \def\botofcontents{\vfill
 \noindent
 The ``banner line'' defined here should be changed whenever \.{CWEAVE}
 is modified.
-@d banner "This is CWEAVE (Version 4.1)"
+@d banner "This is CWEAVE (Version 4.2)"
 @c @<Include files@>@/
 @h
 @<Common code for \.{CWEAVE} and \.{CTANGLE}@>@/
 @<Typedef declarations@>@/
-@<Global variables@>@/
+@<Private variables@>@/
 @<Predeclaration of procedures@>
 @ \.{CWEAVE} has a fairly straightforward outline.  It operates in
   phase_one(); /* read all the user's text and store the cross-references */
   phase_two(); /* read all the text again and translate it to \TEX/ form */
   phase_three(); /* output the cross-reference index */
+  if (tracing==2 && !show_progress) new_line;
   return wrap_up(); /* and exit gracefully */
 }
 been altered by a change file entry have their |changed_section| flag
 turned on during the first phase.
-@<Global...@>=
+@<Private...@>=
-boolean change_exists; /* has any section changed? */
+static boolean change_exists; /* has any section changed? */
 @ The other large memory area in \.{CWEAVE} keeps the cross-reference data.
 All uses of the name |p| are recorded in a linked list beginning at
 } xref_info;
 typedef xref_info *xref_pointer;
-@ @<Global...@>=
+@ @<Private...@>=
-xref_info xmem[max_refs]; /* contains cross-reference information */
+static xref_info xmem[max_refs]; /* contains cross-reference information */
-xref_pointer xmem_end = xmem+max_refs-1;
+static xref_pointer xmem_end = xmem+max_refs-1;
-xref_pointer xref_ptr; /* the largest occupied position in |xmem| */
+static xref_pointer xref_ptr; /* the largest occupied position in |xmem| */
-sixteen_bits xref_switch,section_xref_switch; /* either zero or |def_flag| */
+static sixteen_bits xref_switch,section_xref_switch; /* either zero or |def_flag| */
 @ A section that is used for multi-file output (with the \.{@@(} feature)
 has a special first cross-reference whose |num| field is |file_flag|.
 @<Predecl...@>=
 static void new_xref(name_pointer);@/
 static void new_section_xref(name_pointer);@/
-static void set_file_flag(name_pointer);@/
+static void set_file_flag(name_pointer);
 @ @c
 static void
 unused location of |tok_start| is called |text_ptr|.
 Thus, we usually have |*text_ptr==tok_ptr|.
-@<Global...@>=
+@<Private...@>=
-token tok_mem[max_toks]; /* tokens */
+static token tok_mem[max_toks]; /* tokens */
-token_pointer tok_mem_end = tok_mem+max_toks-1; /* end of |tok_mem| */
+static token_pointer tok_mem_end = tok_mem+max_toks-1; /* end of |tok_mem| */
-token_pointer tok_ptr; /* first unused position in |tok_mem| */
+static token_pointer tok_ptr; /* first unused position in |tok_mem| */
-token_pointer max_tok_ptr; /* largest value of |tok_ptr| */
+static token_pointer max_tok_ptr; /* largest value of |tok_ptr| */
-token_pointer tok_start[max_texts]; /* directory into |tok_mem| */
+static token_pointer tok_start[max_texts]; /* directory into |tok_mem| */
-text_pointer tok_start_end = tok_start+max_texts-1; /* end of |tok_start| */
+static text_pointer tok_start_end = tok_start+max_texts-1; /* end of |tok_start| */
-text_pointer text_ptr; /* first unused position in |tok_start| */
+static text_pointer text_ptr; /* first unused position in |tok_start| */
-text_pointer max_text_ptr; /* largest value of |text_ptr| */
+static text_pointer max_text_ptr; /* largest value of |text_ptr| */
 @ @<Set init...@>=
 tok_ptr=max_tok_ptr=tok_mem+1;@/
   p->xref=(void *)xref_ptr;
 }
-@ @<Predecl...@>=
+@ @<Predecl...@>=@+static void update_node(name_pointer p);
-static void update_node(name_pointer p);@/
 @ We have to get \CEE/'s
 reserved words into the hash table, and the simplest way to do this is
 id_lookup("wchar_t",NULL,raw_int);
 id_lookup("while",NULL,for_like);
 id_lookup("xor",NULL,alfop);
-id_lookup("xor_eq",NULL,alfop);
+id_lookup("xor_eq",NULL,alfop);@+ res_wd_end=name_ptr;
-res_wd_end=name_ptr;
 id_lookup("TeX",NULL,custom);
 id_lookup("make_pair",NULL,func_template);
 @ Control codes are converted to \.{CWEAVE}'s internal
 representation by means of the table |ccode|.
-@<Global...@>=
+@<Private...@>=
-eight_bits ccode[256]; /* meaning of a char following \.{@@} */
+static eight_bits ccode[256]; /* meaning of a char following \.{@@} */
 @ @<Set ini...@>=
 {int c; for (c=0; c<256; c++) ccode[c]=0;}
 @<Predec...@>=
 static void skip_limbo(void);@/
-static eight_bits skip_TeX(void);@/
+static eight_bits skip_TeX(void);
 @ @c
 static void
   while(true) {
     if (loc>limit && get_line()==false) return;
     *(limit+1)='@@';
-    while (*loc!='@@') loc++; /* look for '@@', then skip two chars */
+    while (*loc!='@@') loc++; /* look for `\.{@@}', then skip two chars */
     if (loc++ <=limit) { int c=ccode[(eight_bits)*loc++];
       if (c==new_section) return;
       if (c==noop) skip_restricted();
 @d string 0201 /* \CEE/ string */
 @d identifier 0202 /* \CEE/ identifier or reserved word */
-@<Global...@>=
+@<Private...@>=
-name_pointer cur_section; /* name of section just scanned */
+static name_pointer cur_section; /* name of section just scanned */
-char cur_section_char; /* the character just before that name */
+static char cur_section_char; /* the character just before that name */
 @ As one might expect, |get_next| consists mostly of a big switch
 that branches to the various special cases that can arise.
 @d ishigh(c) ((eight_bits)(c)>0177)
 @^high-bit character handling@>
-@<Predecl...@>=
+@c
-static eight_bits get_next(void);@/
-@ @c
 static eight_bits
 get_next(void) /* produces the next input token */
 {
   }
 }
+@ @<Predecl...@>=@+static eight_bits get_next(void);
 @ Because preprocessor commands do not fit in with the rest of the syntax
 of \CEE/,
 we have to deal with them separately.  One solution is to enclose such
 @d left_preproc ord /* begins a preprocessor command */
 @d right_preproc 0217 /* ends a preprocessor command */
-@<Glob...@>=
+@<Private...@>=
-boolean preprocessing=false; /* are we scanning a preprocessor command? */
+static boolean preprocessing=false; /* are we scanning a preprocessor command? */
 @ @<Raise prep...@>= {
   preprocessing=true;
 a file name in lines that start with \.{\#include}.  We must treat this file
 name as a string.
-@<Glob...@>=
+@<Private...@>=
-boolean sharp_include_line=false; /* are we scanning a |#include| line? */
+static boolean sharp_include_line=false; /* are we scanning a \&{\#include} line? */
 @ @<Check if next token is |include|@>=
 while (loc<=buffer_end-7 && xisspace(*loc)) loc++;
     if (delim=='u' && *loc=='8') { *++id_loc=*loc++; }
     delim=*loc++; *++id_loc=delim;
   }
-  if (delim=='<') delim='>'; /* for file names in |#include| lines */
+  if (delim=='<') delim='>'; /* for file names in \&{\#include} lines */
   while (true) {
     if (loc>=limit) {
       if(*(limit-1)!='\\') {
 @ This function skips over a restricted context at relatively high speed.
-@<Predecl...@>=
+@c
-static void skip_restricted(void);@/
-@ @c
 static void
 skip_restricted(void)
 {
   }
 }
+@ @<Predecl...@>=@+static void skip_restricted(void);
 @ At the present point in the program we
 have |*(loc-1)==verbatim|; we set |id_first| to the beginning
 of the string itself, and |id_loc| to its ending-plus-one location in the
 |get_next|; in interesting cases, this will be the control code that
 ended a section or part of a section.
-@<Global...@>=
+@<Private...@>=
-eight_bits next_control; /* control code waiting to be acting upon */
+static eight_bits next_control; /* control code waiting to be acting upon */
 @ The overall processing strategy in phase one has the following
 straightforward outline.
-@<Predecl...@>=
+@c
-static void phase_one(void);@/
-@ @c
 static void
 phase_one(void) {
   phase=1; reset_input(); section_count=0;
   @<Print error messages about unused or undefined section names@>@;
 }
+@ @<Predecl...@>=@+static void phase_one(void);
 @ @<Store cross-reference data...@>=
 {
   if (++section_count==max_sections) overflow("section number");
 @<Predecl...@>=
 static void C_xref(eight_bits);@/
-static void outer_xref(void);@/
+static void outer_xref(void);
 @ @c
 static void
 The variables |lhs| and |rhs| point to the respective identifiers involved
 in a format definition.
-@<Global...@>=
+@<Private...@>=
-name_pointer lhs, rhs; /* pointers to |byte_start| for format identifiers */
+static name_pointer lhs, rhs; /* pointers to |byte_start| for format identifiers */
-name_pointer res_wd_end; /* pointer to the first nonreserved identifier */
+static name_pointer res_wd_end; /* pointer to the first nonreserved identifier */
 @ When we get to the following code we have |next_control>=format_code|.
 section name was both defined and used.  The variable |cur_xref| will point
 to cross-references for the current section name of interest.
-@<Global...@>=
+@<Private...@>=
-xref_pointer cur_xref; /* temporary cross-reference pointer */
+static xref_pointer cur_xref; /* temporary cross-reference pointer */
-boolean an_output; /* did |file_flag| precede |cur_xref|? */
+static boolean an_output; /* did |file_flag| precede |cur_xref|? */
 @ The following recursive procedure
 walks through the tree of section names and prints out anomalies.
 @^recursion@>
-@<Predecl...@>=
+@c
-static void section_check(name_pointer);@/
-@ @c
 static void
 section_check(
 name_pointer p) /* print anomalies in subtree |p| */
   }
 }
+@ @<Predecl...@>=@+static void section_check(name_pointer);
 @ @<Print error messages about un...@>=section_check(root);
 @* Low-level output routines.
 process, |out_line| will hold the current line number of the line about to
 be output.
-@<Global...@>=
+@<Private...@>=
-char out_buf[line_length+1]; /* assembled characters */
+static char out_buf[line_length+1]; /* assembled characters */
-char *out_buf_end = out_buf+line_length; /* end of |out_buf| */
+static char *out_buf_end = out_buf+line_length; /* end of |out_buf| */
-char *out_ptr; /* last character in |out_buf| */
+static char *out_ptr; /* last character in |out_buf| */
-int out_line; /* number of next line to be output */
+static int out_line; /* number of next line to be output */
 @ The |flush_buffer| routine empties the buffer up to a given breakpoint,
 and moves any remaining characters to the beginning of the next line.
 @<Predecl...@>=
 static void flush_buffer(char *,boolean,boolean);@/
-static void finish_line(void);@/
+static void finish_line(void);
 @ @c
 static void
 @<Predecl...@>=
 static void out_str(const char *);@/
-static void break_out(void);@/
+static void break_out(void);
 @ @c
 static void
 @<Predecl...@>=
 static void out_section(sixteen_bits);@/
-static void out_name(name_pointer,boolean);@/
+static void out_name(name_pointer,boolean);
 @ @c
 static void
 @<Predecl...@>=
 static void copy_limbo(void);@/
 static eight_bits copy_TeX(void);@/
-static int copy_comment(boolean,int);@/
+static int copy_comment(boolean,int);
 @ @c
 static void
 @d begin_arg 61 /* \.{@@[} */
 @d end_arg 62 /* \.{@@]} */
-@<Glo...@>=
+@<Private...@>=
-char cat_name[256][12];
+static char cat_name[256][12];
 @ @<Set in...@>=
 {int c; for (c=0;c<256;c++) strcpy(cat_name[c],"UNKNOWN");}
 @ This code allows \.{CWEAVE} to display its parsing steps.
-@<Predecl...@>=
+@c
-static void print_cat(eight_bits);@/
-@ @c
 static void
 print_cat(@t\1\1@> /* symbolic printout of a category */
 eight_bits c@t\2\2@>)
   fputs(cat_name[c],stdout);
 }
+@ @<Predecl...@>=@+static void print_cat(eight_bits);
 @ The token lists for translated \TEX/ output contain some special control
 symbols as well as ordinary characters. These control symbols are
 interpreted by \.{CWEAVE} before they are written to the output file.
 @ @d trans trans_plus.Trans /* translation texts of scraps */
-@<Global...@>=
+@<Private...@>=
-scrap scrap_info[max_scraps]; /* memory array for scraps */
+static scrap scrap_info[max_scraps]; /* memory array for scraps */
-scrap_pointer scrap_info_end=scrap_info+max_scraps-1; /* end of |scrap_info| */
+static scrap_pointer scrap_info_end=scrap_info+max_scraps-1; /* end of |scrap_info| */
-scrap_pointer scrap_base; /* beginning of the current scrap sequence */
+static scrap_pointer scrap_base; /* beginning of the current scrap sequence */
-scrap_pointer scrap_ptr; /* ending of the current scrap sequence */
+static scrap_pointer scrap_ptr; /* ending of the current scrap sequence */
-scrap_pointer max_scr_ptr; /* largest value assumed by |scrap_ptr| */
+static scrap_pointer max_scr_ptr; /* largest value assumed by |scrap_ptr| */
-scrap_pointer pp; /* current position for reducing productions */
+static scrap_pointer pp; /* current position for reducing productions */
-scrap_pointer lo_ptr; /* last scrap that has been examined */
+static scrap_pointer lo_ptr; /* last scrap that has been examined */
-scrap_pointer hi_ptr; /* first scrap that has not been examined */
+static scrap_pointer hi_ptr; /* first scrap that has not been examined */
 @ @<Set init...@>=
 scrap_base=scrap_info+1;
 @d tok_flag 4*id_flag /* signifies a token list */
 @d inner_tok_flag 5*id_flag /* signifies a token list in `\pb' */
-@<Predecl...@>=
+@c
-static void print_text(text_pointer p);@/
-@ @c
 static void
 print_text(@t\1\1@> /* prints a token list for debugging; not used in |main| */
 text_pointer p@t\2\2@>)
   update_terminal;
 }
+@ @<Predecl...@>=@+static void print_text(text_pointer p);
 @ @<Print token |r|...@>=
 switch (r) {
   case math_rel: printf("\\mathrel{"@q}@>); break;
 @d app(a) *(tok_ptr++)=(token)(a)
 @d app1(a) *(tok_ptr++)=(token)(tok_flag+(int)((a)->trans-tok_start))
-@<Global...@>=
+@<Private...@>=
-int cur_mathness, init_mathness;
+static int cur_mathness, init_mathness;
 @ @<Predecl...@>=
 static void app_str(const char *);@/
 static void big_app(token);@/
-static void big_app1(scrap_pointer);@/
+static void big_app1(scrap_pointer);
 @ @c
 static void
 static token_pointer find_first_ident(text_pointer);@/
 static void make_reserved(scrap_pointer);@/
 static void make_underlined(scrap_pointer);@/
-static void underline_xref(name_pointer);@/
+static void underline_xref(name_pointer);
 @ @c
 static token_pointer
 @<Predecl...@>=
 static void reduce(scrap_pointer,short,eight_bits,short,short);@/
-static void squash(scrap_pointer,short,eight_bits,short,short);@/
+static void squash(scrap_pointer,short,eight_bits,short,short);
 @ @c
 static void
 a sequence of two or more irreducible scraps will be printed out when
 |tracing| is set to 1.
-@<Global...@>=
+@<Private...@>=
-int tracing; /* can be used to show parsing details */
+static int tracing; /* can be used to show parsing details */
 @ @<Print a snapsh...@>=
 { scrap_pointer k_l; /* pointer into |scrap_info| */
 since |translate| might add a new text and a new scrap before it checks
 for overflow.
-@<Predecl...@>=
+@c
-static text_pointer translate(void);@/
-@ @c
 static text_pointer
 translate(void) /* converts a sequence of scraps */
 {
   @<Combine the irreducible scraps that remain@>@;
 }
+@ @<Predecl...@>=@+static text_pointer translate(void);
 @ If the initial sequence of scraps does not reduce to a single scrap,
 we concatenate the translations of all remaining scraps, separated by
 blank spaces, with dollar signs surrounding the translations of scraps
 what it reads are appended into the |cat| and |trans| arrays, and |scrap_ptr|
 is advanced.
-@<Predecl...@>=
+@c
-static void C_parse(eight_bits);@/
-@ @c
 static void
 C_parse(@t\1\1@> /* creates scraps from \CEE/ tokens */
   eight_bits spec_ctrl@t\2\2@>)
   }
 }
+@ @<Predecl...@>=@+static void C_parse(eight_bits);
 @ The following macro is used to append a scrap whose tokens have just
 been appended:
 @<Predec...@>=
 static void app_cur_id(boolean);@/
 static text_pointer C_translate(void);@/
-static void outer_parse(void);@/
+static void outer_parse(void);
 @ @c
 static void
 @d cur_mode cur_state.mode_field /* current mode of interpretation */
 @d init_stack stack_ptr=stack;cur_mode=outer /* initialize the stack */
-@<Global...@>=
+@<Private...@>=
-output_state cur_state; /* |cur_end|, |cur_tok|, |cur_mode| */
+static output_state cur_state; /* |cur_end|, |cur_tok|, |cur_mode| */
-output_state stack[stack_size]; /* info for non-current levels */
+static output_state stack[stack_size]; /* info for non-current levels */
-stack_pointer stack_end=stack+stack_size-1; /* end of |stack| */
+static stack_pointer stack_end=stack+stack_size-1; /* end of |stack| */
-stack_pointer stack_ptr; /* first unused location in the output state stack */
+static stack_pointer stack_ptr; /* first unused location in the output state stack */
-stack_pointer max_stack_ptr; /* largest value assumed by |stack_ptr| */
+static stack_pointer max_stack_ptr; /* largest value assumed by |stack_ptr| */
 @ @<Set init...@>=
 max_stack_ptr=stack;
 @<Predecl...@>=
 static void push_level(text_pointer);@/
-static void pop_level(void);@/
+static void pop_level(void);
 @ @c
 static void
 In these cases |cur_name| points to the identifier or section name in
 question.
-@<Global...@>=
+@<Private...@>=
-name_pointer cur_name;
+static name_pointer cur_name;
 @ @d res_word 0201 /* returned by |get_output| for reserved words */
 @d section_code 0200 /* returned by |get_output| for section names */
 @<Predecl...@>=
 static eight_bits get_output(void);@/
 static void output_C(void);@/
-static void make_output(void);@/
+static void make_output(void);
 @ @c
 static eight_bits
 actually output the \TEX/ material instead of merely looking at the
 \.{CWEB} specifications.
-@<Predecl...@>=
+@c
-static void phase_two(void);@/
-@ @c
 static void
 phase_two(void) {
 reset_input(); if (show_progress) fputs("\nWriting the output file...",stdout);
 while (!input_has_ended) @<Translate the current section@>@;
 }
+@ @<Predecl...@>=@+static void phase_two(void);
 @ The output file will contain the control sequence \.{\\Y} between non-null
 sections of a section, e.g., between the \TEX/ and definition parts if both
 are nonempty. This puts a little white space between the parts when they are
   space_checked=true;
 @.\\Y@>
-@<Global...@>=
+@<Private...@>=
-int save_line; /* former value of |out_line| */
+static int save_line; /* former value of |out_line| */
-char *save_place; /* former value of |out_ptr| */
+static char *save_place; /* former value of |out_ptr| */
-int sec_depth; /* the integer, if any, following \.{@@*} */
+static int sec_depth; /* the integer, if any, following \.{@@*} */
-boolean space_checked; /* have we done |emit_space_if_needed|? */
+static boolean space_checked; /* have we done |emit_space_if_needed|? */
-boolean format_visible; /* should the next format declaration be output? */
+static boolean format_visible; /* should the next format declaration be output? */
-boolean doing_format=false; /* are we outputting a format declaration? */
+static boolean doing_format=false; /* are we outputting a format declaration? */
-boolean group_found=false; /* has a starred section occurred? */
+static boolean group_found=false; /* has a starred section occurred? */
 @ @<Translate the current section@>= {
   section_count++;
 \.{\\7} (the \TEX/ macros for |force| and |big_force|). This \.{\\6} or
 \.{\\7} is replaced by the concluding \.{\\par} or by \.{\\Y\\par}.
-@<Predecl...@>=
+@c
-static void finish_C(boolean);@/
-@ @c
 static void
 finish_C(@t\1\1@> /* finishes a definition or a \CEE/ part */
   boolean visible@t\2\2@>) /* nonzero if we should produce \TeX\ output */
     /* forget the tokens and the scraps */
 }
+@ @<Predecl...@>=@+static void finish_C(boolean);
 @ Keeping in line with the conventions of the \CEE/ preprocessor (and
 otherwise contrary to the rules of \.{CWEB}) we distinguish here
 between the case that `\.(' immediately follows an identifier and the
 |next_control>=begin_C|. We will make the global variable |this_section|
 point to the current section name, if it has a name.
-@<Global...@>=
+@<Private...@>=
-name_pointer this_section; /* the current section name, or zero */
+static name_pointer this_section; /* the current section name, or zero */
 @ @<Translate the \CEE/...@>=
 this_section=name_dir;
 Note that the output of \.{CWEAVE} is not English-specific; users may
 supply new definitions for the macros \.{\\A}, \.{\\As}, etc.
-@<Predecl...@>=
+@c
-static void footnote(sixteen_bits);@/
-@ @c
 static void
 footnote(@t\1\1@> /* outputs section cross-references */
 sixteen_bits flag@t\2\2@>)
   out('.');
 }
+@ @<Predecl...@>=@+static void footnote(sixteen_bits);
 @ The following code distinguishes three cases, according as the number
 of cross-references is one, two, or more than two. Variable |q| points
 to the first cross-reference, and the last link is a zero.
 just finish off the page, omitting the index, section name list, and table of
 contents.
-@<Predecl...@>=
+@c
-static void phase_three(void);@/
-@ @c
 static void
 phase_three(void) {
 if (no_xref) {
 check_complete(); /* was all of the change file used? */
 }
+@ @<Predecl...@>=@+static void phase_three(void);
 @ Just before the index comes a list of all the changed sections, including
 the index section itself.
-@<Global...@>=
+@<Private...@>=
-sixteen_bits k_section; /* runs through the sections */
+static sixteen_bits k_section; /* runs through the sections */
 @ @<Tell about changed sections@>= {
   /* remember that the index is already marked as changed */
 list for character |c| begins at location |bucket[c]| and continues through
 the |blink| array.
-@<Global...@>=
+@<Private...@>=
-name_pointer bucket[256];
+static name_pointer bucket[256];
-name_pointer next_name; /* successor of |cur_name| when sorting */
+static name_pointer next_name; /* successor of |cur_name| when sorting */
-name_pointer blink[max_names]; /* links in the buckets */
+static name_pointer blink[max_names]; /* links in the buckets */
 @ To begin the sorting, we go through all the hash lists and put each entry
 having a nonempty cross-reference list into the proper bucket.
 @d sort_ptr scrap_ptr /* ditto */
 @d max_sorts max_scraps /* ditto */
-@<Global...@>=
+@<Private...@>=
-eight_bits cur_depth; /* depth of current buckets */
+static eight_bits cur_depth; /* depth of current buckets */
-char *cur_byte; /* index into |byte_mem| */
+static char *cur_byte; /* index into |byte_mem| */
-sixteen_bits cur_val; /* current cross-reference number */
+static sixteen_bits cur_val; /* current cross-reference number */
-sort_pointer max_sort_ptr; /* largest value of |sort_ptr| */
+static sort_pointer max_sort_ptr; /* largest value of |sort_ptr| */
 @ @<Set init...@>=
 max_sort_ptr=scrap_info;
 @ The desired alphabetic order is specified by the |collate| array; namely,
 $|collate|[0]<|collate|[1]<\cdots<|collate|[100]$.
-@<Global...@>=
+@<Private...@>=
-eight_bits collate[101+128]; /* collation order */
+static eight_bits collate[101+128]; /* collation order */
 @^high-bit character handling@>
 @ We use the order $\hbox{null}<\.\ <\hbox{other characters}<{}$\.\_${}<
 @d infinity 255 /* $\infty$ (approximately) */
-@<Predecl...@>=
+@c
-static void unbucket(eight_bits);@/
-@ @c
 static void
 unbucket(@t\1\1@> /* empties buckets having depth |d| */
 eight_bits d@t\2\2@>)
   }
 }
+@ @<Predecl...@>=@+static void unbucket(eight_bits);
 @ @<Sort and output...@>=
 sort_ptr=scrap_info; unbucket(1);
 while (sort_ptr>scrap_info) {
 @ List inversion is best thought of as popping elements off one stack and
 pushing them onto another. In this case |cur_xref| will be the head of
 the stack that we push things onto.
-@<Global...@>=
+@<Private...@>=
-xref_pointer next_xref, this_xref;
+static xref_pointer next_xref, this_xref;
   /* pointer variables for rearranging a list */
 @ @<Invert the cross-reference list at |cur_name|, making |cur_xref| the head@>=
 prints them.
 @^recursion@>
-@<Predecl...@>=
+@c
-static void section_print(name_pointer);@/
-@ @c
 static void
 section_print(@t\1\1@> /* print all section names in subtree |p| */
 name_pointer p@t\2\2@>)
   }
 }
+@ @<Predecl...@>=@+static void section_print(name_pointer);
 @ @<Output all the section names@>=section_print(root);
 @ Because on some systems the difference between two pointers is a |ptrdiff_t|

cwebmac.tex+2−2

@@ -1,7 +1,7 @@
1	% standard macros for CWEB listings (in addition to plain.tex)	1	% standard macros for CWEB listings (in addition to plain.tex)
2	% Version 4.1 --- February 2021	2	% Version 4.2 --- February 2021
3	\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros	3	\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
4	\xdef\fmtversion{\fmtversion+CWEB4.1}	4	\xdef\fmtversion{\fmtversion+CWEB4.2}
5	\chardef\cwebversion=4 \chardef\cwebrevision=1	5	\chardef\cwebversion=4 \chardef\cwebrevision=1
6	\newif\ifpdf	6	\newif\ifpdf
7	\ifx\pdf+\pdftrue\fi	7	\ifx\pdf+\pdftrue\fi

cwebman.tex+15−15

@@ -36,7 +36,7 @@ · 35 unmodified lines
36		36
37	\def\lheader{\mainfont\the\pageno\hfill\sc\runninghead\hfill}	37	\def\lheader{\mainfont\the\pageno\hfill\sc\runninghead\hfill}
38	\def\rheader{\hfill\sc\runninghead\hfill\mainfont\the\pageno}	38	\def\rheader{\hfill\sc\runninghead\hfill\mainfont\the\pageno}
39	\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.1)}	39	\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.2)}
40		40
41	% This verbatim mode assumes that ! marks are !! in the text being copied.	41	% This verbatim mode assumes that ! marks are !! in the text being copied.
42	\def\verbatim{\begingroup	42	\def\verbatim{\begingroup
@@ -50,7 +50,7 @@ · 7 unmodified lines
50	\null\vfill	50	\null\vfill
51	\centerline{\titlefont The {\ttitlefont CWEB} System of	51	\centerline{\titlefont The {\ttitlefont CWEB} System of
52	Structured Documentation}	52	Structured Documentation}
53	\vskip 18pt\centerline{(Version 4.1 --- February 2021)}	53	\vskip 18pt\centerline{(Version 4.2 --- February 2021)}
54	\vskip 24pt	54	\vskip 24pt
55	\centerline{\authorfont Donald E. Knuth and Silvio Levy}	55	\centerline{\authorfont Donald E. Knuth and Silvio Levy}
56	\vfill	56	\vfill
@@ -398,15 +398,15 @@ $$\hbox{ If \\{pa} is declared as `\&{int} ${}{*}\\{pa}$', · 341 unmodified lines
398	the assignment $\\{pa}\K{\AND}\\|a[\T{0}]$ makes \\{pa}	398	the assignment $\\{pa}\K{\AND}\\|a[\T{0}]$ makes \\{pa}
399	point to the zeroth element of \\|a.}$$	399	point to the zeroth element of \\|a.}$$
400	The \TEX/ text would look like this in your \.{CWEB} file:	400	The \TEX/ text would look like this in your \.{CWEB} file:
401	$$\lpile{\.{If \|pa\| is declared as `\|int *pa\|', the}\cr	401	$$\lpile{\.{If \|pa\| is declared as `\|int *pa\|', the assignment}\cr
402	\.{assignment \|pa=\&a[0]\| makes \|pa\| point	402	\.{\|pa=\&a[0]\| makes \|pa\| point to the zeroth element of \|a\|.}\cr}$$
403	to the zeroth element of \|a\|.}\cr}$$	403	And \.{CWEAVE} translates this into something
404	And \.{CWEAVE} translates this into something you are glad you didn't have	404	you are glad you didn't have to type:
405	to type:	405	$$\lpile{\.{If \\PB\{\\\\\{pa\}\} is declared as `\\PB\{\\\&\{int\}
406	$$\lpile{\.{If \\\\\{pa\} is declared as	406	\$\{\}\{*\}\\\\\{pa\}\$\}', the}\cr
407	`\\\&\{int\} \$\{\}\{*\}\\\\\{pa\}\$',}\cr	407	\.{assignment \\PB\{\$\\\\\{pa\}\\K\{\\AND\}\\\|a[\\T\{0\}]\$\}
408	\.{the assignment \$\\\\\{pa\}\\K\{\\AND\}\\\|a[\\T\{0\}]\$}\cr	408	makes \\PB\{\\\\\{pa\}\} point}\cr
409	\.{makes \\\\\{pa\} point to the zeroth element of \\\|a.}\cr}$$	409	\.{to the zeroth element of \\PB\{\\\|a\}.}\cr}$$
410	Incidentally, the cross-reference index that \.{CWEAVE} would make, in	410	Incidentally, the cross-reference index that \.{CWEAVE} would make, in
411	the presence of a comment like this, would include	411	the presence of a comment like this, would include
412	the current section number as one of the index entries for \\{pa},	412	the current section number as one of the index entries for \\{pa},
@@ -1011,7 +1011,7 @@ part of a \.{struct}, even though \CEE/ does allow this. · 598 unmodified lines
1011		1011
1012	\section Running the programs.	1012	\section Running the programs.
1013	The \UNIX/ command line for \.{CTANGLE} is	1013	The \UNIX/ command line for \.{CTANGLE} is
1014	$$\.{ctangle [options] web\_file[.w] [\{change\_file[.ch]\|-\} [out\_file]]}$$	1014	$$\.{ctangle [options] webfile[.w] [\{changefile[.ch]\|-\} [outfile[.c]]]}$$
1015	and the same conventions apply to \.{CWEAVE}. If `\.-' or no change file is	1015	and the same conventions apply to \.{CWEAVE}. If `\.-' or no change file is
1016	specified, the change file is null. The extensions \.{.w} and \.{.ch}	1016	specified, the change file is null. The extensions \.{.w} and \.{.ch}
1017	are appended only if the given file names contain no dot. If the	1017	are appended only if the given file names contain no dot. If the
@@ -1042,7 +1042,7 @@ by default.) · 24 unmodified lines
1042		1042
1043	\option e Enclose \CEE/ material formatted by \.{CWEAVE} in	1043	\option e Enclose \CEE/ material formatted by \.{CWEAVE} in
1044	brackets \.{\\PB\{...\}}, so that special hooks can be used.	1044	brackets \.{\\PB\{...\}}, so that special hooks can be used.
1045	(Off by default; has no effect on \.{CTANGLE}.)	1045	(On by default; has no effect on \.{CTANGLE}.)
1046		1046
1047	\option f Force line breaks after each \CEE/ statement formatted	1047	\option f Force line breaks after each \CEE/ statement formatted
1048	by \.{CWEAVE}. (On by default; \.{-f} saves paper but looks less \CEE/-like	1048	by \.{CWEAVE}. (On by default; \.{-f} saves paper but looks less \CEE/-like
@@ -1336,7 +1336,7 @@ strncpy(change_buffer,buffer,(size_t)(limit-buffer+1)); · 287 unmodified lines
1336	\def\runninghead{APPENDIX A --- TRANSLATION BY {\tentt CWEAVE}}	1336	\def\runninghead{APPENDIX A --- TRANSLATION BY {\tentt CWEAVE}}
1337		1337
1338	Here is the corresponding excerpt from \.{common.tex}.	1338	Here is the corresponding excerpt from \.{common.tex}.
1339	(Code for section 31 omitted for space reasons.)	1339	(Code for section 31 is omitted for space reasons.)
1340		1340
1341	\vskip6pt	1341	\vskip6pt
1342	\begingroup \def\tt{\eighttt} \baselineskip9pt	1342	\begingroup \def\tt{\eighttt} \baselineskip9pt
@@ -1591,7 +1591,7 @@ $$\lpile{\.{\\def\\topofcontents\{\\null\\vfill}\cr · 248 unmodified lines
1591	\.{ { }\\titlefalse \% include headline on the contents page}\cr	1591	\.{ { }\\titlefalse \% include headline on the contents page}\cr
1592	\.{ { }\\def\\rheader\{\\mainfont The \{\\tt CWEAVE\}{ }processor\\hfil\}}\cr	1592	\.{ { }\\def\\rheader\{\\mainfont The \{\\tt CWEAVE\}{ }processor\\hfil\}}\cr
1593	\.{ { }\\centerline\{\\titlefont The \{\\ttitlefont CWEAVE\}{ }processor\}}\cr	1593	\.{ { }\\centerline\{\\titlefont The \{\\ttitlefont CWEAVE\}{ }processor\}}\cr
1594	\.{ { }\\vskip 15pt \\centerline\{(Version 4.1)\}{ }\\vfill\}}\cr}$$	1594	\.{ { }\\vskip 15pt \\centerline\{(Version 4.2)\}{ }\\vfill\}}\cr}$$
1595	Redefining \.{\\rheader}, which is the headline for right-hand pages,	1595	Redefining \.{\\rheader}, which is the headline for right-hand pages,
1596	suffices in this case to put the desired information at the top of the	1596	suffices in this case to put the desired information at the top of the
1597	contents page.	1597	contents page.

CWEB - release 4.2, 2021-02-25.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -20,12 +20,12 @@ This file contributed by Barry Schwartz, trashman@crud.mn.org, 28 Jun 94. · 19 unmodified lines
20	The ``banner line'' defined here should be changed whenever \.{CWEAVE}	20	The ``banner line'' defined here should be changed whenever \.{CWEAVE}
21	is modified.	21	is modified.
22		22
23	@d banner "This is CWEAVE (Version 4.1)"	23	@d banner "This is CWEAVE (Version 4.2)"
24	@y	24	@y
25	The ``banner line'' defined here should be changed whenever \.{CWEAVE}	25	The ``banner line'' defined here should be changed whenever \.{CWEAVE}
26	is modified.	26	is modified.
27		27
28	@d banner "This is CWEAVE (Version 4.1pc/big)"	28	@d banner "This is CWEAVE (Version 4.2pc/big)"
29	@z	29	@z
30		30
31		31
@@ -103,11 +103,11 @@ typedef xref_info huge* xref_pointer; · 71 unmodified lines
103		103
104		104
105	@x Section 23.	105	@x Section 23.
106	xref_info xmem[max_refs]; /* contains cross-reference information */	106	static xref_info xmem[max_refs]; /* contains cross-reference information */
107	xref_pointer xmem_end = xmem+max_refs-1;	107	static xref_pointer xmem_end = xmem+max_refs-1;
108	@y	108	@y
109	xref_info huge xmem[max_refs]; /* contains cross-reference information */	109	static xref_info huge xmem[max_refs]; /* contains cross-reference information */
110	xref_pointer xmem_end;	110	static xref_pointer xmem_end;
111	@z	111	@z
112		112
113		113
@@ -129,21 +129,21 @@ xmem->num=0; /* sentinel value */ · 15 unmodified lines
129		129
130		130
131	@x Section 30. (to please Borland's C++, version 4.02)	131	@x Section 30. (to please Borland's C++, version 4.02)
132	token tok_mem[max_toks]; /* tokens */	132	static token tok_mem[max_toks]; /* tokens */
133	token_pointer tok_mem_end = tok_mem+max_toks-1; /* end of \|tok_mem\| */	133	static token_pointer tok_mem_end = tok_mem+max_toks-1; /* end of \|tok_mem\| */
134	token_pointer tok_ptr; /* first unused position in \|tok_mem\| */	134	static token_pointer tok_ptr; /* first unused position in \|tok_mem\| */
135	token_pointer max_tok_ptr; /* largest value of \|tok_ptr\| */	135	static token_pointer max_tok_ptr; /* largest value of \|tok_ptr\| */
136	token_pointer tok_start[max_texts]; /* directory into \|tok_mem\| */	136	static token_pointer tok_start[max_texts]; /* directory into \|tok_mem\| */
137	text_pointer tok_start_end = tok_start+max_texts-1; /* end of \|tok_start\| */	137	static text_pointer tok_start_end = tok_start+max_texts-1; /* end of \|tok_start\| */
138	text_pointer text_ptr; /* first unused position in \|tok_start\| */	138	static text_pointer text_ptr; /* first unused position in \|tok_start\| */
139	@y	139	@y
140	token tok_mem[max_toks]; /* tokens */	140	static token tok_mem[max_toks]; /* tokens */
141	token_pointer tok_mem_end; /* end of \|tok_mem\| */	141	static token_pointer tok_mem_end; /* end of \|tok_mem\| */
142	token_pointer tok_ptr; /* first unused position in \|tok_mem\| */	142	static token_pointer tok_ptr; /* first unused position in \|tok_mem\| */
143	token_pointer max_tok_ptr; /* largest value of \|tok_ptr\| */	143	static token_pointer max_tok_ptr; /* largest value of \|tok_ptr\| */
144	token_pointer tok_start[max_texts]; /* directory into \|tok_mem\| */	144	static token_pointer tok_start[max_texts]; /* directory into \|tok_mem\| */
145	text_pointer tok_start_end; /* end of \|tok_start\| */	145	static text_pointer tok_start_end; /* end of \|tok_start\| */
146	text_pointer text_ptr; /* first unused position in \|tok_start\| */	146	static text_pointer text_ptr; /* first unused position in \|tok_start\| */
147	@z	147	@z
148		148
149	@x Section 31. (goes with the previous change)	149	@x Section 31. (goes with the previous change)
@@ -212,9 +212,9 @@ max_tok_ptr=tok_mem+1; max_text_ptr=tok_start+1; · 62 unmodified lines
212		212
213		213
214	@x Section 246.	214	@x Section 246.
215	char cur_byte; / index into \|byte_mem\| */	215	static char cur_byte; / index into \|byte_mem\| */
216	@y	216	@y
217	char huge* cur_byte; /* index into \|byte_mem\| */	217	static char huge* cur_byte; /* index into \|byte_mem\| */
218	@z	218	@z
219		219
220		220