CWEB — Release 3.3, 1994-12-06.

Andreas Scherer committed 15 years ago

Commit 22cd55e1 parent 6f710fc16 files · +379 −303Browse files

Unified · Split

16 files

common.c +126 −125
common.w +8 −7
ctang-bs.ch +2 −2
ctang-pc.ch +2 −2
ctang-vms.ch +2 −2
ctangle.c +100 −95
ctangle.w +21 −13
cweav-bs.ch +33 −5
cweav-pc.ch +2 −2
cweav-vms.ch +2 −2
cweave.w +24 −12
cwebmac.tex +3 −3
cwebman.tex +21 −19
examples/wc.w +23 −8
examples/wmerge.w +1 −1
prod.w +9 −5

 #include <ctype.h>
 /*:5*//*8:*/
-#line 163 "common.w"
+#line 164 "common.w"
 #include <stdio.h>
 /*:8*//*22:*/
-#line 468 "common.w"
+#line 469 "common.w"
 #include <stdlib.h>
 #define minus_gt_ast 027 \
 #define buf_size 100
-#define long_buf_size 500
+#define longest_name 1000
-#define xisspace(c)(isspace(c)&&((unsigned char)c<0200))
+#define long_buf_size (buf_size+longest_name)
-#define xisupper(c)(isupper(c)&&((unsigned char)c<0200)) \
+#define xisspace(c) (isspace(c) &&((unsigned char) c<0200) )
+#define xisupper(c) (isupper(c) &&((unsigned char) c<0200) )  \
 #define max_include_depth 10 \
 #define web_file_name file_name[0] \
 #define lines_dont_match (change_limit-change_buffer!=limit-buffer|| \
-strncmp(buffer,change_buffer,limit-buffer)) \
+strncmp(buffer,change_buffer,limit-buffer) )  \
-#define if_section_start_make_pending(b){*limit= '!'; \
+#define if_section_start_make_pending(b) {*limit= '!'; \
-for(loc= buffer;xisspace(*loc);loc++); \
+for(loc= buffer;xisspace(*loc) ;loc++) ; \
 *limit= ' '; \
-if(*loc=='@'&&(xisspace(*(loc+1))||*(loc+1)=='*'))change_pending= b; \
+if(*loc=='@'&&(xisspace(*(loc+1) ) ||*(loc+1) =='*') ) change_pending= b; \
 } \
 #define max_sections 2000 \
  \
-#define too_long(){include_depth--; \
+#define too_long() {include_depth--; \
-err_print("! Include file name too long");goto restart;} \
+err_print("! Include file name too long") ;goto restart;} \
 #define max_bytes 90000 \
 #define max_names 4000 \
  \
-#define length(c)(c+1)->byte_start-(c)->byte_start
+#define length(c) (c+1) ->byte_start-(c) ->byte_start
-#define print_id(c)term_write((c)->byte_start,length((c))) \
+#define print_id(c) term_write((c) ->byte_start,length((c) ) )  \
 #define hash_size 353 \
 #define root name_dir->rlink \
  \
-#define first_chunk(p)((p)->byte_start+2)
+#define first_chunk(p) ((p) ->byte_start+2)
-#define prefix_length(p)(int)((unsigned char)*((p)->byte_start)*256+ \
+#define prefix_length(p) (int) ((unsigned char) *((p) ->byte_start) *256+ \
-(unsigned char)*((p)->byte_start+1))
+(unsigned char) *((p) ->byte_start+1) )
-#define set_prefix_length(p,m)(*((p)->byte_start)= (m)/256, \
+#define set_prefix_length(p,m) (*((p) ->byte_start) = (m) /256, \
-*((p)->byte_start+1)= (m)%256) \
+*((p) ->byte_start+1) = (m) %256)  \
 #define less 0
 #define equal 1
 #define harmless_message 1
 #define error_message 2
 #define fatal_message 3
-#define mark_harmless {if(history==spotless)history= harmless_message;}
+#define mark_harmless {if(history==spotless) history= harmless_message;}
 #define mark_error history= error_message \
-#define confusion(s)fatal("! This can't happen: ",s) \
+#define confusion(s) fatal("! This can't happen: ",s)  \
  \
 #define show_banner flags['b']
 #define show_stats flags['s']
 #define show_happiness flags['h'] \
-#define update_terminal fflush(stdout) \
+#define update_terminal fflush(stdout)  \
 #define new_line putchar('\n')
 #define putxchar putchar
-#define term_write(a,b)fflush(stdout),fwrite(a,sizeof(char),b,stdout)
+#define term_write(a,b) fflush(stdout) ,fwrite(a,sizeof(char) ,b,stdout)
-#define C_printf(c,a)fprintf(C_file,c,a)
+#define C_printf(c,a) fprintf(C_file,c,a)
-#define C_putc(c)putc(c,C_file) \
+#define C_putc(c) putc(c,C_file)  \
 #line 59 "common.w"
 boolean program;
 /*:2*//*7:*/
-#line 157 "common.w"
+#line 158 "common.w"
 char buffer[long_buf_size];
 char*buffer_end= buffer+buf_size-2;
 char*loc= buffer;
 /*:7*//*10:*/
-#line 212 "common.w"
+#line 213 "common.w"
 int include_depth;
 FILE*file[max_include_depth];
 boolean web_file_open= 0;
 /*:10*//*20:*/
-#line 416 "common.w"
+#line 417 "common.w"
 typedef unsigned short sixteen_bits;
 sixteen_bits section_count;
 boolean print_where= 0;
 /*:20*//*27:*/
-#line 586 "common.w"
+#line 587 "common.w"
 typedef struct name_info{
 char*byte_start;
 /*31:*/
-#line 623 "common.w"
+#line 624 "common.w"
 struct name_info*link;
 /*:31*//*40:*/
-#line 722 "common.w"
+#line 723 "common.w"
 union{
 struct name_info*Rlink;
 }dummy;
 /*:40*//*55:*/
-#line 1054 "common.w"
+#line 1055 "common.w"
 char*equiv_or_xref;
 /*:55*/
-#line 589 "common.w"
+#line 590 "common.w"
 }name_info;
 typedef name_info*name_pointer;
 name_pointer name_dir_end= name_dir+max_names-1;
 /*:27*//*29:*/
-#line 609 "common.w"
+#line 610 "common.w"
 name_pointer name_ptr;
 char*byte_ptr;
 /*:29*//*32:*/
-#line 636 "common.w"
+#line 637 "common.w"
 typedef name_pointer*hash_pointer;
 name_pointer hash[hash_size];
 hash_pointer h;
 /*:32*//*56:*/
-#line 1074 "common.w"
+#line 1075 "common.w"
 int history= spotless;
 /*:56*//*67:*/
-#line 1212 "common.w"
+#line 1213 "common.w"
 int argc;
 char**argv;
 boolean flags[128];
 /*:67*//*77:*/
-#line 1366 "common.w"
+#line 1367 "common.w"
 FILE*C_file;
 FILE*tex_file;
 int phase;
 /*:3*//*11:*/
-#line 238 "common.w"
+#line 239 "common.w"
 char change_buffer[buf_size];
 char*change_limit;
 #line 61 "common.w"
 /*33:*/
-#line 642 "common.w"
+#line 643 "common.w"
 extern int names_match();
 /*:33*//*38:*/
-#line 695 "common.w"
+#line 696 "common.w"
 void init_p();
 /*:38*//*46:*/
-#line 844 "common.w"
+#line 845 "common.w"
 extern void init_node();
 /*:46*//*53:*/
-#line 1009 "common.w"
+#line 1010 "common.w"
 int section_name_cmp();
 /*:53*//*57:*/
-#line 1084 "common.w"
+#line 1085 "common.w"
 void err_print();
 /*:57*//*60:*/
-#line 1132 "common.w"
+#line 1133 "common.w"
 int wrap_up();
 extern void print_stats();
 /*:60*//*63:*/
-#line 1165 "common.w"
+#line 1166 "common.w"
 void fatal(),overflow();
 /*:63*//*69:*/
-#line 1243 "common.w"
+#line 1244 "common.w"
 void scan_args();
 /*:69*//*81:*/
