From bc5703fad4418c78046508f30e946136808a9a74 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Wed, 14 Jul 2021 08:50:52 +0200 Subject: [PATCH] CWEB - release 4.5, 2021-07-14. This is a service release for CWEB 4.4: * Code review with the 'splint' tool. * All 'length' variables were retyped to 'size_t'. * A few new bugs were created and fixed. --- Makefile | 2 +- README.md | 4 +- comm-mac.ch | 4 +- comm-ql.ch | 8 +- common.c | 62 +++++----- common.h | 16 +-- common.w | 58 +++++----- ctang-bs.ch | 4 +- ctang-pc.ch | 4 +- ctang-ql.ch | 8 +- ctang-vms.ch | 4 +- ctang-w32.ch | 4 +- ctangle.c | 313 ++++++++++++++++++++++++++------------------------- ctangle.w | 113 ++++++++++--------- cweav-bs.ch | 4 +- cweav-pc.ch | 4 +- cweav-ql.ch | 8 +- cweav-vms.ch | 4 +- cweav-w32.ch | 4 +- cweave.w | 86 +++++++------- cwebmac.tex | 4 +- cwebman.tex | 6 +- prod.w | 2 +- 23 files changed, 372 insertions(+), 354 deletions(-) diff --git a/Makefile b/Makefile index 85986b6..f3a7f7c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # This file is part of CWEB. # It is distributed WITHOUT ANY WARRANTY, express or implied. -# Version 4.4 --- June 2021 +# Version 4.5 --- July 2021 # Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth diff --git a/README.md b/README.md index d62c1fc..82c2251 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# cweb 4.4 +# cweb 4.5 people have been accumulating several decades of experience with [cweb](http://www-cs-faculty.stanford.edu/~uno/cweb.html), and we know that @@ -19,7 +19,7 @@ details in the besides for further development, this ‘project’ is used as an – obviously incomplete – repository of original release versions of levy/knuth [cweb](http://www-cs-faculty.stanford.edu/~uno/cweb.html). you can either -compile these sources directly or stick the recent version “cweb-4.4” into my +compile these sources directly or stick the recent version “cweb-4.5” into my [cwebbin](https://github.com/ascherer/cwebbin), which introduces convenient extensions and prepares cweb for inclusion in the “tex live” distribution. diff --git a/comm-mac.ch b/comm-mac.ch index aa67bf6..7d741e9 100644 --- a/comm-mac.ch +++ b/comm-mac.ch @@ -4,9 +4,9 @@ No changes to CTANGLE or CWEAVE are needed. (Contributed 13 Oct 2000 by AndPio@aol.com; slightly edited by Don Knuth) @x in limbo, change the title page document to specify Mac version - \centerline{(Version 4.4)} + \centerline{(Version 4.5)} @y - \centerline{(Version 4.4 for MacOS)} + \centerline{(Version 4.5 for MacOS)} @z @x section 23: Make input_ln accept \n, \r, \n\r, or \r\n as line endings diff --git a/comm-ql.ch b/comm-ql.ch index a50abbf..a1949b5 100644 --- a/comm-ql.ch +++ b/comm-ql.ch @@ -10,24 +10,24 @@ ex cc;'-v -h -c -=500000 -DCWEBINPUTS=flp2_ common_c' @x \def\v{\char'174} % vertical (|) in typewriter font -\def\title{Common code for CTANGLE and CWEAVE (Version 4.4)} +\def\title{Common code for CTANGLE and CWEAVE (Version 4.5)} \def\topofcontents{\null\vfill \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and {\ttitlefont CWEAVE}} \vskip 15pt - \centerline{(Version 4.4)} + \centerline{(Version 4.5)} \vfill} \def\botofcontents{\vfill \noindent @y \def\v{\char'174} % vertical (|) in typewriter font -\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.4)} +\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.5)} \def\topofcontents{\null\vfill \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and {\ttitlefont CWEAVE}} \vskip 15pt - \centerline{(Version 4.4)} + \centerline{(Version 4.5)} \vfill} \def\botofcontents{\vfill \noindent diff --git a/common.c b/common.c index 16733c1..5f3b490 100644 --- a/common.c +++ b/common.c @@ -36,12 +36,12 @@ #define compress(c) if(loc++<=limit) return c \ -#define xisalpha(c) (isalpha((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xisdigit(c) (isdigit((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xisspace(c) (isspace((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xislower(c) (islower((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xisupper(c) (isupper((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xisxdigit(c) (isxdigit((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) +#define xisalpha(c) (isalpha((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xisdigit(c) (isdigit((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xisspace(c) (isspace((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xislower(c) (islower((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xisupper(c) (isupper((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xisxdigit(c) (isxdigit((int) (c) ) &&((eight_bits) (c) <0200) ) #define isxalpha(c) ((c) =='_'||(c) =='$') \ #define ishigh(c) ((eight_bits) (c) > 0177) \ @@ -93,13 +93,13 @@ #define max_sections 2000 \ #define lines_dont_match (change_limit-change_buffer!=limit-buffer|| \ -strncmp(buffer,change_buffer,(size_t) (limit-buffer) ) ) \ +strncmp(buffer,change_buffer,(size_t) (limit-buffer) ) !=0) \ #define if_section_start_make_pending(b) \ *limit= '!'; \ 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 too_long() {include_depth--; \ err_print("! Include file name too long") ;goto restart;} \ @@ -107,10 +107,10 @@ err_print("! Include file name too long") ;goto restart;} \ #define hash_size 353 \ #define first_chunk(p) ((p) ->byte_start+2) -#define prefix_length(p) (int) ((eight_bits) *((p) ->byte_start) *256+ \ +#define prefix_length(p) (size_t) ((eight_bits) *((p) ->byte_start) *256+ \ (eight_bits) *((p) ->byte_start+1) ) -#define set_prefix_length(p,m) (*((p) ->byte_start) = (m) /256, \ -*((p) ->byte_start+1) = (m) %256) \ +#define set_prefix_length(p,m) (*((p) ->byte_start) = (char) ((m) /256) , \ +*((p) ->byte_start+1) = (char) ((m) %256) ) \ #define less 0 #define equal 1 @@ -344,7 +344,7 @@ extern void reset_input(void); #line 166 "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 name_pointer id_lookup(const char*,const char*,eight_bits); extern name_pointer section_lookup(char*,char*,boolean); extern void init_node(name_pointer); @@ -382,13 +382,13 @@ static void check_change(void); /*:33*//*55:*/ #line 764 "common.w" -static int web_strcmp(char*,int,char*,int); +static int web_strcmp(char*,size_t,char*,size_t); static name_pointer add_section_name(name_pointer,int,char*,char*,boolean); static void extend_section_name(name_pointer,char*,char*,boolean); /*:55*//*64:*/ #line 991 "common.w" -static int section_name_cmp(char**,int,name_pointer); +static int section_name_cmp(char**,size_t,name_pointer); /*:64*//*76:*/ #line 1186 "common.w" @@ -484,7 +484,7 @@ change_line++; if(!input_ln(change_file))return; if(limit buffer+1&&buffer[0]=='@'){ -char xyz_code= xisupper(buffer[1])?tolower((eight_bits)buffer[1]):buffer[1]; +char xyz_code= xisupper(buffer[1])?tolower((int)buffer[1]):buffer[1]; /*34:*/ #line 336 "common.w" @@ -644,7 +644,7 @@ changed_section[section_count]= true;change_pending= false; } *limit= ' '; if(buffer[0]=='@'){ -if(xisupper(buffer[1]))buffer[1]= tolower((eight_bits)buffer[1]); +if(xisupper(buffer[1]))buffer[1]= tolower((int)buffer[1]); if(buffer[1]=='x'||buffer[1]=='y'){ loc= buffer+2; err_print("! Where is the matching @z?"); @@ -707,7 +707,7 @@ include_depth++; char temp_file_name[max_file_name_length]; char*cur_file_name_end= cur_file_name+max_file_name_length-1; char*kk,*k= cur_file_name; -int l; +size_t l; if(*loc=='"'){ loc++; @@ -777,18 +777,18 @@ name_pointer id_lookup( const char*first, const char*last, -char t) +eight_bits t) { const char*i= first; int h; -int l; +size_t l; name_pointer p; if(last==NULL)for(last= first;*last!='\0';last++); -l= (int)(last-first); +l= (size_t)(last-first); /*49:*/ #line 656 "common.w" -h= (eight_bits)*i; +h= (int)((eight_bits)*i); while(++ibyte_start)term_write("...",3); } @@ -881,9 +881,9 @@ if(s+l<(p+1)->byte_start)term_write("...",3); static int web_strcmp( char*j, -int j_len, +size_t j_len, char*k, -int k_len) +size_t k_len) { char*j1= j+j_len,*k1= k+k_len; while(k byte_mem_end)overflow("byte memory"); if(name_ptr+1>=name_dir_end)overflow("name"); (++name_ptr)->byte_start= byte_ptr= s+name_len; @@ -936,7 +936,7 @@ boolean ispref) { char*s; name_pointer q= p+1; -int name_len= (int)(last-first)+ispref; +size_t name_len= (size_t)(last-first+(int)ispref); if(name_ptr>=name_dir_end)overflow("name"); while(q->link!=name_dir)q= q->link; q->link= name_ptr; @@ -962,7 +962,7 @@ name_pointer q= NULL; name_pointer r= NULL; name_pointer par= NULL; -int name_len= (int)(last-first)+1; +size_t name_len= (size_t)(last-first+1); /*60:*/ #line 878 "common.w" @@ -1046,7 +1046,7 @@ return r; static int section_name_cmp( char**pfirst, -int len, +size_t len, name_pointer r) { char*first= *pfirst; @@ -1058,7 +1058,7 @@ while(true){ ss= (r+1)->byte_start-1; if(*ss==' '&&ss>=r->byte_start)ispref= true,q= q->link; else ispref= false,ss++,q= name_dir; -switch(c= web_strcmp(first,len,s,ss-s)){ +switch(c= web_strcmp(first,len,s,(size_t)(ss-s))){ case equal:if(q==name_dir) if(ispref){ *pfirst= first+(ptrdiff_t)(ss-s); @@ -1082,7 +1082,7 @@ void err_print( const char*s) { -printf(*s=='!'?"\n%s":"%s",s); +*s=='!'?printf("\n%s",s):printf("%s",s); if(web_file_open)/*67:*/ #line 1032 "common.w" diff --git a/common.h b/common.h index 17717a5..4f0c4d2 100644 --- a/common.h +++ b/common.h @@ -2,7 +2,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 4.4 --- June 2021 (works also with later versions) +% Version 4.5 --- July 2021 (works also with later versions) % Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth @@ -78,12 +78,12 @@ extern char *id_first; /* where the current identifier begins in the buffer */ extern char *id_loc; /* just after the current identifier in the buffer */ @ Code related to input routines: -@d xisalpha(c) (isalpha((eight_bits)(c))&&((eight_bits)(c)<0200)) -@d xisdigit(c) (isdigit((eight_bits)(c))&&((eight_bits)(c)<0200)) -@d xisspace(c) (isspace((eight_bits)(c))&&((eight_bits)(c)<0200)) -@d xislower(c) (islower((eight_bits)(c))&&((eight_bits)(c)<0200)) -@d xisupper(c) (isupper((eight_bits)(c))&&((eight_bits)(c)<0200)) -@d xisxdigit(c) (isxdigit((eight_bits)(c))&&((eight_bits)(c)<0200)) +@d xisalpha(c) (isalpha((int)(c))&&((eight_bits)(c)<0200)) +@d xisdigit(c) (isdigit((int)(c))&&((eight_bits)(c)<0200)) +@d xisspace(c) (isspace((int)(c))&&((eight_bits)(c)<0200)) +@d xislower(c) (islower((int)(c))&&((eight_bits)(c)<0200)) +@d xisupper(c) (isupper((int)(c))&&((eight_bits)(c)<0200)) +@d xisxdigit(c) (isxdigit((int)(c))&&((eight_bits)(c)<0200)) @d isxalpha(c) ((c)=='_' || (c)=='$') /* non-alpha characters allowed in identifier */ @d ishigh(c) ((eight_bits)(c)>0177) @@ -165,7 +165,7 @@ extern hash_pointer h; /* index into hash-head array */ @ @= extern boolean names_match(name_pointer,const char *,size_t,eight_bits);@/ -extern name_pointer id_lookup(const char *,const char *,char); +extern name_pointer id_lookup(const char *,const char *,eight_bits); /* looks up a string in the identifier table */ extern name_pointer section_lookup(char *,char *,boolean); /* finds section name */ extern void init_node(name_pointer);@/ diff --git a/common.w b/common.w index dba1967..bca9b5a 100644 --- a/common.w +++ b/common.w @@ -2,7 +2,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 4.4 --- June 2021 +% Version 4.5 --- July 2021 % Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth @@ -22,12 +22,12 @@ \def\v{\char'174} % vertical (|) in typewriter font -\def\title{Common code for CTANGLE and CWEAVE (Version 4.4)} +\def\title{Common code for CTANGLE and CWEAVE (Version 4.5)} \def\topofcontents{\null\vfill \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and {\ttitlefont CWEAVE}} \vskip 15pt - \centerline{(Version 4.4)} + \centerline{(Version 4.5)} \vfill} \def\botofcontents{\vfill \noindent @@ -211,7 +211,7 @@ so that no further matches will be made. Here's a shorthand expression for inequality between the two lines: @d lines_dont_match (change_limit-change_buffer != limit-buffer @| || - strncmp(buffer, change_buffer, (size_t)(limit-buffer))) + strncmp(buffer, change_buffer, (size_t)(limit-buffer)) != 0) @= static char change_buffer[buf_size]; /* next line of |change_file| */ @@ -246,7 +246,7 @@ while(true) { if (!input_ln(change_file)) return; if (limitbuffer+1 && buffer[0]=='@@') { - char xyz_code=xisupper(buffer[1])? tolower((eight_bits)buffer[1]): buffer[1]; + char xyz_code=xisupper(buffer[1])? tolower((int)buffer[1]): buffer[1]; @@; } @@ -446,7 +446,7 @@ The remainder of the \.{@@i} line after the file name is ignored. char temp_file_name[max_file_name_length]; char *cur_file_name_end=cur_file_name+max_file_name_length-1; char *kk, *k=cur_file_name; - int l; /* length of file name */ + size_t l; /* length of file name */ if (*loc=='"') { loc++; @@ -521,7 +521,7 @@ The remainder of the \.{@@i} line after the file name is ignored. } *limit=' '; if (buffer[0]=='@@') { - if (xisupper(buffer[1])) buffer[1]=tolower((eight_bits)buffer[1]); + if (xisupper(buffer[1])) buffer[1]=tolower((int)buffer[1]); if (buffer[1]=='x' || buffer[1]=='y') { loc=buffer+2; err_print("! Where is the matching @@z?"); @@ -635,14 +635,14 @@ name_pointer id_lookup( /* looks up a string in the identifier table */ const char *first, /* first character of string */ const char *last, /* last character of string plus one */ -char t) /* the |ilk|; used by \.{CWEAVE} only */ +eight_bits t) /* the |ilk|; used by \.{CWEAVE} only */ { const char *i=first; /* position in |buffer| */ - int h; /* hash code */ - int l; /* length of the given identifier */ + int h; /* hash code; shadows |hash_pointer h| */ + size_t l; /* length of the given identifier */ name_pointer p; /* where the identifier is being sought */ if (last==NULL) for (last=first; *last!='\0'; last++); - l=(int)(last-first); /* compute the length */ + l=(size_t)(last-first); /* compute the length */ @@; @@; if (p==name_ptr) @@; @@ -654,7 +654,7 @@ character codes is $c_1c_2\ldots c_n$, its hash value will be $$(2^{n-1}c_1+2^{n-2}c_2+\cdots+c_n)\,\bmod\,|hash_size|.$$ @= -h=(eight_bits)*i; +h=(int)((eight_bits)*i); while (++i @@ -700,10 +700,10 @@ to additional chunks in the same way. Null links are represented by |name_dir|. @d first_chunk(p) ((p)->byte_start+2) -@d prefix_length(p) (int)((eight_bits)*((p)->byte_start)*256 + +@d prefix_length(p) (size_t)((eight_bits)*((p)->byte_start)*256 + (eight_bits)*((p)->byte_start+1)) -@d set_prefix_length(p,m) (*((p)->byte_start)=(m)/256, - *((p)->byte_start+1)=(m)%256) +@d set_prefix_length(p,m) (*((p)->byte_start)=(char)((m)/256), + *((p)->byte_start+1)=(char)((m)%256)) @c void @@ -746,7 +746,7 @@ print_prefix_name( name_pointer p) { char *s = first_chunk(p); - int l = prefix_length(p); + size_t l = prefix_length(p); term_write(s,l); if (s+l<(p+1)->byte_start) term_write("...",3); } @@ -762,16 +762,16 @@ are null-terminated, and we keep an eye open for prefixes and extensions. @d extension 4 /* the first name is a proper extension of the second */ @= -static int web_strcmp(char *,int,char *,int);@/ +static int web_strcmp(char *,size_t,char *,size_t);@/ static name_pointer add_section_name(name_pointer,int,char *,char *,boolean);@/ static void extend_section_name(name_pointer,char *,char *,boolean); @ @c static int web_strcmp( /* fuller comparison than |strcmp| */ char *j, /* beginning of first string */ - int j_len, /* length of first string */ + size_t j_len, /* length of first string */ char *k, /* beginning of second string */ - int k_len) /* length of second string */ + size_t k_len) /* length of second string */ { char *j1=j+j_len, *k1=k+k_len; while (kbyte_mem_end) overflow("byte memory"); if (name_ptr+1>=name_dir_end) overflow("name"); (++name_ptr)->byte_start=byte_ptr=s+name_len; @@ -833,7 +833,7 @@ boolean ispref) /* are we adding a prefix or a full name? */ { char *s; name_pointer q=p+1; - int name_len=(int)(last-first)+ispref; + size_t name_len=(size_t)(last-first+(int)ispref); if (name_ptr>=name_dir_end) overflow("name"); while (q->link!=name_dir) q=q->link; q->link=name_ptr; @@ -863,7 +863,7 @@ boolean ispref) /* is the new name a prefix or a full name? */ name_pointer r=NULL; /* where a match has been found */ name_pointer par=NULL; /* parent of |p|, if |r| is |NULL|; otherwise parent of |r| */ - int name_len=(int)(last-first)+1; + size_t name_len=(size_t)(last-first+1); @@; @@; @@ -959,7 +959,7 @@ us to regard \.{@@} as an ``extension'' of itself. @c static int section_name_cmp( char **pfirst, /* pointer to beginning of comparison string */ -int len, /* length of string */ +size_t len, /* length of string */ name_pointer r) /* section name being compared */ { char *first=*pfirst; /* beginning of comparison string */ @@ -971,7 +971,7 @@ name_pointer r) /* section name being compared */ ss=(r+1)->byte_start-1; if (*ss==' ' && ss>=r->byte_start) ispref=true,q=q->link; else ispref=false,ss++,q=name_dir; - switch(c=web_strcmp(first,len,s,ss-s)) { + switch(c=web_strcmp(first,len,s,(size_t)(ss-s))) { case equal: if (q==name_dir) if (ispref) { *pfirst=first+(ptrdiff_t)(ss-s); @@ -988,7 +988,7 @@ name_pointer r) /* section name being compared */ } } -@ @=@+static int section_name_cmp(char **,int,name_pointer); +@ @=@+static int section_name_cmp(char **,size_t,name_pointer); @** Reporting errors to the user. A global variable called |history| will contain one of four values @@ -1015,7 +1015,7 @@ void err_print( /* prints `\..' and location of error message */ const char *s) { - printf(*s=='!'? "\n%s" : "%s",s); + *s=='!'? printf("\n%s",s) : printf("%s",s); if (web_file_open) @@; update_terminal; mark_error; } diff --git a/ctang-bs.ch b/ctang-bs.ch index fa4b90c..4664215 100644 --- a/ctang-bs.ch +++ b/ctang-bs.ch @@ -17,12 +17,12 @@ by using "huge" pointers. The ``banner line'' defined here should be changed whenever \.{CTANGLE} is modified. -@d banner "This is CTANGLE (Version 4.4)" +@d banner "This is CTANGLE (Version 4.5)" @y The ``banner line'' defined here should be changed whenever \.{CTANGLE} is modified. -@d banner "This is CTANGLE (Version 4.4pc/big)" +@d banner "This is CTANGLE (Version 4.5pc/big)" @z diff --git a/ctang-pc.ch b/ctang-pc.ch index f84c798..2010d6d 100644 --- a/ctang-pc.ch +++ b/ctang-pc.ch @@ -9,9 +9,9 @@ that allows >64K arrays. If you need lots of bytes and toks, try the alternate change files with -bs suffix instead of -pc. @x section 1 -@d banner "This is CTANGLE (Version 4.4)" +@d banner "This is CTANGLE (Version 4.5)" @y -@d banner "This is CTANGLE (Version 4.4pc)" +@d banner "This is CTANGLE (Version 4.5pc)" @z @x section 17 @d max_bytes 90000 /* the number of bytes in identifiers, diff --git a/ctang-ql.ch b/ctang-ql.ch index 27a7d01..66568f4 100644 --- a/ctang-ql.ch +++ b/ctang-ql.ch @@ -7,15 +7,15 @@ ex cc;"-v -h -c -=500000 ctangle_c" @x -\def\title{CTANGLE (Version 4.4)} +\def\title{CTANGLE (Version 4.5)} @y -\def\title{CTANGLE (QL Version 4.4)} +\def\title{CTANGLE (QL Version 4.5)} @z @x section 1 -@d banner "This is CTANGLE (Version 4.4)" +@d banner "This is CTANGLE (Version 4.5)" @y -@d banner "This is CTANGLE (QL Version 4.4)" +@d banner "This is CTANGLE (QL Version 4.5)" @z @x diff --git a/ctang-vms.ch b/ctang-vms.ch index a72de29..10cf987 100644 --- a/ctang-vms.ch +++ b/ctang-vms.ch @@ -10,9 +10,9 @@ created: (these changes not necessary for initial bootstrapping) @x section 1 (01-FEB-1992 ST) -@d banner "This is CTANGLE (Version 4.4)" +@d banner "This is CTANGLE (Version 4.5)" @y -@d banner "This is CTANGLE (VAX/VMS Version 4.4)" +@d banner "This is CTANGLE (VAX/VMS Version 4.5)" @z @x section 4 (01-FEB-1992 ST) diff --git a/ctang-w32.ch b/ctang-w32.ch index ceba0fe..acdcdd2 100644 --- a/ctang-w32.ch +++ b/ctang-w32.ch @@ -4,9 +4,9 @@ This is the change file for CWEB's CTANGLE under Win32 Changes necessary for compiling with Borland C/C++ @x section 1 -@d banner "This is CTANGLE (Version 4.4)" +@d banner "This is CTANGLE (Version 4.5)" @y -@d banner "This is CTANGLE (Version 4.4win32)" +@d banner "This is CTANGLE (Version 4.5win32)" @z @x diff --git a/ctangle.c b/ctangle.c index 14a0732..6016fcc 100644 --- a/ctangle.c +++ b/ctangle.c @@ -15,7 +15,7 @@ /*:4*/ #line 67 "ctangle.w" -#define banner "This is CTANGLE (Version 4.4)" \ +#define banner "This is CTANGLE (Version 4.5)" \ #define ctangle false #define cweave true \ @@ -38,12 +38,12 @@ #define compress(c) if(loc++<=limit) return c \ -#define xisalpha(c) (isalpha((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xisdigit(c) (isdigit((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xisspace(c) (isspace((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xislower(c) (islower((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xisupper(c) (isupper((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xisxdigit(c) (isxdigit((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) +#define xisalpha(c) (isalpha((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xisdigit(c) (isdigit((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xisspace(c) (isspace((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xislower(c) (islower((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xisupper(c) (isupper((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xisxdigit(c) (isxdigit((int) (c) ) &&((eight_bits) (c) <0200) ) #define isxalpha(c) ((c) =='_'||(c) =='$') \ #define ishigh(c) ((eight_bits) (c) > 0177) \ @@ -124,7 +124,7 @@ #define max_files 256 #define C_printf(c,a) fprintf(C_file,c,a) -#define C_putc(c) putc(c,C_file) \ +#define C_putc(c) putc((int) (c) ,C_file) \ #define translit_length 10 \ @@ -139,11 +139,14 @@ #define section_name 0311 #define new_section 0312 \ -#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") ; \ +else*(tok_ptr++) = (eight_bits) c; \ +} \ -#define store_id(a) a= id_lookup(id_first,id_loc,0) -name_dir; \ +#define store_id(a) a= id_lookup(id_first,id_loc,'\0') -name_dir; \ app_repl((a/0400) +0200) ; \ -app_repl(a%0400) ; \ +app_repl(a%0400) \ #define keep_digit_separators flags['k'] \ @@ -306,13 +309,13 @@ static stack_pointer stack_ptr; static int cur_val; /*:37*//*42:*/ -#line 458 "ctangle.w" +#line 459 "ctangle.w" static eight_bits out_state; static boolean protect; /*:42*//*45:*/ -#line 489 "ctangle.w" +#line 490 "ctangle.w" static name_pointer output_files[max_files]; static name_pointer*cur_out_file,*end_output_files,*an_output_file; @@ -320,33 +323,33 @@ static char cur_section_name_char; static char output_file_name[longest_name+1]; /*:45*//*52:*/ -#line 589 "ctangle.w" +#line 590 "ctangle.w" static boolean output_defs_seen= false; /*:52*//*57:*/ -#line 701 "ctangle.w" +#line 703 "ctangle.w" static char translit[128][translit_length]; /*:57*//*62:*/ -#line 777 "ctangle.w" +#line 779 "ctangle.w" static eight_bits ccode[256]; /*:62*//*66:*/ -#line 837 "ctangle.w" +#line 839 "ctangle.w" static boolean comment_continues= false; /*:66*//*68:*/ -#line 874 "ctangle.w" +#line 876 "ctangle.w" static name_pointer cur_section_name; static boolean no_where; /*:68*//*82:*/ -#line 1188 "ctangle.w" +#line 1193 "ctangle.w" static text_pointer cur_text; static eight_bits next_control; @@ -365,7 +368,7 @@ extern void reset_input(void); #line 166 "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 name_pointer id_lookup(const char*,const char*,eight_bits); extern name_pointer section_lookup(char*,char*,boolean); extern void init_node(name_pointer); @@ -399,47 +402,47 @@ static void push_level(name_pointer); static void pop_level(boolean); /*:35*//*39:*/ -#line 403 "ctangle.w" +#line 404 "ctangle.w" static void get_output(void); /*:39*//*44:*/ -#line 479 "ctangle.w" +#line 480 "ctangle.w" static void flush_buffer(void); /*:44*//*49:*/ -#line 556 "ctangle.w" +#line 557 "ctangle.w" static void phase_two(void); /*:49*//*53:*/ -#line 592 "ctangle.w" +#line 593 "ctangle.w" static void output_defs(void); static void out_char(eight_bits); /*:53*//*65:*/ -#line 817 "ctangle.w" +#line 819 "ctangle.w" static eight_bits skip_ahead(void); static boolean skip_comment(boolean); /*:65*//*70:*/ -#line 924 "ctangle.w" +#line 926 "ctangle.w" static eight_bits get_next(void); /*:70*//*84:*/ -#line 1214 "ctangle.w" +#line 1219 "ctangle.w" static void scan_repl(eight_bits); /*:84*//*91:*/ -#line 1397 "ctangle.w" +#line 1404 "ctangle.w" static void scan_section(void); /*:91*//*99:*/ -#line 1474 "ctangle.w" +#line 1481 "ctangle.w" static void phase_one(void); /*:99*//*101:*/ -#line 1507 "ctangle.w" +#line 1514 "ctangle.w" static void skip_limbo(void); /*:101*/ @@ -472,12 +475,12 @@ init_node(name_dir); last_unnamed= text_info;text_info->text_link= macro; /*:27*//*46:*/ -#line 499 "ctangle.w" +#line 500 "ctangle.w" cur_out_file= end_output_files= output_files+max_files; /*:46*//*58:*/ -#line 704 "ctangle.w" +#line 706 "ctangle.w" { int i; @@ -485,14 +488,14 @@ for(i= 0;i<128;i++)sprintf(translit[i],"X%02X",(unsigned int)(128+i)); } /*:58*//*63:*/ -#line 780 "ctangle.w" +#line 782 "ctangle.w" { int c; for(c= 0;c<256;c++)ccode[c]= ignore; } ccode[' ']= ccode['\t']= ccode['\n']= ccode['\v']= ccode['\r']= ccode['\f'] = ccode['*']= new_section; -ccode['@']= '@';ccode['=']= string; +ccode['@']= (eight_bits)'@';ccode['=']= string; ccode['d']= ccode['D']= definition; ccode['f']= ccode['F']= ccode['s']= ccode['S']= format_code; ccode['c']= ccode['C']= ccode['p']= ccode['P']= begin_C; @@ -505,7 +508,7 @@ ccode['<']= ccode['(']= section_name; ccode['\'']= ord; /*:63*//*78:*/ -#line 1112 "ctangle.w" +#line 1114 "ctangle.w" section_text[0]= ' '; /*:78*/ @@ -608,10 +611,10 @@ else if(a<0200)out_char(a); else{ a= (a-0200)*0400+*cur_byte++; switch(a/024000){ -case 0:cur_val= a;out_char(identifier);break; +case 0:cur_val= (int)a;out_char(identifier);break; case 1:if(a==output_defs_flag)output_defs(); else/*40:*/ -#line 408 "ctangle.w" +#line 409 "ctangle.w" { a-= 024000; @@ -628,14 +631,15 @@ goto restart; #line 395 "ctangle.w" break; -default:cur_val= a-050000;if(cur_val> 0)cur_section= cur_val; +default:cur_val= (int)a-050000; +if(cur_val> 0)cur_section= (sixteen_bits)cur_val; out_char(section_number); } } } /*:38*//*43:*/ -#line 466 "ctangle.w" +#line 467 "ctangle.w" static void flush_buffer(void) @@ -650,7 +654,7 @@ cur_line++; } /*:43*//*48:*/ -#line 518 "ctangle.w" +#line 519 "ctangle.w" static void phase_two(void){ @@ -664,16 +668,16 @@ 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 524 "ctangle.w" +#line 525 "ctangle.w" /*51:*/ -#line 585 "ctangle.w" +#line 586 "ctangle.w" if(!output_defs_seen) output_defs(); /*:51*/ -#line 525 "ctangle.w" +#line 526 "ctangle.w" if(text_info->text_link==macro&&cur_out_file==end_output_files){ fputs("\n! No program text was specified.",stdout);mark_harmless; @@ -698,7 +702,7 @@ if(text_info->text_link==macro)goto writeloop; while(stack_ptr> stack)get_output(); flush_buffer(); writeloop:/*50:*/ -#line 562 "ctangle.w" +#line 563 "ctangle.w" for(an_output_file= end_output_files;an_output_file> cur_out_file;){ an_output_file--; @@ -719,7 +723,7 @@ flush_buffer(); } /*:50*/ -#line 548 "ctangle.w" +#line 549 "ctangle.w" if(show_happiness){ if(show_progress)new_line; @@ -729,7 +733,7 @@ fputs("Done.",stdout); } /*:48*//*54:*/ -#line 599 "ctangle.w" +#line 600 "ctangle.w" static void output_defs(void) @@ -753,11 +757,12 @@ else if(a<0200)out_char(a); else{ a= (a-0200)*0400+*cur_byte++; if(a<024000){ -cur_val= a;out_char(identifier); +cur_val= (int)a;out_char(identifier); } else if(a<050000)confusion("macro defs have strange char"); else{ -cur_val= a-050000;cur_section= cur_val;out_char(section_number); +cur_val= (int)a-050000;cur_section= (sixteen_bits)cur_val; +out_char(section_number); } } @@ -769,7 +774,7 @@ pop_level(false); } /*:54*//*55:*/ -#line 642 "ctangle.w" +#line 644 "ctangle.w" static void out_char( @@ -782,7 +787,7 @@ case'\n':if(protect&&out_state!=verbatim)C_putc(' '); if(protect||out_state==verbatim)C_putc('\\'); flush_buffer();if(out_state!=verbatim)out_state= normal;break; /*59:*/ -#line 710 "ctangle.w" +#line 712 "ctangle.w" case identifier: if(out_state==num_or_id)C_putc(' '); @@ -794,25 +799,25 @@ else C_printf("%s",translit[(eight_bits)(*j)-0200]); out_state= num_or_id;break; /*:59*/ -#line 653 "ctangle.w" +#line 655 "ctangle.w" /*60:*/ -#line 720 "ctangle.w" +#line 722 "ctangle.w" case section_number: if(cur_val> 0)C_printf("/*%d:*/",cur_val); else if(cur_val<0)C_printf("/*:%d*/",-cur_val); else if(protect){ cur_byte+= 4; -cur_char= '\n'; +cur_char= (eight_bits)'\n'; goto restart; }else{ sixteen_bits a; a= *cur_byte++*0400; a+= *cur_byte++; -C_printf("\n#line %d \"",a); +C_printf("\n#line %d \"",(int)a); -cur_val= (*cur_byte++-0200)*0400; +cur_val= (int)(*cur_byte++-0200)*0400; cur_val+= *cur_byte++; for(j= (cur_val+name_dir)->byte_start,k= (cur_val+name_dir+1)->byte_start; j');C_putc('*');out_state= normal; break; /*:56*/ -#line 655 "ctangle.w" +#line 657 "ctangle.w" case'=':case'>':C_putc(cur_char);C_putc(' '); out_state= normal;break; @@ -867,7 +872,7 @@ default:C_putc(cur_char);out_state= normal;break; } /*:55*//*64:*/ -#line 801 "ctangle.w" +#line 803 "ctangle.w" static eight_bits skip_ahead(void) @@ -885,7 +890,7 @@ if(c!=ignore||*(loc-1)=='>')return c; } /*:64*//*67:*/ -#line 840 "ctangle.w" +#line 842 "ctangle.w" static boolean skip_comment( boolean is_long_comment) @@ -919,7 +924,7 @@ else loc++; } /*:67*//*69:*/ -#line 881 "ctangle.w" +#line 883 "ctangle.w" static eight_bits get_next(void) @@ -933,7 +938,7 @@ if(get_line()==false)return new_section; else if(print_where&&!no_where){ print_where= false; /*85:*/ -#line 1224 "ctangle.w" +#line 1229 "ctangle.w" { eight_bits a; @@ -950,21 +955,20 @@ store_id(a); } /*:85*/ -#line 893 "ctangle.w" +#line 895 "ctangle.w" } -else return'\n'; +else return(eight_bits)'\n'; } -c= *loc; +c= (eight_bits)*loc; if(comment_continues||(c=='/'&&(*(loc+1)=='*'||*(loc+1)=='/'))){ -skip_comment(comment_continues||*(loc+1)=='*'); +if(skip_comment(comment_continues||*(loc+1)=='*'))return'\n'; -if(comment_continues)return'\n'; else continue; } loc++; if(xisdigit(c)||c=='.')/*73:*/ -#line 965 "ctangle.w" +#line 967 "ctangle.w" { boolean hex_flag= false; id_first= loc-1; @@ -998,15 +1002,15 @@ return constant; } /*:73*/ -#line 905 "ctangle.w" +#line 906 "ctangle.w" else if(c=='\''||c=='"' ||((c=='L'||c=='u'||c=='U')&&(*loc=='\''||*loc=='"')) ||((c=='u'&&*loc=='8')&&(*(loc+1)=='\''||*(loc+1)=='"'))) /*74:*/ -#line 1002 "ctangle.w" +#line 1004 "ctangle.w" { -char delim= c; +char delim= (char)c; id_first= section_text+1; id_loc= section_text;*++id_loc= delim; if(delim=='L'||delim=='u'||delim=='U'){ @@ -1026,16 +1030,16 @@ err_print("! Input ended in middle of string");loc= buffer;break; else if(++id_loc<=section_text_end)*id_loc= '\n'; } -if((c= *loc++)==delim){ -if(++id_loc<=section_text_end)*id_loc= c; +if((c= (eight_bits)*loc++)==delim){ +if(++id_loc<=section_text_end)*id_loc= (char)c; break; } if(c=='\\'){ if(loc>=limit)continue; if(++id_loc<=section_text_end)*id_loc= '\\'; -c= *loc++; +c= (eight_bits)*loc++; } -if(++id_loc<=section_text_end)*id_loc= c; +if(++id_loc<=section_text_end)*id_loc= (char)c; } if(id_loc>=section_text_end){ fputs("\n! String too long: ",stdout); @@ -1048,25 +1052,25 @@ return string; } /*:74*/ -#line 909 "ctangle.w" +#line 910 "ctangle.w" -else if(isalpha(c)||isxalpha(c)||ishigh(c)) +else if(isalpha((int)c)||isxalpha(c)||ishigh(c)) /*72:*/ -#line 956 "ctangle.w" +#line 958 "ctangle.w" { id_first= --loc; do ++loc; -while(isalpha((eight_bits)*loc)||isdigit((eight_bits)*loc) -||isxalpha((eight_bits)*loc)||ishigh((eight_bits)*loc)); +while(isalpha((int)*loc)||isdigit((int)*loc) +||isxalpha(*loc)||ishigh(*loc)); id_loc= loc;return identifier; } /*:72*/ -#line 911 "ctangle.w" +#line 912 "ctangle.w" else if(c=='@')/*75:*/ -#line 1047 "ctangle.w" +#line 1049 "ctangle.w" switch(c= ccode[(eight_bits)*loc++]){ case ignore:continue; @@ -1081,11 +1085,11 @@ continue; case section_name: cur_section_name_char= *(loc-1); /*77:*/ -#line 1092 "ctangle.w" +#line 1094 "ctangle.w" { char*k= section_text; /*79:*/ -#line 1114 "ctangle.w" +#line 1116 "ctangle.w" while(true){ if(loc> limit&&get_line()==false){ @@ -1093,12 +1097,12 @@ err_print("! Input ended in section name"); loc= buffer+1;break; } -c= *loc; +c= (eight_bits)*loc; /*80:*/ -#line 1137 "ctangle.w" +#line 1139 "ctangle.w" if(c=='@'){ -c= *(loc+1); +c= (eight_bits)*(loc+1); if(c=='>'){ loc+= 2;break; } @@ -1114,13 +1118,13 @@ err_print("! Nesting of section names not allowed");break; } /*:80*/ -#line 1122 "ctangle.w" +#line 1124 "ctangle.w" loc++;if(k=section_text_end){ fputs("\n! Section name too long: ",stdout); @@ -1131,7 +1135,7 @@ printf("...");mark_harmless; if(*k==' '&&k> section_text)k--; /*:79*/ -#line 1094 "ctangle.w" +#line 1096 "ctangle.w" if(k-section_text> 3&&strncmp(k-2,"...",3)==0) cur_section_name= section_lookup(section_text+1,k-3,true); @@ -1140,7 +1144,7 @@ else cur_section_name= section_lookup(section_text+1,k,false); if(cur_section_name_char=='(') /*47:*/ -#line 503 "ctangle.w" +#line 504 "ctangle.w" { for(an_output_file= cur_out_file; @@ -1154,16 +1158,16 @@ else overflow("output files"); } /*:47*/ -#line 1102 "ctangle.w" +#line 1104 "ctangle.w" return section_name; } /*:77*/ -#line 1060 "ctangle.w" +#line 1062 "ctangle.w" case string:/*81:*/ -#line 1159 "ctangle.w" +#line 1161 "ctangle.w" id_first= loc++;*(limit+1)= '@';*(limit+2)= '>'; while(*loc!='@'||*(loc+1)!='>')loc++; @@ -1173,10 +1177,10 @@ id_loc= loc;loc+= 2; return string; /*:81*/ -#line 1061 "ctangle.w" +#line 1063 "ctangle.w" case ord:/*76:*/ -#line 1072 "ctangle.w" +#line 1074 "ctangle.w" id_first= loc; if(*loc=='\\') @@ -1198,22 +1202,23 @@ loc++; return ord; /*:76*/ -#line 1062 "ctangle.w" +#line 1064 "ctangle.w" default:return c; } /*:75*/ -#line 912 "ctangle.w" +#line 913 "ctangle.w" else if(xisspace(c)){ if(!preprocessing||loc> limit)continue; -else return' '; +else return(eight_bits)' '; + } else if(c=='#'&&loc==buffer+1)preprocessing= true; mistake:/*71:*/ -#line 933 "ctangle.w" +#line 935 "ctangle.w" switch(c){ case'+':if(*loc=='+')compress(plus_plus);break; @@ -1238,14 +1243,14 @@ case'!':if(*loc=='=')compress(non_eq);break; } /*:71*/ -#line 919 "ctangle.w" +#line 921 "ctangle.w" return c; } } /*:69*//*83:*/ -#line 1192 "ctangle.w" +#line 1197 "ctangle.w" static void scan_repl( @@ -1253,7 +1258,7 @@ eight_bits t) { sixteen_bits a; if(t==section_name)/*85:*/ -#line 1224 "ctangle.w" +#line 1229 "ctangle.w" { eight_bits a; @@ -1270,17 +1275,17 @@ store_id(a); } /*:85*/ -#line 1198 "ctangle.w" +#line 1203 "ctangle.w" while(true)switch(a= get_next()){ /*86:*/ -#line 1239 "ctangle.w" +#line 1244 "ctangle.w" case identifier:store_id(a);break; case section_name:if(t!=section_name)goto done; else{ /*87:*/ -#line 1270 "ctangle.w" +#line 1278 "ctangle.w" { char*try_loc= loc; while(*try_loc==' '&&try_loc='0'&&c<='7'){ c-= '0'; if(*(id_first+1)>='0'&&*(id_first+1)<='7'){ @@ -1393,15 +1400,15 @@ case'r':c= '\r';break; case'a':c= '\7';break; case'?':c= '?';break; case'x': -if(xisdigit(*(id_first+1)))c= *(++id_first)-'0'; +if(xisdigit(*(id_first+1)))c= (int)(*(++id_first)-'0'); else if(xisxdigit(*(id_first+1))){ ++id_first; -c= toupper((eight_bits)*id_first)-'A'+10; +c= toupper((int)*id_first)-'A'+10; } -if(xisdigit(*(id_first+1)))c= 16*c+*(++id_first)-'0'; +if(xisdigit(*(id_first+1)))c= 16*c+(int)(*(++id_first)-'0'); else if(xisxdigit(*(id_first+1))){ ++id_first; -c= 16*c+toupper((eight_bits)*id_first)-'A'+10; +c= 16*c+toupper((int)*id_first)-(int)'A'+10; } break; case'\\':c= '\\';break; @@ -1413,16 +1420,16 @@ default:err_print("! Unrecognized escape sequence"); } app_repl(constant); -if(c>=100)app_repl('0'+c/100); -if(c>=10)app_repl('0'+(c/10)%10); -app_repl('0'+c%10); +if(c>=100)app_repl((int)'0'+c/100); +if(c>=10)app_repl((int)'0'+(c/10)%10); +app_repl((int)'0'+c%10); app_repl(constant); } -break; /*:89*/ -#line 1262 "ctangle.w" +#line 1269 "ctangle.w" +break; case definition:case format_code:case begin_C:if(t!=section_name)goto done; else{ err_print("! @d, @f and @c are ignored in C text");continue; @@ -1431,7 +1438,7 @@ err_print("! @d, @f and @c are ignored in C text");continue; case new_section:goto done; /*:86*/ -#line 1203 "ctangle.w" +#line 1208 "ctangle.w" case')':app_repl(a); if(t==macro)app_repl(' '); @@ -1444,7 +1451,7 @@ cur_text= text_ptr;(++text_ptr)->tok_start= tok_ptr; } /*:83*//*90:*/ -#line 1364 "ctangle.w" +#line 1371 "ctangle.w" static void scan_section(void) @@ -1454,12 +1461,12 @@ text_pointer q; sixteen_bits a; section_count++;no_where= true; if(*(loc-1)=='*'&&show_progress){ -printf("*%d",section_count);update_terminal; +printf("*%d",(int)section_count);update_terminal; } next_control= ignore; while(true){ /*92:*/ -#line 1405 "ctangle.w" +#line 1412 "ctangle.w" while(next_controltext_link= macro; /*:93*/ -#line 1380 "ctangle.w" +#line 1387 "ctangle.w" continue; } @@ -1498,14 +1505,14 @@ p= name_dir;break; if(next_control==section_name){ p= cur_section_name; /*94:*/ -#line 1434 "ctangle.w" +#line 1441 "ctangle.w" while((next_control= get_next())=='+'); if(next_control!='='&&next_control!=eq_eq) continue; /*:94*/ -#line 1388 "ctangle.w" +#line 1395 "ctangle.w" break; } @@ -1513,20 +1520,20 @@ return; } no_where= print_where= false; /*95:*/ -#line 1439 "ctangle.w" +#line 1446 "ctangle.w" /*96:*/ -#line 1444 "ctangle.w" +#line 1451 "ctangle.w" store_two_bytes((sixteen_bits)(0150000+section_count)); /*:96*/ -#line 1440 "ctangle.w" +#line 1447 "ctangle.w" scan_repl(section_name); /*97:*/ -#line 1448 "ctangle.w" +#line 1455 "ctangle.w" if(p==name_dir||p==NULL){ last_unnamed->text_link= cur_text-text_info;last_unnamed= cur_text; @@ -1543,16 +1550,16 @@ cur_text->text_link= section_flag; /*:97*/ -#line 1442 "ctangle.w" +#line 1449 "ctangle.w" /*:95*/ -#line 1394 "ctangle.w" +#line 1401 "ctangle.w" } /*:90*//*98:*/ -#line 1463 "ctangle.w" +#line 1470 "ctangle.w" static void phase_one(void){ @@ -1565,7 +1572,7 @@ check_complete(); } /*:98*//*100:*/ -#line 1479 "ctangle.w" +#line 1486 "ctangle.w" static void skip_limbo(void) @@ -1579,7 +1586,7 @@ char c= *loc++; if(ccode[(eight_bits)c]==new_section)break; switch(ccode[(eight_bits)c]){ case translit_code:/*102:*/ -#line 1509 "ctangle.w" +#line 1516 "ctangle.w" while(xisspace(*loc)&&loc@/ @@ -390,11 +390,12 @@ get_output(void) /* sends next token to |out_char| */ else { a=(a-0200)*0400+*cur_byte++; switch (a/024000) { /* |024000==(0250-0200)*0400| */ - case 0: cur_val=a; out_char(identifier); break; + case 0: cur_val=(int)a; out_char(identifier); break; case 1: if (a==output_defs_flag) output_defs(); else @@; break; - default: cur_val=a-050000; if (cur_val>0) cur_section=cur_val; + default: cur_val=(int)a-050000; + if (cur_val>0) cur_section=(sixteen_bits)cur_val; out_char(section_number); } } @@ -594,7 +595,7 @@ static void output_defs(void);@/ static void out_char(eight_bits); @ @d C_printf(c,a) fprintf(C_file,c,a) -@d C_putc(c) putc(c,C_file) /* isn't \CEE/ wonderfully consistent? */ +@d C_putc(c) putc((int)(c),C_file) /* isn't \CEE/ wonderfully consistent? */ @c static void @@ -619,11 +620,12 @@ output_defs(void) else { a=(a-0200)*0400+*cur_byte++; if (a<024000) { /* |024000==(0250-0200)*0400| */ - cur_val=a; out_char(identifier); + cur_val=(int)a; out_char(identifier); } else if (a<050000) confusion("macro defs have strange char"); else { - cur_val=a-050000; cur_section=cur_val; out_char(section_number); + cur_val=(int)a-050000; cur_section=(sixteen_bits)cur_val; + out_char(section_number); } /* no other cases */ } @@ -723,15 +725,15 @@ case section_number: else if(cur_val<0) C_printf("/*:%d*/",-cur_val); else if (protect) { cur_byte +=4; /* skip line number and file name */ - cur_char = '\n'; + cur_char = (eight_bits)'\n'; goto restart; } else { sixteen_bits a; a=*cur_byte++ *0400; a+=*cur_byte++; /* gets the line number */ - C_printf("\n#line %d \"",a); + C_printf("\n#line %d \"",(int)a); @:line}{\.{\#line}@> - cur_val=(*cur_byte++-0200)*0400; + cur_val=(int)(*cur_byte++-0200)*0400; cur_val+=*cur_byte++; /* points to the file name */ for (j=(cur_val+name_dir)->byte_start, k=(cur_val+name_dir+1)->byte_start; j@; } - else return '\n'; + else return (eight_bits)'\n'; } - c=*loc; + c=(eight_bits)*loc; if (comment_continues || (c=='/' && (*(loc+1)=='*' || *(loc+1)=='/'))) { - skip_comment(comment_continues||*(loc+1)=='*'); + if (skip_comment(comment_continues||*(loc+1)=='*')) return '\n'; /* scan to end of comment or newline */ - if (comment_continues) return '\n'; else continue; } loc++; @@ -907,13 +908,14 @@ get_next(void) /* produces the next input token */ || ((c=='L' || c=='u' || c=='U')&&(*loc=='\'' || *loc=='"'))@| || ((c=='u' && *loc=='8')&&(*(loc+1)=='\'' || *(loc+1)=='"'))) @@; - else if (isalpha(c) || isxalpha(c) || ishigh(c)) + else if (isalpha((int)c) || isxalpha(c) || ishigh(c)) @@; else if (c=='@@') @@; else if (xisspace(c)) { if (!preprocessing || loc>limit) continue; /* we don't want a blank after a final backslash */ - else return ' '; /* ignore spaces and tabs, unless |preprocessing| */ + else return (eight_bits)' '; + /* ignore spaces and tabs, unless |preprocessing| */ } else if (c=='#' && loc==buffer+1) preprocessing=true; mistake: @@; @@ -957,8 +959,8 @@ switch(c) { id_first=--loc; do ++loc; - while (isalpha((eight_bits)*loc) || isdigit((eight_bits)*loc) @| - || isxalpha((eight_bits)*loc) || ishigh((eight_bits)*loc)); + while (isalpha((int)*loc) || isdigit((int)*loc) @| + || isxalpha(*loc) || ishigh(*loc)); id_loc=loc; return identifier; } @@ -1000,7 +1002,7 @@ delimiters if they are protected by a backslash. We follow this convention, but do not allow the string to be longer than |longest_name|. @= { - char delim = c; /* what started the string */ + char delim = (char)c; /* what started the string */ id_first = section_text+1; id_loc = section_text; *++id_loc=delim; if (delim=='L' || delim=='u' || delim=='U') { /* wide character constant */ @@ -1020,16 +1022,16 @@ convention, but do not allow the string to be longer than |longest_name|. else if (++id_loc<=section_text_end) *id_loc='\n'; /* will print as \.{"\\\\\\n"} */ } - if ((c=*loc++)==delim) { - if (++id_loc<=section_text_end) *id_loc=c; + if ((c=(eight_bits)*loc++)==delim) { + if (++id_loc<=section_text_end) *id_loc=(char)c; break; } if (c=='\\') { if (loc>=limit) continue; if (++id_loc<=section_text_end) *id_loc = '\\'; - c=*loc++; + c=(eight_bits)*loc++; } - if (++id_loc<=section_text_end) *id_loc=c; + if (++id_loc<=section_text_end) *id_loc=(char)c; } if (id_loc>=section_text_end) { fputs("\n! String too long: ",stdout); @@ -1118,13 +1120,13 @@ while (true) { @.Input ended in section name@> loc=buffer+1; break; } - c=*loc; + c=(eight_bits)*loc; @@; loc++; if (k=section_text_end) { fputs("\n! Section name too long: ",stdout); @@ -1136,7 +1138,7 @@ if (*k==' ' && k>section_text) k--; @ @= if (c=='@@') { - c=*(loc+1); + c=(eight_bits)*(loc+1); if (c=='>') { loc+=2; break; } @@ -1183,7 +1185,10 @@ ANSI \CEE/ preprocessor sometimes requires it. acted, |cur_text| will point to the replacement text just generated, and |next_control| will contain the control code that terminated the activity. -@d app_repl(c) {if (tok_ptr==tok_mem_end) overflow("token"); *(tok_ptr++)=c;} +@d app_repl(c) { + if (tok_ptr==tok_mem_end) overflow("token"); + else *(tok_ptr++)=(eight_bits)c; +} @= static text_pointer cur_text; /* replacement text formed by |scan_repl| */ @@ -1217,9 +1222,9 @@ eight_bits t) to |0150000|; then the numeric line number; then a pointer to the file name. -@d store_id(a) a=id_lookup(id_first,id_loc,0)-name_dir;@/ +@d store_id(a) a=id_lookup(id_first,id_loc,'\0')-name_dir;@/ app_repl((a / 0400)+0200); - app_repl(a % 0400); + app_repl(a % 0400) @= { @@ -1244,8 +1249,9 @@ case section_name: if (t!=section_name) goto done; a=cur_section_name-name_dir; app_repl((a / 0400)+0250); app_repl(a % 0400); - @@; break; + @@; } + break; case output_defs_code: if (t!=section_name) err_print("! Misplaced @@h"); @.Misplaced @@h@> else { @@ -1255,11 +1261,13 @@ case output_defs_code: if (t!=section_name) err_print("! Misplaced @@h"); app_repl(a % 0400); @@; } - break; + break; case constant: case string: @@; + break; case ord: @@; + break; case definition: case format_code: case begin_C: if (t!=section_name) goto done; else { err_print("! @@d, @@f and @@c are ignored in C text"); continue; @@ -1296,16 +1304,16 @@ code. The \.{+k} switch will `keep' the single quotes in the output. id_first++; app_repl(*id_first++); } - app_repl(a); break; + app_repl(a); @ This section should be rewritten on machines that don't use ASCII code internally. @^ASCII code dependencies@> @= { - int c=(eight_bits) *id_first; + int c=(int)((eight_bits) *id_first); if (c=='\\') { - c=*++id_first; + c=(int)((eight_bits) *++id_first); if (c>='0' && c<='7') { c-='0'; if (*(id_first+1)>='0' && *(id_first+1)<='7') { @@ -1324,15 +1332,15 @@ code internally. case 'a':c='\7';@+break; case '?':c='?';@+break; case 'x': - if (xisdigit(*(id_first+1))) c=*(++id_first)-'0'; + if (xisdigit(*(id_first+1))) c=(int)(*(++id_first)-'0'); else if (xisxdigit(*(id_first+1))) { ++id_first; - c=toupper((eight_bits)*id_first)-'A'+10; + c=toupper((int)*id_first)-'A'+10; } - if (xisdigit(*(id_first+1))) c=16*c+*(++id_first)-'0'; + if (xisdigit(*(id_first+1))) c=16*c+(int)(*(++id_first)-'0'); else if (xisxdigit(*(id_first+1))) { ++id_first; - c=16*c+toupper((eight_bits)*id_first)-'A'+10; + c=16*c+toupper((int)*id_first)-(int)'A'+10; } break; case '\\':c='\\';@+break; @@ -1344,12 +1352,11 @@ code internally. }@/ /* at this point |c| should have been converted to its ASCII code number */ app_repl(constant); - if (c>=100) app_repl('0'+c/100); - if (c>=10) app_repl('0'+(c/10)%10); - app_repl('0'+c%10); + if (c>=100) app_repl((int)'0'+c/100); + if (c>=10) app_repl((int)'0'+(c/10)%10); + app_repl((int)'0'+c%10); app_repl(constant); } -break; @* Scanning a section. The |scan_section| procedure starts when `\.{@@\ }' or `\.{@@*}' has been @@ -1370,7 +1377,7 @@ scan_section(void) sixteen_bits a; /* token for left-hand side of definition */ section_count++; @+ no_where=true; if (*(loc-1)=='*' && show_progress) { /* starred section */ - printf("*%d",section_count); update_terminal; + printf("*%d",(int)section_count); update_terminal; } next_control=ignore; while (true) { @@ -1491,7 +1498,7 @@ skip_limbo(void) case translit_code: @@; break; case format_code: case '@@': break; case control_text: if (c=='q' || c=='Q') { - while ((c=skip_ahead())=='@@'); + while ((c=(char)skip_ahead())=='@@'); if (*(loc-1)!='>') err_print("! Double @@ should be used in control text"); @.Double @@ should be used...@> @@ -1530,19 +1537,19 @@ skip_limbo(void) } @ Because on some systems the difference between two pointers is a |ptrdiff_t| -but not an |int|, we use \.{\%ld} to print these quantities. +but not an |int|, we use \.{\%td} to print these quantities. @c void print_stats(void) { puts("\nMemory usage statistics:"); - printf("%ld names (out of %ld)\n", + printf("%td names (out of %ld)\n", (ptrdiff_t)(name_ptr-name_dir),(long)max_names); - printf("%ld replacement texts (out of %ld)\n", + printf("%td replacement texts (out of %ld)\n", (ptrdiff_t)(text_ptr-text_info),(long)max_texts); - printf("%ld bytes (out of %ld)\n", + printf("%td bytes (out of %ld)\n", (ptrdiff_t)(byte_ptr-byte_mem),(long)max_bytes); - printf("%ld tokens (out of %ld)\n", + printf("%td tokens (out of %ld)\n", (ptrdiff_t)(tok_ptr-tok_mem),(long)max_toks); } diff --git a/cweav-bs.ch b/cweav-bs.ch index c05ce06..e224406 100644 --- a/cweav-bs.ch +++ b/cweav-bs.ch @@ -20,12 +20,12 @@ This file contributed by Barry Schwartz, trashman@crud.mn.org, 28 Jun 94. The ``banner line'' defined here should be changed whenever \.{CWEAVE} is modified. -@d banner "This is CWEAVE (Version 4.4)" +@d banner "This is CWEAVE (Version 4.5)" @y The ``banner line'' defined here should be changed whenever \.{CWEAVE} is modified. -@d banner "This is CWEAVE (Version 4.4pc/big)" +@d banner "This is CWEAVE (Version 4.5pc/big)" @z diff --git a/cweav-pc.ch b/cweav-pc.ch index 0c95dcf..94e63a2 100644 --- a/cweav-pc.ch +++ b/cweav-pc.ch @@ -11,9 +11,9 @@ that allows >64K arrays. (If you need lots more bytes, try the alternate change files that have -bs in their name instead of -pc.) @x section 1 -@d banner "This is CWEAVE (Version 4.4)" +@d banner "This is CWEAVE (Version 4.5)" @y -@d banner "This is CWEAVE (Version 4.4pc)" +@d banner "This is CWEAVE (Version 4.5pc)" @z @x section 17 diff --git a/cweav-ql.ch b/cweav-ql.ch index d10fc1d..3245c5d 100644 --- a/cweav-ql.ch +++ b/cweav-ql.ch @@ -7,15 +7,15 @@ ex cc;"-v -h -c =500000 cweave_c" @x -\def\title{CWEAVE (Version 4.4)} +\def\title{CWEAVE (Version 4.5)} @y -\def\title{CWEAVE (QL Version 4.4)} +\def\title{CWEAVE (QL Version 4.5)} @z @x section 1 -@d banner "This is CWEAVE (Version 4.4)" +@d banner "This is CWEAVE (Version 4.5)" @y -@d banner "This is CWEAVE (QL Version 4.4)" +@d banner "This is CWEAVE (QL Version 4.5)" @z @x diff --git a/cweav-vms.ch b/cweav-vms.ch index f443d7e..09fbd23 100644 --- a/cweav-vms.ch +++ b/cweav-vms.ch @@ -13,9 +13,9 @@ modified: (also modified by Don Knuth to keep version numbers uptodate) @x section 1 (01-FEB-1992 ST) -@d banner "This is CWEAVE (Version 4.4)" +@d banner "This is CWEAVE (Version 4.5)" @y -@d banner "This is CWEAVE (VAX/VMS Version 4.4)" +@d banner "This is CWEAVE (VAX/VMS Version 4.5)" @z @x section 4 (01-FEB-1992 ST) diff --git a/cweav-w32.ch b/cweav-w32.ch index 013ca70..6292149 100644 --- a/cweav-w32.ch +++ b/cweav-w32.ch @@ -2,9 +2,9 @@ This is the change file for CWEB's CWEAVE under Win32 (Contributed by Fabrice Popineau, February 2002) @x section 1 -@d banner "This is CWEAVE (Version 4.4)" +@d banner "This is CWEAVE (Version 4.5)" @y -@d banner "This is CWEAVE (Version 4.4win32)" +@d banner "This is CWEAVE (Version 4.5win32)" @z @x diff --git a/cweave.w b/cweave.w index ffd835e..71e5ee3 100644 --- a/cweave.w +++ b/cweave.w @@ -2,7 +2,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 4.4 --- June 2021 +% Version 4.5 --- July 2021 % Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth @@ -32,11 +32,11 @@ \def\skipxTeX{\\{skip\_\TEX/}} \def\copyxTeX{\\{copy\_\TEX/}} -\def\title{CWEAVE (Version 4.4)} +\def\title{CWEAVE (Version 4.5)} \def\topofcontents{\null\vfill \centerline{\titlefont The {\ttitlefont CWEAVE} processor} \vskip 15pt - \centerline{(Version 4.4)} + \centerline{(Version 4.5)} \vfill} \def\botofcontents{\vfill \noindent @@ -67,7 +67,7 @@ Crusius, and others who have contributed improvements. The ``banner line'' defined here should be changed whenever \.{CWEAVE} is modified. -@d banner "This is CWEAVE (Version 4.4)" +@d banner "This is CWEAVE (Version 4.5)" @c @@/ @@ -245,7 +245,7 @@ If one were careful, one could probably make more changes around section 115 to avoid a lot of identifier looking up. @d append_xref(c) if (xref_ptr==xmem_end) overflow("cross-reference"); - else (++xref_ptr)->num=c; + else (++xref_ptr)->num=c @d no_xref !make_xrefs @d is_tiny(p) length(p)==1 @d unindexed(a) ((a)ilk>=custom) @@ -650,7 +650,7 @@ skip_TeX(void) /* skip past pure \TEX/ code */ if (loc>limit && get_line()==false) return new_section; *(limit+1)='@@'; while (*loc!='@@' && *loc!='|') loc++; - if (*loc++ =='|') return '|'; + if (*loc++ =='|') return (eight_bits)'|'; if (loc<=limit) return ccode[(eight_bits)*(loc++)]; } } @@ -711,13 +711,13 @@ get_next(void) /* produces the next input token */ @@; if (loc>limit && get_line()==false) return new_section; c=*(loc++); - if (xisdigit(c) || c=='.') @@; + if (xisdigit((int)c) || c=='.') @@; else if (c=='\'' || c=='"'@| || ((c=='L' || c=='u' || c=='U')&&(*loc=='\'' || *loc=='"'))@| || ((c=='u' && *loc=='8')&&(*(loc+1)=='\'' || *(loc+1)=='"'))@| || (c=='<' && sharp_include_line==true)) @@; - else if (isalpha(c) || isxalpha(c) || ishigh(c)) + else if (isalpha((int)c) || isxalpha(c) || ishigh(c)) @@; else if (c=='@@') @@; else if (xisspace(c)) continue; /* ignore spaces and tabs */ @@ -811,8 +811,8 @@ switch(c) { id_first=--loc; do ++loc; - while (isalpha((eight_bits)*loc) || isdigit((eight_bits)*loc) @| - || isxalpha((eight_bits)*loc) || ishigh((eight_bits)*loc)); + while (isalpha((int)*loc) || isdigit((int)*loc) @| + || isxalpha(*loc) || ishigh(*loc)); id_loc=loc; return identifier; } @@ -832,7 +832,7 @@ are pointers into the array |section_text|, not into |buffer|. @d gather_digits_while(t) while ((t) || *loc=='\'') if (*loc=='\'') { /* \CPLUSPLUS/-style digit separator */ *id_loc++=' '; loc++; /* insert a little bit of space */ - }@+else *id_loc++=*loc++; + }@+else *id_loc++=*loc++ @= { id_first=id_loc=section_text+1; @@ -857,7 +857,7 @@ get_exponent: digit_suffix: while (*loc=='u' || *loc=='U' || *loc=='l' || *loc=='L' || *loc=='f' || *loc=='F') { - *id_loc++='$'; *id_loc++=toupper((eight_bits)*loc); loc++; + *id_loc++='$'; *id_loc++=toupper((int)*loc); loc++; } return constant; } @@ -947,7 +947,7 @@ switch(ccode[(eight_bits)(c=*loc++)]) { case verbatim: @@; case ord: @@; case xref_roman: case xref_wildcard: case xref_typewriter: case noop: - case TeX_string: skip_restricted(); + case TeX_string: skip_restricted(); /* fall through */ default: return ccode[(eight_bits)c]; } @@ -1085,7 +1085,7 @@ phase_one(void) { changed_section[section_count]=changing; /* it will become |true| if any line changes */ if (*(loc-1)=='*' && show_progress) { - printf("*%d",section_count); + printf("*%d",(int)section_count); update_terminal; /* print a progress report */ } @@; @@ -1490,7 +1490,7 @@ out_section( sixteen_bits n) { char s[6]; - sprintf(s,"%d",n); out_str(s); + sprintf(s,"%d",(int)n); out_str(s); if (changed_section[n]) out_str("\\*"); @.\\*@> } @@ -2240,8 +2240,8 @@ text_pointer p) case section_flag: putchar('<'); print_section_name((name_dir+r)); putchar('>'); break; - case tok_flag: printf("[[%d]]",r); break; - case inner_tok_flag: printf("|[[%d]]|",r); break; + case tok_flag: printf("[[%d]]",(int)r); break; + case inner_tok_flag: printf("|[[%d]]|",(int)r); break; default: @@; } } @@ -2267,7 +2267,7 @@ switch (r) { case quoted_char: j++; printf("[%o]",(unsigned int)*j); break; case end_translation: printf("[quit]"); break; case inserted: printf("[inserted]"); break; - default: putchar(r); + default: putchar((int)r); } @ The production rules listed above are embedded directly into \.{CWEAVE}, @@ -2642,7 +2642,7 @@ to be performed, followed by |goto found|. @= if (cat1==lbrace || cat1==int_like || cat1==decl) { - make_underlined(pp); big_app(dindent); big_app1(pp); + make_underlined(pp); big_app1(pp); big_app(dindent); reduce(pp,1,fn_decl,0,1); } else if (cat1==unop) squash(pp,2,exp,-2,2); @@ -3341,7 +3341,7 @@ freeze_text; return text_ptr-1; @ @= if (lo_ptr>scrap_base && tracing==partly) { - printf("\nIrreducible scrap sequence in section %d:",section_count); + printf("\nIrreducible scrap sequence in section %d:",(int)section_count); @.Irreducible scrap sequence...@> mark_harmless; for (j=scrap_base; j<=lo_ptr; j++) { @@ -3748,8 +3748,8 @@ currently in progress. The end of output occurs when an |end_translation| token is found, so the stack is never empty except when we first begin the output process. -@d inner 0 /* value of |mode| for \CEE/ texts within \TEX/ texts */ -@d outer 1 /* value of |mode| for \CEE/ texts in sections */ +@d inner false /* value of |mode| for \CEE/ texts within \TEX/ texts */ +@d outer true /* value of |mode| for \CEE/ texts in sections */ @= typedef int mode; typedef struct { @@ -3913,17 +3913,21 @@ make_output(void) /* outputs the equivalents of tokens */ case end_translation: return; case identifier: case res_word: @@; break; case section_code: @@; break; - case math_rel: out_str("\\MRL{"@q}@>); + case math_rel: out_str("\\MRL{"@q}@>); /* fall through */ @.\\MRL@> case noop: case inserted: break; case cancel: case big_cancel: c=0; b=a; while (true) { a=get_output(); if (a==inserted) continue; - if ((abig_force) break; - if (a==indent) c++; - else if (a==outdent) c--; - else if (a==opt) a=get_output(); + if ((abig_force && a!=dindent)) break; + switch (a) { + case indent: c++; break; + case outdent: c--; break; + case dindent: c+=2; break; + case opt: a=get_output(); + } } @@; goto reswitch; @@ -3935,7 +3939,7 @@ make_output(void) /* outputs the equivalents of tokens */ case indent: case outdent: case opt: case backup: case break_space: case force: case big_force: case preproc_line: @@; break; - case quoted_char: out(*(cur_tok++)); + case quoted_char: out(*(cur_tok++)); /* fall through */ case qualifier: break; default: out(a); /* otherwise |a| is an ordinary character */ } @@ -4236,7 +4240,7 @@ else { @.\\N@> {@+ char s[32];@+sprintf(s,"{%d}",sec_depth+1);@+out_str(s);@+} if (show_progress) - printf("*%d",section_count); update_terminal; /* print a progress report */ + printf("*%d",(int)section_count); update_terminal; /* print a progress report */ } out('{'); out_section(section_count); out('}'); @@ -4604,7 +4608,7 @@ for (h=hash; h<=hash_end; h++) { while (next_name) { cur_name=next_name; next_name=cur_name->link; if (cur_name->xref!=(void *)xmem) { - c=(eight_bits)((cur_name->byte_start)[0]); + c=(cur_name->byte_start)[0]; if (xisupper(c)) c=tolower(c); blink[cur_name-name_dir]=bucket[c]; bucket[c]=cur_name; } @@ -4732,14 +4736,14 @@ while (sort_ptr>scrap_info) { } @ @= { - eight_bits c; + int c; next_name=sort_ptr->head; do { cur_name=next_name; next_name=blink[cur_name-name_dir]; cur_byte=cur_name->byte_start+cur_depth; if (cur_byte==(cur_name+1)->byte_start) c=0; /* hit end of the name */ else { - c=(eight_bits) *cur_byte; + c=*cur_byte; if (xisupper(c)) c=tolower(c); } blink[cur_name-name_dir]=bucket[c]; bucket[c]=cur_name; @@ -4845,30 +4849,30 @@ name_pointer p) @ @=section_print(root); @ Because on some systems the difference between two pointers is a |ptrdiff_t| -rather than an |int|, we use \.{\%ld} to print these quantities. +rather than an |int|, we use \.{\%td} to print these quantities. @c void print_stats(void) { puts("\nMemory usage statistics:"); @.Memory usage statistics:@> - printf("%ld names (out of %ld)\n", + printf("%td names (out of %ld)\n", (ptrdiff_t)(name_ptr-name_dir),(long)max_names); - printf("%ld cross-references (out of %ld)\n", + printf("%td cross-references (out of %ld)\n", (ptrdiff_t)(xref_ptr-xmem),(long)max_refs); - printf("%ld bytes (out of %ld)\n", + printf("%td bytes (out of %ld)\n", (ptrdiff_t)(byte_ptr-byte_mem),(long)max_bytes); puts("Parsing:"); - printf("%ld scraps (out of %ld)\n", + printf("%td scraps (out of %ld)\n", (ptrdiff_t)(max_scr_ptr-scrap_info),(long)max_scraps); - printf("%ld texts (out of %ld)\n", + printf("%td texts (out of %ld)\n", (ptrdiff_t)(max_text_ptr-tok_start),(long)max_texts); - printf("%ld tokens (out of %ld)\n", + printf("%td tokens (out of %ld)\n", (ptrdiff_t)(max_tok_ptr-tok_mem),(long)max_toks); - printf("%ld levels (out of %ld)\n", + printf("%td levels (out of %ld)\n", (ptrdiff_t)(max_stack_ptr-stack),(long)stack_size); puts("Sorting:"); - printf("%ld levels (out of %ld)\n", + printf("%td levels (out of %ld)\n", (ptrdiff_t)(max_sort_ptr-scrap_info),(long)max_scraps); } diff --git a/cwebmac.tex b/cwebmac.tex index 4673573..4f93a15 100644 --- a/cwebmac.tex +++ b/cwebmac.tex @@ -1,7 +1,7 @@ % standard macros for CWEB listings (in addition to plain.tex) -% Version 4.4 --- June 2021 +% Version 4.5 --- July 2021 \ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros -\xdef\fmtversion{\fmtversion+CWEB4.4} +\xdef\fmtversion{\fmtversion+CWEB4.5} \chardef\cwebversion=4 \chardef\cwebrevision=4 \newif\ifpdf \ifx\pdf+\pdftrue\fi diff --git a/cwebman.tex b/cwebman.tex index e7706db..449aad5 100644 --- a/cwebman.tex +++ b/cwebman.tex @@ -35,7 +35,7 @@ \def\lheader{\mainfont\the\pageno\hfill\sc\runninghead\hfill} \def\rheader{\hfill\sc\runninghead\hfill\mainfont\the\pageno} -\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.4)} +\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.5)} % This verbatim mode assumes that ! marks are !! in the text being copied. \def\verbatim{\begingroup @@ -49,7 +49,7 @@ \null\vfill \centerline{\titlefont The {\ttitlefont CWEB} System of Structured Documentation} -\vskip 18pt\centerline{(Version 4.4 --- June 2021)} +\vskip 18pt\centerline{(Version 4.5 --- July 2021)} \vskip 24pt \centerline{\authorfont Donald E. Knuth and Silvio Levy} \vfill @@ -1592,7 +1592,7 @@ \.{ { }\\titlefalse \% include headline on the contents page}\cr \.{ { }\\def\\rheader\{\\mainfont The \{\\tt CWEAVE\}{ }processor\\hfil\}}\cr \.{ { }\\centerline\{\\titlefont The \{\\ttitlefont CWEAVE\}{ }processor\}}\cr - \.{ { }\\vskip 15pt \\centerline\{(Version 4.4)\}{ }\\vfill\}}\cr}$$ + \.{ { }\\vskip 15pt \\centerline\{(Version 4.5)\}{ }\\vfill\}}\cr}$$ Redefining \.{\\rheader}, which is the headline for right-hand pages, suffices in this case to put the desired information at the top of the contents page. diff --git a/prod.w b/prod.w index c4c75e0..975dfe5 100644 --- a/prod.w +++ b/prod.w @@ -2,7 +2,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.6 --- May 2000 +% Version 4.5 --- July 2021 % @ Here is a table of all the productions. Each production that combines two or more consecutive scraps implicitly inserts a {\tt \$}