-#line 1407 "common.w"
+#line 1408 "common.w"
 extern int strlen();
 extern int strcmp();
 common_init()
 {
 /*30:*/
-#line 613 "common.w"
+#line 614 "common.w"
 name_dir->byte_start= byte_ptr= byte_mem;
 name_ptr= name_dir+1;
 name_ptr->byte_start= byte_mem;
 /*:30*//*34:*/
-#line 647 "common.w"
+#line 648 "common.w"
 for(h= hash;h<=hash_end;*h++= NULL);
 /*:34*//*41:*/
-#line 729 "common.w"
+#line 730 "common.w"
 root= NULL;
 #line 92 "common.w"
 ;
 /*68:*/
-#line 1225 "common.w"
+#line 1226 "common.w"
 show_banner= show_happiness= show_progress= 1;
 #line 93 "common.w"
 ;
 /*78:*/
-#line 1373 "common.w"
+#line 1374 "common.w"
 scan_args();
 if(program==ctangle){
 }
 /*:4*//*9:*/
-#line 170 "common.w"
+#line 171 "common.w"
 int input_ln(fp)
 FILE*fp;
 }
 /*:9*//*12:*/
-#line 249 "common.w"
+#line 250 "common.w"
 void
 prime_the_change_buffer()
 {
 change_limit= change_buffer;
 /*13:*/
-#line 263 "common.w"
+#line 264 "common.w"
 while(1){
 change_line++;
 }
 /*:13*/
-#line 254 "common.w"
+#line 255 "common.w"
 ;
 /*14:*/
-#line 280 "common.w"
+#line 281 "common.w"
 do{
 change_line++;
 }while(limit==buffer);
 /*:14*/
-#line 255 "common.w"
+#line 256 "common.w"
 ;
 /*15:*/
-#line 290 "common.w"
+#line 291 "common.w"
 {
 change_limit= change_buffer-buffer+limit;
 }
 /*:15*/
-#line 256 "common.w"
+#line 257 "common.w"
 ;
 }
 /*:12*//*16:*/
-#line 318 "common.w"
+#line 319 "common.w"
 void
 check_change()
 if(limit>buffer+1&&buffer[0]=='@'){
 if(xisupper(buffer[1]))buffer[1]= tolower(buffer[1]);
 /*17:*/
-#line 356 "common.w"
+#line 357 "common.w"
 if(buffer[1]=='x'||buffer[1]=='z'){
 loc= buffer+2;err_print("! Where is the matching @y?");
 }
 /*:17*/
-#line 340 "common.w"
+#line 341 "common.w"
 ;
 }
 /*15:*/
-#line 290 "common.w"
+#line 291 "common.w"
 {
 change_limit= change_buffer-buffer+limit;
 }
 /*:15*/
-#line 342 "common.w"
+#line 343 "common.w"
 ;
 changing= 0;cur_line++;
 while(!input_ln(cur_file)){
 }
 /*:16*//*18:*/
-#line 376 "common.w"
+#line 377 "common.w"
 void
 reset_input()
 {
 limit= buffer;loc= buffer+1;buffer[0]= ' ';
 /*19:*/
-#line 391 "common.w"
+#line 392 "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);
 /*:19*/
-#line 381 "common.w"
+#line 382 "common.w"
 ;
 include_depth= 0;cur_line= 0;change_line= 0;
 change_depth= include_depth;
 }
 /*:18*//*21:*/
-#line 424 "common.w"
+#line 425 "common.w"
 int get_line()
 {
 restart:
 if(changing&&include_depth==change_depth)
 /*25:*/
-#line 529 "common.w"
+#line 530 "common.w"
 {
 change_line++;
 if(!input_ln(change_file)){
 }
 /*:25*/
-#line 429 "common.w"
+#line 430 "common.w"
 ;
 if(!changing||include_depth>change_depth){
 /*24:*/
-#line 512 "common.w"
+#line 513 "common.w"
 {
 cur_line++;
 while(!input_ln(cur_file)){
 }
 /*:24*/
-#line 431 "common.w"
+#line 432 "common.w"
 ;
 if(changing&&include_depth==change_depth)goto restart;
 }
 }
 include_depth++;
 /*23:*/
-#line 471 "common.w"
+#line 472 "common.w"
 {
 char temp_file_name[max_file_name_length];
 char*cur_file_name_end= cur_file_name+max_file_name_length-1;
 }
 /*:23*/
-#line 449 "common.w"
+#line 450 "common.w"
 ;
 }
 return(!input_has_ended);
 }
 /*:21*//*26:*/
-#line 561 "common.w"
+#line 562 "common.w"
 void
 check_complete(){
 }
 /*:26*//*35:*/
-#line 652 "common.w"
+#line 653 "common.w"
 name_pointer
 id_lookup(first,last,t)
 if(last==NULL)for(last= first;*last!='\0';last++);
 l= last-first;
 /*36:*/
-#line 675 "common.w"
+#line 676 "common.w"
 h= (unsigned char)*i;
 while(++i<last)h= (h+h+(int)((unsigned char)*i))%hash_size;
 /*:36*/
-#line 665 "common.w"
+#line 666 "common.w"
 ;
 /*37:*/
-#line 683 "common.w"
+#line 684 "common.w"
 p= hash[h];
 while(p&&!names_match(p,first,l,t))p= p->link;
 }
 /*:37*/
-#line 666 "common.w"
+#line 667 "common.w"
 ;
 if(p==name_ptr)/*39:*/
-#line 698 "common.w"
+#line 699 "common.w"
 {
 if(byte_ptr+l>byte_mem_end)overflow("byte memory");
 if(name_ptr>=name_dir_end)overflow("name");
 }
 /*:39*/
-#line 667 "common.w"
+#line 668 "common.w"
 ;
 return(p);
 }
 /*:35*//*42:*/
-#line 756 "common.w"
+#line 757 "common.w"
 void
 print_section_name(p)
 }
 /*:42*//*43:*/
-#line 775 "common.w"
+#line 776 "common.w"
 void
 sprint_section_name(dest,p)
 }
 /*:43*//*44:*/
-#line 796 "common.w"
+#line 797 "common.w"
 void
 print_prefix_name(p)
 }
 /*:44*//*45:*/
-#line 817 "common.w"
+#line 818 "common.w"
 int web_strcmp(j,j_len,k,k_len)
 char*j,*k;
 }
 /*:45*//*47:*/
-#line 847 "common.w"
+#line 848 "common.w"
 name_pointer
 add_section_name(par,c,first,last,ispref)
 }
 /*:47*//*48:*/
-#line 876 "common.w"
+#line 877 "common.w"
 void
 extend_section_name(p,first,last,ispref)
 }
 /*:48*//*49:*/
-#line 904 "common.w"
+#line 905 "common.w"
 name_pointer
 section_lookup(first,last,ispref)
 int name_len= last-first+1;
 /*50:*/
-#line 928 "common.w"
+#line 929 "common.w"
 while(p){
 c= web_strcmp(first,name_len,first_chunk(p),prefix_length(p));
 }
 /*:50*/
-#line 918 "common.w"
+#line 919 "common.w"
 ;
 /*51:*/
-#line 953 "common.w"
+#line 954 "common.w"
 if(r==NULL)
 return add_section_name(par,c,first,last+1,ispref);
 /*:51*/
-#line 919 "common.w"
+#line 920 "common.w"
 ;
 /*52:*/
-#line 961 "common.w"
+#line 962 "common.w"
 switch(section_name_cmp(&first,name_len,r)){
 }
 /*:52*/
-#line 920 "common.w"
+#line 921 "common.w"
 ;
 }
 /*:49*//*54:*/
-#line 1012 "common.w"
+#line 1013 "common.w"
 int section_name_cmp(pfirst,len,r)
 char**pfirst;
 }
 /*:54*//*58:*/
-#line 1087 "common.w"
+#line 1088 "common.w"
 void
 err_print(s)
 char*k,*l;
 printf(*s=='!'?"\n%s":"%s",s);
 if(web_file_open)/*59:*/
-#line 1107 "common.w"
+#line 1108 "common.w"
 {if(changing&&include_depth==change_depth)
 printf(". (l. %d of change file)\n",change_line);
 }
 /*:59*/
-#line 1094 "common.w"
+#line 1095 "common.w"
 ;
 update_terminal;mark_error;
 }
 /*:58*//*61:*/
-#line 1142 "common.w"
+#line 1143 "common.w"
 int wrap_up(){
 putchar('\n');
 if(show_stats)
 print_stats();
 /*62:*/
-#line 1152 "common.w"
+#line 1153 "common.w"
 switch(history){
 case spotless:if(show_happiness)printf("(No errors were found.)\n");break;
 }
 /*:62*/
-#line 1147 "common.w"
+#line 1148 "common.w"
 ;
 if(history>harmless_message)return(1);
 else return(0);
 }
 /*:61*//*64:*/
-#line 1171 "common.w"
+#line 1172 "common.w"
 void
 fatal(s,t)
 char*s,*t;
 }
 /*:64*//*65:*/
-#line 1182 "common.w"
+#line 1183 "common.w"
 void
 overflow(t)
 char*t;
 /*:65*//*70:*/
-#line 1246 "common.w"
+#line 1247 "common.w"
 void
 scan_args()
 while(--argc>0){
 if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*74:*/
-#line 1340 "common.w"
+#line 1341 "common.w"
 {
 if(**argv=='-')flag_change= 0;
 }
 /*:74*/
-#line 1258 "common.w"
+#line 1259 "common.w"
 else{
 s= name_pos= *argv;dot_pos= NULL;
 else s++;
 }
 if(!found_web)/*71:*/
-#line 1284 "common.w"
+#line 1285 "common.w"
 {
 if(s-*argv>max_file_name_length-5)
 /*76:*/
-#line 1360 "common.w"
+#line 1361 "common.w"
 fatal("! Filename too long\n",*argv);
 /*:76*/
-#line 1287 "common.w"
+#line 1288 "common.w"
 ;
 if(dot_pos==NULL)
 sprintf(web_file_name,"%s.w",*argv);
 }
 /*:71*/
-#line 1267 "common.w"
+#line 1268 "common.w"
 else if(!found_change)/*72:*/
-#line 1302 "common.w"
+#line 1303 "common.w"
 {
 if(strcmp(*argv,"-")==0)found_change= -1;
 else{
 if(s-*argv>max_file_name_length-4)
 /*76:*/
-#line 1360 "common.w"
+#line 1361 "common.w"
 fatal("! Filename too long\n",*argv);
 /*:76*/
-#line 1307 "common.w"
+#line 1308 "common.w"
 ;
 if(dot_pos==NULL)
 sprintf(change_file_name,"%s.ch",*argv);
 }
 /*:72*/
-#line 1268 "common.w"
+#line 1269 "common.w"
 else if(!found_out)/*73:*/
-#line 1315 "common.w"
+#line 1316 "common.w"
 {
 if(s-*argv>max_file_name_length-5)
 /*76:*/
-#line 1360 "common.w"
+#line 1361 "common.w"
 fatal("! Filename too long\n",*argv);
 /*:76*/
-#line 1318 "common.w"
+#line 1319 "common.w"
 ;
 if(dot_pos==NULL){
 sprintf(tex_file_name,"%s.tex",*argv);
 }
 /*:73*/
-#line 1269 "common.w"
+#line 1270 "common.w"
 else/*75:*/
-#line 1348 "common.w"
+#line 1349 "common.w"
 {
 if(program==ctangle)
 }
 /*:75*/
-#line 1270 "common.w"
+#line 1271 "common.w"
 ;
 }
 }
 if(!found_web)/*75:*/
-#line 1348 "common.w"
+#line 1349 "common.w"
 {
 if(program==ctangle)
 }
 /*:75*/
-#line 1273 "common.w"
+#line 1274 "common.w"
 ;
 if(found_change<=0)strcpy(change_file_name,"/dev/null");
 }

common.w+8−7

 % 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 3.1 --- November 1993 (works with later versions too)
+% Version 3.3 --- December 1994 (works with later versions too)
 % Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth
 \def\v{\char'174} % vertical (|) in typewriter font
-\def\title{Common code for CTANGLE and CWEAVE (Version 3.1)}
+\def\title{Common code for CTANGLE and CWEAVE (Version 3.3)}
 \def\topofcontents{\null\vfill
   \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
     {\ttitlefont CWEAVE}}
   \vskip 15pt
-  \centerline{(Version 3.1)}
+  \centerline{(Version 3.3)}
   \vfill}
 \def\botofcontents{\vfill
 \noindent
 using the definitions below. These definitions are consistent with
 an extension of ASCII code originally developed at MIT and explained in
 Appendix~C of {\sl The \TEX/book\/}; thus, users who have such a
-character set can type things like \.{\char'32} and \.{char'4} instead
+character set can type things like \.{\char'32} and \.{\char'4} instead
 of \.{!=} and \.{\&\&}. (However, their files will not be too portable
 until more people adopt the extended code.)
 |*(limit+2)| without overstepping the bounds of the array.
 @d buf_size 100 /* for \.{CWEAVE} and \.{CTANGLE} */
-@d long_buf_size 500 /* for \.{CWEAVE} */
+@d longest_name 1000
+@d long_buf_size (buf_size+longest_name) /* for \.{CWEAVE} */
 @d xisspace(c) (isspace(c)&&((unsigned char)c<0200))
 @d xisupper(c) (isupper(c)&&((unsigned char)c<0200))
 @ The |section_lookup| procedure is supposed to find a
 section name that matches a new name, installing the new name if
-its doesn't match an existing one. The new name is the string
+it doesn't match an existing one. The new name is the string
 between |first| and |last|; a ``match'' means that the new name
 exactly equals or is a prefix or extension of a name in the tree.
 then giving an indication of where the error was spotted in the source file.
 Note that no period follows the error message, since the error routine
 will automatically supply a period. A newline is automatically supplied
-if the string begins with |"|"|.
+if the string begins with |"!"|.
 @<Predecl...@>=
 void  err_print();

ctang-bs.ch+2−2

@@ -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 3.2)\n"	20	@d banner "This is CTANGLE (Version 3.3)\n"
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 3.2pc/big)\n"	25	@d banner "This is CTANGLE (Version 3.3pc/big)\n"
26	@z	26	@z
27		27
28		28

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 3.2)\n"	12	@d banner "This is CTANGLE (Version 3.3)\n"
13	@y	13	@y
14	@d banner "This is CTANGLE (Version 3.2pc)\n"	14	@d banner "This is CTANGLE (Version 3.3pc)\n"
15	@z	15	@z
16	@x section 4	16	@x section 4
17	@d max_bytes 90000 /* the number of bytes in identifiers,	17	@d max_bytes 90000 /* the number of bytes in identifiers,

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 3.2)\n"	13	@d banner "This is CTANGLE (Version 3.3)\n"
14	@y	14	@y
15	@d banner "This is CTANGLE (VAX/VMS Version 3.2)\n"	15	@d banner "This is CTANGLE (VAX/VMS Version 3.3)\n"
16	@z	16	@z
17		17
18	@x section 6 (from common.h) (01-FEB-1992 ST)	18	@x section 6 (from common.h) (01-FEB-1992 ST)

ctangle.c+100−95

 #include <stdio.h>
 /*:6*//*62:*/
-#line 874 "ctangle.w"
+#line 875 "ctangle.w"
 #include <ctype.h>
 #include <stdlib.h>
 /*:62*/
 #line 62 "ctangle.w"
-#define banner "This is CTANGLE (Version 3.2)\n" \
+#define banner "This is CTANGLE (Version 3.3)\n" \
 #define max_bytes 90000 \
 #define period_ast 026
 #define minus_gt_ast 027 \
-#define xisalpha(c)(isalpha(c)&&((eight_bits)c<0200))
+#define xisalpha(c) (isalpha(c) &&((eight_bits) c<0200) )
-#define xisdigit(c)(isdigit(c)&&((eight_bits)c<0200))
+#define xisdigit(c) (isdigit(c) &&((eight_bits) c<0200) )
-#define xisspace(c)(isspace(c)&&((eight_bits)c<0200))
+#define xisspace(c) (isspace(c) &&((eight_bits) c<0200) )
-#define xislower(c)(islower(c)&&((eight_bits)c<0200))
+#define xislower(c) (islower(c) &&((eight_bits) c<0200) )
-#define xisupper(c)(isupper(c)&&((eight_bits)c<0200))
+#define xisupper(c) (isupper(c) &&((eight_bits) c<0200) )
-#define xisxdigit(c)(isxdigit(c)&&((eight_bits)c<0200)) \
+#define xisxdigit(c) (isxdigit(c) &&((eight_bits) c<0200) )  \
-#define length(c)(c+1)->byte_start-(c)->byte_start
+#define length(c) (c+1) ->byte_start-(c) ->byte_start
-#define print_id(c)term_write((c)->byte_start,length((c)))
+#define print_id(c) term_write((c) ->byte_start,length((c) ) )
 #define llink link
 #define rlink dummy.Rlink
 #define root name_dir->rlink \
 #define harmless_message 1
 #define error_message 2
 #define fatal_message 3
-#define mark_harmless {if(history==spotless)history= harmless_message;}
+#define mark_harmless {if(history==spotless) history= harmless_message;}
 #define mark_error history= error_message
-#define confusion(s)fatal("! This can't happen: ",s) \
+#define confusion(s) fatal("! This can't happen: ",s)  \
 #define max_file_name_length 60
 #define cur_file file[include_depth]
 #define show_progress flags['p']
 #define show_happiness flags['h'] \
 #define update_terminal fflush(stdout)
 #define new_line putchar('\n')
 #define putxchar putchar
-#define term_write(a,b)fflush(stdout),fwrite(a,sizeof(char),b,stdout)
+#define term_write(a,b) fflush(stdout) ,fwrite(a,sizeof(char) ,b,stdout)
-#define C_printf(c,a)fprintf(C_file,c,a)
+#define C_printf(c,a) fprintf(C_file,c,a)
-#define C_putc(c)putc(c,C_file) \
+#define C_putc(c) putc(c,C_file)  \
 #define equiv equiv_or_xref \
 #define string 02
 #define join 0177
-#define output_defs_flag (2*024000-1) \
+#define output_defs_flag (2*024000-1)  \
 #define cur_end cur_state.end_field
 #define cur_byte cur_state.byte_field
 #define constant 03 \
-#define isxalpha(c)((c)=='_')
+#define isxalpha(c) ((c) =='_')
-#define ishigh(c)((unsigned char)(c)>0177) \
+#define ishigh(c) ((unsigned char) (c) >0177)  \
  \
-#define compress(c)if(loc++<=limit)return(c) \
+#define compress(c) if(loc++<=limit) return(c)  \
 #define macro 0
-#define app_repl(c){if(tok_ptr==tok_mem_end)overflow("token");*tok_ptr++= c;} \
+#define app_repl(c) {if(tok_ptr==tok_mem_end) overflow("token") ;*tok_ptr++= c;} \
 #line 63 "ctangle.w"
 #line 871 "ctangle.w"
 name_pointer cur_section_name;
+int no_where;
 /*:61*//*75:*/
-#line 1181 "ctangle.w"
+#line 1185 "ctangle.w"
 text_pointer cur_text;
 eight_bits next_control;
 /*:75*//*82:*/
-#line 1328 "ctangle.w"
+#line 1335 "ctangle.w"
 extern sixteen_bits section_count;
 /*:46*//*48:*/
 #line 642 "ctangle.w"
-void out_char();
+static void out_char();
 /*:48*//*90:*/
-#line 1434 "ctangle.w"
+#line 1442 "ctangle.w"
 void phase_one();
 /*:90*//*92:*/
-#line 1452 "ctangle.w"
+#line 1460 "ctangle.w"
 void skip_limbo();
 }
 /*:57*//*71:*/
-#line 1105 "ctangle.w"
+#line 1106 "ctangle.w"
 section_text[0]= ' ';
 /*:71*/
 /*:47*//*49:*/
 #line 645 "ctangle.w"
-void
+static void
 out_char(cur_char)
 eight_bits cur_char;
 {
 }
 /*:60*//*63:*/
-#line 885 "ctangle.w"
+#line 886 "ctangle.w"
 eight_bits
 get_next()
 if(loc>limit){
 if(preprocessing&&*(limit-1)!='\\')preprocessing= 0;
 if(get_line()==0)return(new_section);
-else if(print_where){
+else if(print_where&&!no_where){
 print_where= 0;
 /*77:*/
-#line 1208 "ctangle.w"
+#line 1215 "ctangle.w"
 store_two_bytes(0150000);
 if(changing)id_first= change_file_name;
 id_loc= id_first+strlen(id_first);
 if(changing)store_two_bytes((sixteen_bits)change_line);
 else store_two_bytes((sixteen_bits)cur_line);
-{int a= id_lookup(id_first,id_loc)-name_dir;app_repl((a/0400)+0200);
+{int a= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a/0400)+0200);
 app_repl(a%0400);}
 /*:77*/
-#line 897 "ctangle.w"
+#line 898 "ctangle.w"
 ;
 }
 else return('\n');
 }
 loc++;
 if(xisdigit(c)||c=='\\'||c=='.')/*66:*/
-#line 963 "ctangle.w"
+#line 964 "ctangle.w"
 {
 id_first= loc-1;
 if(*id_first=='.'&&!xisdigit(*loc))goto mistake;
 }
 /*:66*/
-#line 909 "ctangle.w"
+#line 910 "ctangle.w"
 else if(c=='\''||c=='"'||(c=='L'&&(*loc=='\''||*loc=='"')))
 /*67:*/
-#line 994 "ctangle.w"
+#line 995 "ctangle.w"
 {
 char delim= c;
 id_first= section_text+1;
 }
 /*:67*/
-#line 911 "ctangle.w"
+#line 912 "ctangle.w"
 else if(isalpha(c)||isxalpha(c)||ishigh(c))
 /*65:*/
-#line 957 "ctangle.w"
+#line 958 "ctangle.w"
 {
 id_first= --loc;
 while(isalpha(*++loc)||isdigit(*loc)||isxalpha(*loc)||ishigh(*loc));
 }
 /*:65*/
-#line 913 "ctangle.w"
+#line 914 "ctangle.w"
 else if(c=='@')/*68:*/
-#line 1038 "ctangle.w"
+#line 1039 "ctangle.w"
 {
 c= ccode[(eight_bits)*loc++];
 switch(c){
 case section_name:
 cur_section_name_char= *(loc-1);
 /*70:*/
-#line 1087 "ctangle.w"
+#line 1088 "ctangle.w"
 {
 char*k;
 /*72:*/
-#line 1107 "ctangle.w"
+#line 1108 "ctangle.w"
 k= section_text;
 while(1){
 }
 c= *loc;
 /*73:*/
-#line 1131 "ctangle.w"
+#line 1132 "ctangle.w"
 if(c=='@'){
 c= *(loc+1);
 }
 /*:73*/
-#line 1116 "ctangle.w"
+#line 1117 "ctangle.w"
 ;
 loc++;if(k<section_text_end)k++;
 if(xisspace(c)){
 if(*k==' '&&k>section_text)k--;
 /*:72*/
-#line 1089 "ctangle.w"
+#line 1090 "ctangle.w"
 ;
 if(k-section_text>3&&strncmp(k-2,"...",3)==0)
 cur_section_name= section_lookup(section_text+1,k-3,1);
 }
 /*:40*/
-#line 1095 "ctangle.w"
+#line 1096 "ctangle.w"
 ;
 return(section_name);
 }
 /*:70*/
-#line 1053 "ctangle.w"
+#line 1054 "ctangle.w"
 ;
 case string:/*74:*/
-#line 1153 "ctangle.w"
+#line 1154 "ctangle.w"
 {
 id_first= loc++;*(limit+1)= '@';*(limit+2)= '>';
 while(*loc!='@'||*(loc+1)!='>')loc++;
 }
 /*:74*/
-#line 1054 "ctangle.w"
+#line 1055 "ctangle.w"
 ;
 case ord:/*69:*/
-#line 1066 "ctangle.w"
+#line 1067 "ctangle.w"
 id_first= loc;
 if(*loc=='\\'){
 return(ord);
 /*:69*/
-#line 1055 "ctangle.w"
+#line 1056 "ctangle.w"
 ;
 default:return(c);
 }
 }
 /*:68*/
-#line 914 "ctangle.w"
+#line 915 "ctangle.w"
 else if(xisspace(c)){
 if(!preprocessing||loc>limit)continue;
 }
 else if(c=='#'&&loc==buffer+1)preprocessing= 1;
 mistake:/*64:*/
-#line 935 "ctangle.w"
+#line 936 "ctangle.w"
 switch(c){
 case'+':if(*loc=='+')compress(plus_plus);break;
 }
 /*:64*/
-#line 921 "ctangle.w"
+#line 922 "ctangle.w"
 return(c);
 }
 }
 /*:63*//*76:*/
-#line 1185 "ctangle.w"
+#line 1189 "ctangle.w"
 void
 scan_repl(t)
 {
 sixteen_bits a;
 if(t==section_name){/*77:*/
-#line 1208 "ctangle.w"
+#line 1215 "ctangle.w"
 store_two_bytes(0150000);
 if(changing)id_first= change_file_name;
 id_loc= id_first+strlen(id_first);
 if(changing)store_two_bytes((sixteen_bits)change_line);
 else store_two_bytes((sixteen_bits)cur_line);
-{int a= id_lookup(id_first,id_loc)-name_dir;app_repl((a/0400)+0200);
+{int a= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a/0400)+0200);
 app_repl(a%0400);}
 /*:77*/
-#line 1191 "ctangle.w"
+#line 1195 "ctangle.w"
 ;}
 while(1)switch(a= get_next()){
 /*78:*/
-#line 1218 "ctangle.w"
+#line 1225 "ctangle.w"
-case identifier:a= id_lookup(id_first,id_loc)-name_dir;
+case identifier:a= id_lookup(id_first,id_loc,0)-name_dir;
 app_repl((a/0400)+0200);
 app_repl(a%0400);break;
 case section_name:if(t!=section_name)goto done;
 else{
 /*79:*/
-#line 1246 "ctangle.w"
+#line 1253 "ctangle.w"
 {
 char*try_loc= loc;
 while(*try_loc==' '&&try_loc<limit)try_loc++;
 }
 /*:79*/
-#line 1224 "ctangle.w"
+#line 1231 "ctangle.w"
 ;
 a= cur_section_name-name_dir;
 app_repl((a/0400)+0250);
 app_repl(a%0400);
 /*77:*/
-#line 1208 "ctangle.w"
+#line 1215 "ctangle.w"
 store_two_bytes(0150000);
 if(changing)id_first= change_file_name;
 id_loc= id_first+strlen(id_first);
 if(changing)store_two_bytes((sixteen_bits)change_line);
 else store_two_bytes((sixteen_bits)cur_line);
-{int a= id_lookup(id_first,id_loc)-name_dir;app_repl((a/0400)+0200);
+{int a= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a/0400)+0200);
 app_repl(a%0400);}
 /*:77*/
-#line 1228 "ctangle.w"
+#line 1235 "ctangle.w"
 ;break;
 }
 case output_defs_code:
 app_repl((a/0400)+0200);
 app_repl(a%0400);
 /*77:*/
-#line 1208 "ctangle.w"
+#line 1215 "ctangle.w"
 store_two_bytes(0150000);
 if(changing)id_first= change_file_name;
 id_loc= id_first+strlen(id_first);
 if(changing)store_two_bytes((sixteen_bits)change_line);
 else store_two_bytes((sixteen_bits)cur_line);
-{int a= id_lookup(id_first,id_loc)-name_dir;app_repl((a/0400)+0200);
+{int a= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a/0400)+0200);
 app_repl(a%0400);}
 /*:77*/
-#line 1234 "ctangle.w"
+#line 1241 "ctangle.w"
 ;break;
 case constant:case string:
 /*80:*/
-#line 1257 "ctangle.w"
+#line 1264 "ctangle.w"
 app_repl(a);
 while(id_first<id_loc){
 app_repl(a);break;
 /*:80*/
-#line 1236 "ctangle.w"
+#line 1243 "ctangle.w"
 ;
 case ord:
 /*81:*/
-#line 1273 "ctangle.w"
+#line 1280 "ctangle.w"
 {
 int c= (eight_bits)*id_first;
 if(c=='\\'){
 break;
 /*:81*/
-#line 1238 "ctangle.w"
+#line 1245 "ctangle.w"
 ;
 case definition:case format_code:case begin_C:if(t!=section_name)goto done;
 else{
 case new_section:goto done;
 /*:78*/
-#line 1196 "ctangle.w"
+#line 1200 "ctangle.w"
+case')':app_repl(a);
+if(t==macro)app_repl(' ');
+break;
 default:app_repl(a);
 }
 done:next_control= (eight_bits)a;
 }
 /*:76*//*83:*/
-#line 1335 "ctangle.w"
+#line 1342 "ctangle.w"
 void
 scan_section()
 name_pointer p;
 text_pointer q;
 sixteen_bits a;
-section_count++;
+section_count++;no_where= 1;
 if(*(loc-1)=='*'&&show_progress){
 printf("*%d",section_count);update_terminal;
 }
 next_control= 0;
 while(1){
 /*84:*/
-#line 1373 "ctangle.w"
+#line 1381 "ctangle.w"
 while(next_control<definition)
 }
 /*:84*/
-#line 1349 "ctangle.w"
+#line 1356 "ctangle.w"
 ;
 if(next_control==definition){
 /*85:*/
-#line 1380 "ctangle.w"
+#line 1388 "ctangle.w"
 {
 while((next_control= get_next())=='\n');
 if(next_control!=identifier){
 continue;
 }
-app_repl(((a= id_lookup(id_first,id_loc)-name_dir)/0400)+0200);
+app_repl(((a= id_lookup(id_first,id_loc,0)-name_dir)/0400)+0200);
 app_repl(a%0400);
 if(*loc!='('){
 app_repl(string);app_repl(' ');app_repl(string);
 }
-print_where= 0;scan_repl(macro);
+scan_repl(macro);
 cur_text->text_link= 0;
 }
 /*:85*/
-#line 1351 "ctangle.w"
+#line 1358 "ctangle.w"
 continue;
 }
 if(next_control==section_name){
 p= cur_section_name;
 /*86:*/
-#line 1405 "ctangle.w"
+#line 1413 "ctangle.w"
 while((next_control= get_next())=='+');
 if(next_control!='='&&next_control!=eq_eq)
 continue;
 /*:86*/
-#line 1359 "ctangle.w"
+#line 1366 "ctangle.w"
 ;
 break;
 }
 return;
 }
+no_where= print_where= 0;
 /*87:*/
-#line 1410 "ctangle.w"
+#line 1418 "ctangle.w"
 /*88:*/
-#line 1415 "ctangle.w"
+#line 1423 "ctangle.w"
 store_two_bytes((sixteen_bits)(0150000+section_count));
 /*:88*/
-#line 1411 "ctangle.w"
+#line 1419 "ctangle.w"
 ;
 scan_repl(section_name);
 /*89:*/
-#line 1419 "ctangle.w"
+#line 1427 "ctangle.w"
 if(p==name_dir||p==0){
 (last_unnamed)->text_link= cur_text-text_info;last_unnamed= cur_text;
 /*:89*/
-#line 1413 "ctangle.w"
+#line 1421 "ctangle.w"
 ;
 /*:87*/
-#line 1364 "ctangle.w"
+#line 1372 "ctangle.w"
 ;
 }
 /*:83*//*91:*/
-#line 1437 "ctangle.w"
+#line 1445 "ctangle.w"
 void
 phase_one(){
 }
 /*:91*//*93:*/
-#line 1455 "ctangle.w"
+#line 1463 "ctangle.w"
 void
 skip_limbo()
 if(ccode[(eight_bits)c]==new_section)break;
 switch(ccode[(eight_bits)c]){
 case translit_code:/*94:*/
-#line 1484 "ctangle.w"
+#line 1492 "ctangle.w"
 while(xisspace(*loc)&&loc<limit)loc++;
 loc+= 3;
 }
 /*:94*/
-#line 1468 "ctangle.w"
+#line 1476 "ctangle.w"
 ;break;
 case format_code:case'@':break;
 case control_text:if(c=='q'||c=='Q'){
 }
 /*:93*//*95:*/
-#line 1510 "ctangle.w"
+#line 1518 "ctangle.w"
 void
 print_stats(){

ctangle.w+21−13

 % 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 3.2 --- July 1994
+% Version 3.3 --- December 1994
 % Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth
 \mathchardef\RA="3221 % right arrow
 \mathchardef\BA="3224 % double arrow
-\def\title{CTANGLE (Version 3.2)}
+\def\title{CTANGLE (Version 3.3)}
 \def\topofcontents{\null\vfill
   \centerline{\titlefont The {\ttitlefont CTANGLE} processor}
   \vskip 15pt
-  \centerline{(Version 3.2)}
+  \centerline{(Version 3.3)}
   \vfill}
 \def\botofcontents{\vfill
 \noindent
 The ``banner line'' defined here should be changed whenever \.{CTANGLE}
 is modified.
-@d banner "This is CTANGLE (Version 3.2)\n"
+@d banner "This is CTANGLE (Version 3.3)\n"
 @c
 @<Include files@>@/
 (end the constant).
 @<Predecl...@>=
-void out_char();
+static void out_char();
 @ @c
-void
+static void
 out_char(cur_char)
 eight_bits cur_char;
 {
 the two types of comments.
 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 `\.{@@*}'.
+No comment, long or short, is allowed to contain `\.{@@\ }' or `\.{@@*}'.
 @<Global...@>=
 boolean comment_continues=0; /* are we scanning a comment? */
 @<Global...@>=
 name_pointer cur_section_name; /* name of section just scanned */
+int no_where; /* suppress |print_where|? */
 @ @<Include...@>=
 #include <ctype.h> /* definition of |isalpha|, |isdigit| and so on */
     if (loc>limit) {
       if (preprocessing && *(limit-1)!='\\') preprocessing=0;
       if (get_line()==0) return(new_section);
-      else if (print_where) {
+      else if (print_where && !no_where) {
           print_where=0;
           @<Insert the line number into |tok_mem|@>;
         }
 \item{b)}The symbols \.{@@d} and \.{@@f} and \.{@@c} are not allowed after
 section names, while they terminate macro definitions.
+\item{c)}Spaces are inserted after right parentheses in macros, because the
+ANSI \CEE/ preprocessor sometimes requires it.
 \yskip Therefore there is a single procedure |scan_repl| whose parameter
 |t| specifies either |macro| or |section_name|. After |scan_repl| has
 acted, |cur_text| will point to the replacement text just generated, and
         |section_name|, etc.), either process it and change |a| to a byte
         that should be stored, or |continue| if |a| should be ignored,
         or |goto done| if |a| signals the end of this replacement text@>@;
+      case ')': app_repl(a);
+        if (t==macro) app_repl(' ');
+        break;
       default: app_repl(a); /* store |a| in |tok_mem| */
     }
   done: next_control=(eight_bits) a;
 id_loc=id_first+strlen(id_first);
 if (changing) store_two_bytes((sixteen_bits)change_line);
 else store_two_bytes((sixteen_bits)cur_line);
-{int a=id_lookup(id_first,id_loc)-name_dir; app_repl((a / 0400)+0200);
+{int a=id_lookup(id_first,id_loc,0)-name_dir; app_repl((a / 0400)+0200);
   app_repl(a % 0400);}
 @ @<In cases that |a| is...@>=
-case identifier: a=id_lookup(id_first,id_loc)-name_dir;
+case identifier: a=id_lookup(id_first,id_loc,0)-name_dir;
   app_repl((a / 0400)+0200);
   app_repl(a % 0400); break;
 case section_name: if (t!=section_name) goto done;
   name_pointer p; /* section name for the current section */
   text_pointer q; /* text for the current section */
   sixteen_bits a; /* token for left-hand side of definition */
-  section_count++;
+  section_count++; @+ no_where=1;
   if (*(loc-1)=='*' && show_progress) { /* starred section */
     printf("*%d",section_count); update_terminal;
   }
     }
     return; /* \.{@@\ } or \.{@@*} */
   }
+  no_where=print_where=0;
   @<Scan the \CEE/ part of the current section@>;
 }
 @.Definition flushed...@>
     continue;
   }
-  app_repl(((a=id_lookup(id_first,id_loc)-name_dir) / 0400)+0200);
+  app_repl(((a=id_lookup(id_first,id_loc,0)-name_dir) / 0400)+0200);
         /* append the lhs */
   app_repl(a % 0400);
   if (*loc!='(') { /* identifier must be separated from replacement text */
     app_repl(string); app_repl(' '); app_repl(string);
   }
-  print_where=0; scan_repl(macro);
+  scan_repl(macro);
   cur_text->text_link=0; /* |text_link==0| characterizes a macro */
 }

cweav-bs.ch+33−5

 The main purpose of these changes is to support MSDOS with full-size arrays
 by using "huge" pointers.
-(This file contributed by Barry Schwartz, trashman@crud.mn.org, 28 Jun 94;
+This file contributed by Barry Schwartz, trashman@crud.mn.org, 28 Jun 94.
- revised 24 Jul 94.)
 (Includes workaround for compiler bug [pointers wrapping around at
  segment boundaries], November 1993, contributed by Jorge Fernandez Arnaiz
  -- arnaiz@redvax1.dgsca.unam.mx)
+(Last revised 5 Dec 94 with help of bob@microprograms.com.)
 @x Section 1.
 The ``banner line'' defined here should be changed whenever \.{CWEAVE}
 is modified.
-@d banner "This is CWEAVE (Version 3.2)\n"
+@d banner "This is CWEAVE (Version 3.3)\n"
 @y
 The ``banner line'' defined here should be changed whenever \.{CWEAVE}
 is modified.
-@d banner "This is CWEAVE (Version 3.2pc/big)\n"
+@d banner "This is CWEAVE (Version 3.3pc/big)\n"
 @z
   p->xref = (char huge*)xref_ptr;
 @z
+@x Section 25. (to please Borland's C++, version 4.02)
+token tok_mem[max_toks]; /* tokens */
+token_pointer tok_mem_end = tok_mem+max_toks-1; /* end of |tok_mem| */
+token_pointer tok_start[max_texts]; /* directory into |tok_mem| */
+token_pointer tok_ptr; /* first unused position in |tok_mem| */
+text_pointer text_ptr; /* first unused position in |tok_start| */
+text_pointer tok_start_end = tok_start+max_texts-1; /* end of |tok_start| */
+token_pointer max_tok_ptr; /* largest value of |tok_ptr| */
+@y
+token tok_mem[max_toks]; /* tokens */
+token_pointer tok_mem_end; /* end of |tok_mem| */
+token_pointer tok_start[max_texts]; /* directory into |tok_mem| */
+token_pointer tok_ptr; /* first unused position in |tok_mem| */
+text_pointer text_ptr; /* first unused position in |tok_start| */
+text_pointer tok_start_end; /* end of |tok_start| */
+token_pointer max_tok_ptr; /* largest value of |tok_ptr| */
+@z
+@x Section 26. (goes with the previous change)
+tok_start[1]=tok_mem+1;
+max_tok_ptr=tok_mem+1; max_text_ptr=tok_start+1;
+@y
+tok_start[1]=tok_mem+1;
+tok_mem_end=tok_mem+max_toks-1;
+tok_start_end=tok_start+max_texts-1;
+max_tok_ptr=tok_mem+1; max_text_ptr=tok_start+1;
+@z
 @x Section 27.
   p->ilk=t; p->xref=(char*)xmem;
 @x Section 27.
   p->xref=(char*)xmem;
 @y
-  p->xref=(char*)xmem;
+  p->xref=(char huge*)xmem;
 @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 3.2)\n"	14	@d banner "This is CWEAVE (Version 3.3)\n"
15	@y	15	@y
16	@d banner "This is CWEAVE (Version 3.2pc)\n"	16	@d banner "This is CWEAVE (Version 3.3pc)\n"
17	@z	17	@z
18		18
19	@x section 4	19	@x section 4

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 3.2)\n"	16	@d banner "This is CWEAVE (Version 3.3)\n"
17	@y	17	@y
18	@d banner "This is CWEAVE (VAX/VMS Version 3.2)\n"	18	@d banner "This is CWEAVE (VAX/VMS Version 3.3)\n"
19	@z	19	@z
20		20
21	@x section 6 (from common.h) (01-FEB-1992 ST)	21	@x section 6 (from common.h) (01-FEB-1992 ST)

cweave.w+24−12

 % 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 3.2 --- July 1994
+% Version 3.3 --- December 1994
 % Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth
 \def\skipxTeX{\\{skip\_\TEX/}}
 \def\copyxTeX{\\{copy\_\TEX/}}
-\def\title{CWEAVE (Version 3.2)}
+\def\title{CWEAVE (Version 3.3)}
 \def\topofcontents{\null\vfill
   \centerline{\titlefont The {\ttitlefont CWEAVE} processor}
   \vskip 15pt
-  \centerline{(Version 3.2)}
+  \centerline{(Version 3.3)}
   \vfill}
 \def\botofcontents{\vfill
 \noindent
 The ``banner line'' defined here should be changed whenever \.{CWEAVE}
 is modified.
-@d banner "This is CWEAVE (Version 3.2)\n"
+@d banner "This is CWEAVE (Version 3.3)\n"
 @c @<Include files@>@/
 @h
   }
   while (*loc=='u' || *loc=='U' || *loc=='l' || *loc=='L'
          || *loc=='f' || *loc=='F') {
-    *id_loc++='$'; *id_loc++=toupper(*loc++);
+    *id_loc++='$'; *id_loc++=toupper(*loc); loc++;
   }
   return(constant);
 }
 applied from left to right. Suppose that we are currently working on the
 sequence of scraps $s_1\,s_2\ldots s_n$. We try first to find the longest
 production that applies to an initial substring $s_1\,s_2\ldots\,$; but if
-no such productions exist, we find to find the longest production
+no such productions exist, we try to find the longest production
 applicable to the next substring $s_2\,s_3\ldots\,$; and if that fails, we
 try to match $s_3\,s_4\ldots\,$, etc.
 \.-&|unorbinop|: \.-&yes\cr
 \.*&|raw_unorbin|: \.*&yes\cr
 \./&|binop|: \./&yes\cr
-\.<&|binop|: \.<&yes\cr
+\.<&|prelangle|: \.{\\langle}&yes\cr
 \.=&|binop|: \.{\\K}&yes\cr
-\.>&|binop|: \.>&yes\cr
+\.>&|prerangle|: \.{\\rangle}&yes\cr
 \..&|binop|: \..&yes\cr
 \.{\v}&|binop|: \.{\\OR}&yes\cr
 \.\^&|binop|: \.{\\XOR}&yes\cr
 }
 @ @<Cases for |raw_rpar|@>=
-if (cat1==const_like) {
+if (cat1==const_like && @|
+    (cat2==semi || cat2==lbrace || cat2==comma || cat2==binop
+      || cat2==const_like)) {
   big_app1(pp); big_app(' ');
   big_app1(pp+1); reduce(pp,2,raw_rpar,0,103);
 } else squash(pp,1,rpar,-3,104);
 @ We do not make the \TEX/ string into a scrap, because there is no
 telling what the user will be putting into it; instead we leave it
-open, to be picked up by next scrap. If it comes at the end of a
+open, to be picked up by the next scrap. If it comes at the end of a
 section, it will be made into a scrap when |finish_C| is called.
+There's a known bug here, in cases where an adjacent scrap is
+|prelangle| or |prerangle|. Then the \TEX/ string can disappear
+when the \.{\\langle} or \.{\\rangle} becomes \.{<} or \.{>}.
+For example, if the user writes \.{\v x<@@ty@@>\v}, the \TEX/ string
+\.{\\hbox\{y\}} eventually becomes part of an |insert| scrap, which is combined
+with a |prelangle| scrap and eventually lost. The best way to work around
+this bug is probably to enclose the \.{@@t...@@>} in \.{@@[...@@]} so that
+the \TEX/ string is treated as an expression.
+@^bug, known@>
 @<Append a \TEX/ string, without forming a scrap@>=
 app_str("\\hbox{"@q}@>);
 @^high-bit character handling@>
 it starts after we scan the matching `\.)'.
 @<Start a macro...@>= {
-  if (save_line!=out_line || save_place!=out_ptr)  app(backup);
+  if (save_line!=out_line || save_place!=out_ptr || space_checked) app(backup);
   if(!space_checked){emit_space_if_needed;save_position;}
   app_str("\\D"); /* this will produce `\&{define }' */
 @.\\D@>
 We are nearly finished! \.{CWEAVE}'s only remaining task is to write out the
 index, after sorting the identifiers and index entries.
-If the user has set the |no_xref| flag (the |-x| option on the command line),
+If the user has set the |no_xref| flag (the \.{-x} option on the command line),
 just finish off the page, omitting the index, section name list, and table of
 contents.

cwebmac.tex+3−3

@@ -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 3.0 --- June 1993	2	% Version 3.1 --- September 1994
3	\ifx\documentstyle\undefined\else\endinput\fi % LaTeX will use other macros	3	\ifx\documentstyle\undefined\else\endinput\fi % LaTeX will use other macros
4	\xdef\fmtversion{\fmtversion+CWEB3.0}	4	\xdef\fmtversion{\fmtversion+CWEB3.1}
5		5
6	\let\:=\. % preserve a way to get the dot accent	6	\let\:=\. % preserve a way to get the dot accent
7	% (all other accents will still work as usual)	7	% (all other accents will still work as usual)
@@ -119,7 +119,7 @@ · 111 unmodified lines
119	\def\B{\rightskip=0pt plus 100pt minus 10pt % go into C mode	119	\def\B{\rightskip=0pt plus 100pt minus 10pt % go into C mode
120	\sfcode`;=3000	120	\sfcode`;=3000
121	\pretolerance 10000	121	\pretolerance 10000
122	\hyphenpenalty 9999 % so strings can be broken (discretionary \ is inserted)	122	\hyphenpenalty 1000 % so strings can be broken (discretionary \ is inserted)
123	\exhyphenpenalty 10000	123	\exhyphenpenalty 10000
124	\global\ind=2 \1\ \unskip}	124	\global\ind=2 \1\ \unskip}
125	\def\C#1{\5\5\quad$/\ast\,${\cmntfont #1}$\,\ast/$}	125	\def\C#1{\5\5\quad$/\ast\,${\cmntfont #1}$\,\ast/$}

cwebman.tex+21−19

 When writing a \.{CWEB} program the user keeps the
 \CEE/ code and the documentation in the same file, called the \.{CWEB}
 file and generally named \.{something.w}.  The command
-`\.{cweave something}' creates an output file \.{something.tex}, which
+`\.{cweave} \.{something}' creates an output file \.{something.tex}, which
 can then be fed to \TEX/, yielding a ``pretty printed'' version of
 \.{something.w} that correctly handles
 typographic details like page layout and the use of indentation,
 italics, boldface, and mathematical symbols. The typeset output also
 includes extensive cross-index
 information that is gathered automatically.  Similarly, if you run the
-command `\.{ctangle something}' you will get a \CEE/ file \.{something.c},
+command `\.{ctangle} \.{something}' you will get a \CEE/ file \.{something.c},
-with can then be compiled to yield executable code.
+which can then be compiled to yield executable code.
 Besides providing a documentation tool, \.{CWEB} enhances the \CEE/
 language by providing the
 a given web and intertwines the \TEX/ and \CEE/ portions contained in
 each section, then it knits the whole fabric into a structured document.
 (Get it? Wow.)  Perhaps there is some deep connection here with the fact
-that the German word for ``weave'' is ``{\it web\/}'', and the
+that the German word for ``weave'' is ``{\it webe\/}'', and the
 corresponding Latin imperative is ``{\it texe\/}''!
 A user of \.{CWEB} should be fairly familiar with the \CEE/
 have noted that the dividing line isn't sharp, since \CEE/ text can be
 included in \TEX/ text if it is enclosed in `\pb'.  Conversely, \TEX/ text
 appears frequently within \CEE/ text, because everything in
-comments (i.e., between \.{/*} and \.{*/}) is treated as \TEX/ text.
+comments (i.e., between \.{/*} and \.{*/}, or following \.{//})
+is treated as \TEX/ text.
 Likewise, the text of a section name consists of \TEX/ text, but
 the construct \.{@<section name@>} as a whole is is expected to be found
 in \CEE/ text; thus, one typically goes back and forth
 \CEE/ program. This text is ignored by \.{CTANGLE}, but it can be used
 for various purposes within \.{CWEAVE}. For example, you can make comments
 that mix \CEE/ and classical mathematics, as in `$\\{size}<2^{15}$', by
-typing `\.{|size < @t\$2\^\{15\}\$@>|}'.
+typing `\.{|size < 2@t\$\^\{15\}\$@>|}'.
 \@= [MCc] $*$ The control text that follows will
 be passed verbatim to the \CEE/ program.
 $$\hbox{\&{int} \\{array}[\\{max\_dim}], \\{count}${}=\\{old\_count};$}$$
 makes the names \\{array} and \\{count} get an underlined entry in the
 index.  Statement labels, function definitions like
-$\\{main}(\\{argc},\39\\{argv})$, and \&{typedef} definitions also
+\\{main}(\&{int}~\\{argc},\,\&{char}~$*$\\{argv}[\,]),
-imply underlining. A traditional-style
+and \&{typedef} definitions also
+imply underlining. An old-style
 function definition (without prototyping) doesn't define its arguments;
-the arguments will, however, be defined
+the arguments will, however, be considered to be defined
 (i.e., their index entries will be underlined) if their types are
 declared before the body of the function in the usual way
-(e.g., `\.{int}~\\{argc}; \.{char}~${**}\\{argv}$; $\{\,\ldots\,\}$').
+(e.g., `\&{int}~\\{argc}; \&{char}~${*}\\{argv}[\,]$; $\{\,\ldots\,\}$').
 \subsec
 We now turn to control codes that affect only the operation of
 are chosen automatically by \TEX/ according to a scheme that works 99\%\
 of the time, but sometimes you will prefer to force a line break so that
 the program is segmented according to logical rather than visual
-criteria.
+criteria. If a comment follows, say `\.{@/@,}' to break the line
+before the comment.
 \@| [MC] This control code specifies an optional line break in the midst of
 an expression. For example, if you have
 Furthermore the \\{web\_file} itself can be a combination of
 several files.  When either \.{CWEAVE} or \.{CTANGLE} is reading a file and
 encounters the control code \.{@i} at the beginning of a line, it
-interrupts normal reading and start looking at the file named after the
+interrupts normal reading and starts looking at the file named after the
 \.{@i}, much as the \CEE/ preprocessor does when it encounters an \.{\#include}
 line.  After the included file has been entirely read, the program
 goes back to the next line
 the left.) You can also use `\.{@t\}\\3\{-5@>}' to force a break
 in the middle of an expression.
-10. Don't use a change file to change just part of a macro call that
+10. Each identifier in \.{CWEB} has a single formatting convention. Therefore
-extends over more than one line; change the whole call or nothing.
+you shouldn't use the same identifier to denote, say, both a type name and
-Otherwise \.{CTANGLE} will insert \.{\#line} directives that confuse
+part of a \.{struct}, even though \CEE/ does allow this.
-the \CEE/ preprocessor.
 \section Running the programs.
 The \UNIX/ command line for \.{CTANGLE} is
 `\.{main(argc,argv)}'.
 \.{CWEAVE} automatically inserts a bit of extra space between declarations
-and the first apparent statement of a block, unless you turn off the
+and the first apparent statement of a block. One way to defeat this
-feature globally by running with the \.{-o} option. One way to defeat this
 spacing locally is
 $$\vbox{\halign{#\hfil\cr
 \.{int x;@+@t\}\\6\{@>}\cr
 \point 14. To get output in languages other than English, redefine the
 macros \.{\\A}, \.{\\ET}, \.{\\Q}, \.{\\U},
-\.{\\ch}, \.{\\fin}, and \.{\\con}. \.{CWEAVE} itself need not be changed.
+\.{\\ch}, \.{\\fin}, \.{\\con}, \.{\\today}, \.{\\datethis}, and
+\.{\\datecontentspage}. \.{CWEAVE} itself need not be changed.
 \point 15. Some output can be selectively suppressed with the macros
 \.{\\noatl}, \.{\\noinx}, \.{\\nosecs}, \.{\\nocon}.

examples/wc.w+23−8

 newline, space, or tab, containing at least one visible ASCII code.
 (We assume that the standard ASCII code is in use.)
+This version of \.{wc} has a nonstandard ``silent'' option (\.{-s}),
+which suppresses printing except for the grand totals over all files.
 @ Most \.{CWEB} programs share a common structure.  It's probably a
 good idea to state the overall structure explicitly at the outset,
 even though the various parts could all be introduced in unnamed
 displayed.  Each selection is given by the initial character
 (lines, words, or characters).  For example, `\.{-cl}' would cause
 just the number of characters and the number of lines to be printed,
-in that order.
+in that order. The default, if no special argument is given, is `\.{-lwc}'.
 We do not process this string now; we simply remember where it is.
- It will be used to control the formatting at output time.
+It will be used to control the formatting at output time.
+If the `\.{-}' is immediately followed by `\.{s}', only summary totals
+are printed.
 @<Var...@>=
 int file_count; /* how many files there are */
 char *which; /* which counts to print */
+int silent=0; /* nonzero if the silent option was selected */
 @ @<Set up o...@>=
 which="lwc"; /* if no option is given, print all three values */
-if (argc>1 && *argv[1] == '-') { which=argv[1]+1; argc--; argv++; }
+if (argc>1 && *argv[1] == '-') {
+  argv[1]++;
+  if (*argv[1]=='s') silent=1,argv[1]++;
+  if (*argv[1]) which=argv[1];
+  argc--; argv++;
+}
 file_count=argc-1;
 @ Now we scan the remaining arguments and try to open a file, if
 we have processed or if it was just |stdin|.
 @<Write...@>=
-wc_print(which, char_count, word_count, line_count);
+if (!silent) {
-if (file_count) printf (" %s\n", *argv); /* not |stdin| */
+  wc_print(which, char_count, word_count, line_count);
-else printf ("\n"); /* |stdin| */
+  if (file_count) printf (" %s\n", *argv); /* not |stdin| */
+  else printf ("\n"); /* |stdin| */
+}
 @ @<Upda...@>=
 tot_line_count+=line_count;
 number of files too.
 @<Print the...@>=
-if (file_count>1) {
+if (file_count>1 || silent) {
   wc_print(which, tot_char_count, tot_word_count, tot_line_count);
-  printf(" total in %d files\n",file_count);
+  if (!file_count) printf("\n");
+  else printf(" total in %d file%s\n",file_count,file_count>1?"s":"");
 }
 @ Here now is the function that prints the values according to the

examples/wmerge.w+1−1

@@ -63,7 +63,7 @@ than \|buf_size\|, so that \|buffer[buf_size-1]\| is never filled. · 62 unmodified lines
63	Some of the routines use the fact that it is safe to refer to	63	Some of the routines use the fact that it is safe to refer to
64	\|*(limit+2)\| without overstepping the bounds of the array.	64	\|*(limit+2)\| without overstepping the bounds of the array.
65		65
66	@d buf_size 100	66	@d buf_size 1024
67		67
68	@<Definitions...@>=	68	@<Definitions...@>=
69	ASCII buffer[buf_size]; /* where each line of input goes */	69	ASCII buffer[buf_size]; /* where each line of input goes */

prod.w+9−5

 \+& |lpar| |rpar| & |exp| \hfill $L\.{\\,}R$ & functions, declarations\cr
 \+& |lpar| \alt |decl_head| |int_like| |rpar| & |cast| & |(char*)|\cr
 \+& |lpar| \altt |decl_head| |int_like| |exp| |comma| & |lpar| \hfill
-     L\,\altt $D$ $I$ $E$ C\,|opt|9 & |(int,|\cr
+     $L$\,\altt $D$ $I$ $E$ C\,|opt|9 & |(int,|\cr
 \+& |lpar| \alt |stmt| |decl| & |lpar| \hfill \alt {$LS\.\ $} {$LD\.\ $} &
     \alt {|(k=5;|} {|(int k=5;|} \cr
 \+& |question| |exp| |colon| & |binop| & |?x:|\cr
    &$\langle\,$section name$\,\rangle$;\cr
 \+& |section_scrap| & |exp| &$\langle\,$section name$\,\rangle$\cr
 \+& |insert| |any| & |any| & \.{\v\#include\v}\cr
-\+& |prelangle| & |binop| \hfill $<$ & $<$ not in template\cr
+\+& |prelangle| & |binop| \hfill \.< & $<$ not in template\cr
-\+& |prerangle| & |binop| \hfill $>$ & $>$ not in template\cr
+\+& |prerangle| & |binop| \hfill \.> & $>$ not in template\cr
 \+& |langle| |exp| |prerangle| & |cast| & $\langle\,0\,\rangle$\cr
 \+& |langle| |prerangle| & |cast| \hfill $L\.{\\,}P$ & $\langle\,\rangle$\cr
 \+& |langle| \alt|decl_head| |int_like| |prerangle| & |cast| &
      $\langle\&{class}\,\&C\rangle$\cr
 \+& |langle| \alt|decl_head| |int_like| |comma| & |langle| \hfill
-     L\,\alt $D$ $I$ C\,|opt|9 & $\langle\&{class}\,\&C,$\cr
+     $L$\,\alt $D$ $I$ C\,|opt|9 & $\langle\&{class}\,\&C,$\cr
 \+& |public_like| |colon| & |tag| & \&{private}:\cr
 \+& |public_like| & |int_like| & \&{private}\cr
 \+& |colcol| \alt|exp| |int_like| & \alt|exp| |int_like| & |::x|\cr
      : \&{public} $a$,\cr
 \+& |base| |public_like| |exp| & |base| |int_like| \hfill $I=P\.\ E$ &
      : \&{public} $a$\cr
-\+& |raw_rpar| |const_like| & |raw_rpar| \hfill $R\.\ C$ & ) \&{const};\cr
+\+\dag\theprodno& |raw_rpar| |const_like| & |raw_rpar| \hfill $R\.\ C$ &
+     ) \&{const};\cr
 \+& |raw_rpar| & |rpar| & );\cr
 \+& |raw_unorbin| |const_like| & |raw_unorbin| \hfill $RC$\.{\\\ }
      & $*$\&{const} |x|\cr
 Rule 97: The operator after |operator_like|
 must not be immediately followed by a |binop|.
+Rule 103: The operator after |const_like| must be |semi|, |lbrace|, |comma|,
+|binop|, or |const_like|.
 \endgroup

CWEB — Release 3.3, 1994-12-06.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code