diff options
author | Norbert Preining <norbert@preining.info> | 2021-12-29 03:01:06 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-12-29 03:01:06 +0000 |
commit | dce1a2a6ecd9971433b4ee24c9d36b124cc1280e (patch) | |
tree | 051072f1ec49fbe350e7f88309ab293d1806e121 /web/c_cpp/cweb/common.c | |
parent | ecdf859b6ce481abfd530425dcf6f0f764bd0001 (diff) |
CTAN sync 202112290301
Diffstat (limited to 'web/c_cpp/cweb/common.c')
-rw-r--r-- | web/c_cpp/cweb/common.c | 427 |
1 files changed, 208 insertions, 219 deletions
diff --git a/web/c_cpp/cweb/common.c b/web/c_cpp/cweb/common.c index 7dd0f0c083..9e77c55f31 100644 --- a/web/c_cpp/cweb/common.c +++ b/web/c_cpp/cweb/common.c @@ -1,19 +1,19 @@ /*1:*/ -#line 66 "common.w" +#line 62 "common.w" /*3:*/ -#line 46 "common.h" +#line 44 "common.h" #include <ctype.h> #include <stdbool.h> #include <stddef.h> #include <stdint.h> -#include <stdlib.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> /*:3*/ -#line 67 "common.w" +#line 63 "common.w" #define ctangle false #define cweave true \ @@ -34,16 +34,22 @@ #define period_ast 026 #define minus_gt_ast 027 \ -#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 compress(c) if(loc++<=limit) return c \ + +#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) \ + \ #define max_include_depth 10 \ -#define max_file_name_length 1024 +#define max_file_name_length 60 #define cur_file file[include_depth] #define cur_file_name file_name[include_depth] #define cur_line line[include_depth] @@ -51,7 +57,7 @@ #define web_file_name file_name[0] \ #define length(c) (size_t) ((c+1) ->byte_start-(c) ->byte_start) -#define print_id(c) term_write((c) ->byte_start,length((c) ) ) +#define print_id(c) term_write((c) ->byte_start,length(c) ) #define llink link #define rlink dummy.Rlink #define root name_dir->rlink \ @@ -61,55 +67,50 @@ #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 show_banner flags['b'] #define show_progress flags['p'] -#define show_stats flags['s'] #define show_happiness flags['h'] +#define show_stats flags['s'] #define make_xrefs flags['x'] \ #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 C_printf(c,a) fprintf(C_file,c,a) -#define C_putc(c) putc(c,C_file) \ +#define term_write(a,b) fflush(stdout) ,fwrite(a,sizeof(char) ,b,stdout) \ -#define max_bytes 1000000 \ +#define buf_size 100 +#define longest_name 10000 \ -#define max_toks 1000000 -#define max_names 10239 \ +#define long_buf_size (buf_size+longest_name) +#define max_bytes 90000 \ -#define max_sections 4000 -#define max_texts 10239 -#define longest_name 10000 -#define stack_size 500 -#define buf_size 1000 -#define long_buf_size (buf_size+longest_name) \ +#define max_names 4000 \ + +#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= '!'; \ +#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;} \ -#define hash_size 8501 \ +#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 @@ -121,10 +122,10 @@ err_print("! Include file name too long") ;goto restart;} \ #define flag_change (**argv!='-') -#line 68 "common.w" +#line 64 "common.w" /*2:*/ -#line 37 "common.h" +#line 35 "common.h" typedef bool boolean; typedef uint8_t eight_bits; @@ -141,7 +142,7 @@ extern char*id_first; extern char*id_loc; /*:4*//*5:*/ -#line 88 "common.h" +#line 92 "common.h" extern char buffer[]; extern char*buffer_end; @@ -149,7 +150,7 @@ extern char*loc; extern char*limit; /*:5*//*6:*/ -#line 105 "common.h" +#line 109 "common.h" extern int include_depth; extern FILE*file[]; @@ -165,7 +166,7 @@ extern boolean changing; extern boolean web_file_open; /*:6*//*8:*/ -#line 125 "common.h" +#line 129 "common.h" extern sixteen_bits section_count; extern boolean changed_section[]; @@ -173,7 +174,7 @@ extern boolean change_pending; extern boolean print_where; /*:8*//*9:*/ -#line 139 "common.h" +#line 143 "common.h" typedef struct name_info{ char*byte_start; @@ -198,12 +199,12 @@ extern hash_pointer hash_end; extern hash_pointer h; /*:9*//*11:*/ -#line 183 "common.h" +#line 187 "common.h" extern int history; /*:11*//*13:*/ -#line 199 "common.h" +#line 203 "common.h" extern int argc; extern char**argv; @@ -214,7 +215,7 @@ extern char scn_file_name[]; extern boolean flags[]; /*:13*//*14:*/ -#line 215 "common.h" +#line 217 "common.h" extern FILE*C_file; extern FILE*tex_file; @@ -223,20 +224,20 @@ extern FILE*scn_file; extern FILE*active_file; /*:14*/ -#line 69 "common.w" +#line 65 "common.w" /*18:*/ -#line 83 "common.w" +#line 79 "common.w" boolean program; /*:18*//*19:*/ -#line 92 "common.w" +#line 88 "common.w" int phase; /*:19*//*21:*/ -#line 130 "common.w" +#line 126 "common.w" char section_text[longest_name+1]; char*section_text_end= section_text+longest_name; @@ -244,7 +245,7 @@ char*id_first; char*id_loc; /*:21*//*22:*/ -#line 150 "common.w" +#line 146 "common.w" char buffer[long_buf_size]; char*buffer_end= buffer+buf_size-2; @@ -252,7 +253,7 @@ char*loc= buffer; char*limit= buffer; /*:22*//*25:*/ -#line 194 "common.w" +#line 190 "common.w" int include_depth; FILE*file[max_include_depth]; @@ -269,13 +270,13 @@ boolean changing; boolean web_file_open= false; /*:25*//*26:*/ -#line 220 "common.w" +#line 216 "common.w" static char change_buffer[buf_size]; static char*change_limit; /*:26*//*37:*/ -#line 399 "common.w" +#line 393 "common.w" sixteen_bits section_count; boolean changed_section[max_sections]; @@ -284,7 +285,7 @@ boolean change_pending; boolean print_where= false; /*:37*//*43:*/ -#line 596 "common.w" +#line 590 "common.w" char byte_mem[max_bytes]; char*byte_mem_end= byte_mem+max_bytes-1; @@ -292,25 +293,25 @@ name_info name_dir[max_names]; name_pointer name_dir_end= name_dir+max_names-1; /*:43*//*44:*/ -#line 607 "common.w" +#line 601 "common.w" char*byte_ptr; name_pointer name_ptr; /*:44*//*46:*/ -#line 627 "common.w" +#line 621 "common.w" name_pointer hash[hash_size]; hash_pointer hash_end= hash+hash_size-1; hash_pointer h; /*:46*//*65:*/ -#line 1014 "common.w" +#line 1003 "common.w" int history= spotless; /*:65*//*73:*/ -#line 1135 "common.w" +#line 1126 "common.w" int argc; char**argv; @@ -321,7 +322,7 @@ char scn_file_name[max_file_name_length]; boolean flags[128]; /*:73*//*83:*/ -#line 1282 "common.w" +#line 1269 "common.w" FILE*C_file; FILE*tex_file; @@ -330,22 +331,22 @@ FILE*scn_file; FILE*active_file; /*:83*/ -#line 70 "common.w" +#line 66 "common.w" /*7:*/ -#line 119 "common.h" +#line 123 "common.h" extern boolean get_line(void); extern void check_complete(void); extern void reset_input(void); /*:7*//*10:*/ -#line 162 "common.h" +#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*,int); +extern name_pointer section_lookup(char*,char*,boolean); extern void init_node(name_pointer); extern void init_p(name_pointer,eight_bits); extern void print_prefix_name(name_pointer); @@ -353,7 +354,7 @@ extern void print_section_name(name_pointer); extern void sprint_section_name(char*,name_pointer); /*:10*//*12:*/ -#line 186 "common.h" +#line 190 "common.h" extern int wrap_up(void); extern void err_print(const char*); @@ -361,50 +362,50 @@ extern void fatal(const char*,const char*); extern void overflow(const char*); /*:12*//*15:*/ -#line 223 "common.h" +#line 225 "common.h" extern void common_init(void); extern void print_stats(void); /*:15*//*24:*/ -#line 180 "common.w" +#line 176 "common.w" static boolean input_ln(FILE*); /*:24*//*28:*/ -#line 241 "common.w" +#line 237 "common.w" static void prime_the_change_buffer(void); /*:28*//*33:*/ -#line 340 "common.w" +#line 334 "common.w" static void check_change(void); /*:33*//*55:*/ -#line 774 "common.w" +#line 764 "common.w" -static int web_strcmp(char*,int,char*,int); -static name_pointer add_section_name(name_pointer,int,char*,char*,int); -static void extend_section_name(name_pointer,char*,char*,int); +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 1002 "common.w" -static int section_name_cmp(char**,int,name_pointer); +#line 991 "common.w" +static int section_name_cmp(char**,size_t,name_pointer); /*:64*//*76:*/ -#line 1197 "common.w" +#line 1186 "common.w" static void scan_args(void); /*:76*/ -#line 71 "common.w" +#line 67 "common.w" /*:1*//*20:*/ -#line 99 "common.w" +#line 95 "common.w" void common_init(void) { /*45:*/ -#line 611 "common.w" +#line 605 "common.w" name_dir->byte_start= byte_ptr= byte_mem; name_ptr= name_dir+1; @@ -412,24 +413,23 @@ name_ptr->byte_start= byte_mem; root= NULL; /*:45*//*47:*/ -#line 634 "common.w" +#line 628 "common.w" for(h= hash;h<=hash_end;*h++= NULL); /*:47*/ -#line 103 "common.w" +#line 99 "common.w" /*74:*/ -#line 1148 "common.w" +#line 1139 "common.w" show_banner= show_happiness= show_progress= make_xrefs= true; -show_stats= false; /*:74*/ -#line 104 "common.w" +#line 100 "common.w" /*84:*/ -#line 1289 "common.w" +#line 1276 "common.w" scan_args(); if(program==ctangle){ @@ -443,12 +443,12 @@ fatal("! Cannot open output file ",tex_file_name); } /*:84*/ -#line 105 "common.w" +#line 101 "common.w" } /*:20*//*23:*/ -#line 160 "common.w" +#line 156 "common.w" static boolean input_ln( FILE*fp) @@ -470,21 +470,21 @@ return true; } /*:23*//*27:*/ -#line 231 "common.w" +#line 227 "common.w" static void prime_the_change_buffer(void) { change_limit= change_buffer; /*29:*/ -#line 247 "common.w" +#line 243 "common.w" while(true){ change_line++; if(!input_ln(change_file))return; if(limit<buffer+2)continue; if(buffer[0]!='@')continue; -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')break; if(buffer[1]=='y'||buffer[1]=='z'||buffer[1]=='i'){ loc= buffer+2; @@ -494,10 +494,10 @@ err_print("! Missing @x in change file"); } /*:29*/ -#line 236 "common.w" +#line 232 "common.w" /*30:*/ -#line 264 "common.w" +#line 260 "common.w" do{ change_line++; @@ -509,23 +509,21 @@ return; }while(limit==buffer); /*:30*/ -#line 237 "common.w" +#line 233 "common.w" /*31:*/ -#line 274 "common.w" +#line 270 "common.w" -{ change_limit= change_buffer+(ptrdiff_t)(limit-buffer); strncpy(change_buffer,buffer,(size_t)(limit-buffer+1)); -} /*:31*/ -#line 238 "common.w" +#line 234 "common.w" } /*:27*//*32:*/ -#line 302 "common.w" +#line 296 "common.w" static void check_change(void) @@ -538,7 +536,7 @@ if_section_start_make_pending(true); if(!change_pending)changed_section[section_count]= true; } while(true){ -changing= true;print_where= true;change_line++; +changing= print_where= true;change_line++; if(!input_ln(change_file)){ err_print("! Change file ended before @y"); @@ -546,9 +544,9 @@ change_limit= change_buffer;changing= false; 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 342 "common.w" +#line 336 "common.w" if(xyz_code=='x'||xyz_code=='z'){ loc= buffer+2;err_print("! Where is the matching @y?"); @@ -566,19 +564,17 @@ return; } /*:34*/ -#line 324 "common.w" +#line 318 "common.w" } /*31:*/ -#line 274 "common.w" +#line 270 "common.w" -{ change_limit= change_buffer+(ptrdiff_t)(limit-buffer); strncpy(change_buffer,buffer,(size_t)(limit-buffer+1)); -} /*:31*/ -#line 326 "common.w" +#line 320 "common.w" changing= false;cur_line++; while(!input_ln(cur_file)){ @@ -594,14 +590,14 @@ if(lines_dont_match)n++; } /*:32*//*35:*/ -#line 362 "common.w" +#line 356 "common.w" void reset_input(void) { limit= buffer;loc= buffer+1;buffer[0]= ' '; /*36:*/ -#line 377 "common.w" +#line 371 "common.w" if((web_file= fopen(web_file_name,"r"))==NULL){ strcpy(web_file_name,alt_web_file_name); @@ -615,23 +611,23 @@ if((change_file= fopen(change_file_name,"r"))==NULL) fatal("! Cannot open change file ",change_file_name); /*:36*/ -#line 367 "common.w" +#line 361 "common.w" -include_depth= 0;cur_line= 0;change_line= 0; +include_depth= cur_line= change_line= 0; change_depth= include_depth; -changing= 1;prime_the_change_buffer();changing= !changing; +changing= true;prime_the_change_buffer();changing= !changing; limit= buffer;loc= buffer+1;buffer[0]= ' ';input_has_ended= false; } /*:35*//*38:*/ -#line 406 "common.w" +#line 400 "common.w" boolean get_line(void) { restart: if(changing&&include_depth==change_depth) /*41:*/ -#line 514 "common.w" +#line 508 "common.w" { change_line++; if(!input_ln(change_file)){ @@ -648,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?"); @@ -662,11 +658,11 @@ prime_the_change_buffer();changing= !changing;print_where= true; } /*:41*/ -#line 411 "common.w" +#line 405 "common.w" if(!changing||include_depth> change_depth){ /*40:*/ -#line 497 "common.w" +#line 491 "common.w" { cur_line++; while(!input_ln(cur_file)){ @@ -685,7 +681,7 @@ if(change_limit> change_buffer)check_change(); } /*:40*/ -#line 413 "common.w" +#line 407 "common.w" if(changing&&include_depth==change_depth)goto restart; } @@ -706,12 +702,12 @@ goto restart; } include_depth++; /*39:*/ -#line 451 "common.w" +#line 445 "common.w" { char temp_file_name[max_file_name_length]; char*cur_file_name_end= cur_file_name+max_file_name_length-1; -char*k= cur_file_name,*kk; -int l; +char*kk,*k= cur_file_name; +size_t l; if(*loc=='"'){ loc++; @@ -726,8 +722,8 @@ if((cur_file= fopen(cur_file_name,"r"))!=NULL){ cur_line= 0;print_where= true; goto restart; } -kk= getenv("CWEBINPUTS"); -if(kk!=NULL){ +if((kk= getenv("CWEBINPUTS"))!=NULL){ + if((l= strlen(kk))> max_file_name_length-2)too_long(); strcpy(temp_file_name,kk); } @@ -754,14 +750,14 @@ include_depth--;err_print("! Cannot open include file");goto restart; } /*:39*/ -#line 432 "common.w" +#line 426 "common.w" } return true; } /*:38*//*42:*/ -#line 546 "common.w" +#line 540 "common.w" void check_complete(void){ @@ -775,32 +771,32 @@ err_print("! Change file entry did not match"); } /*:42*//*48:*/ -#line 639 "common.w" +#line 633 "common.w" 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 662 "common.w" +#line 656 "common.w" -h= (eight_bits)*i; +h= (int)((eight_bits)*i); while(++i<last)h= (h+h+(int)((eight_bits)*i))%hash_size; /*:49*/ -#line 652 "common.w" +#line 646 "common.w" /*50:*/ -#line 670 "common.w" +#line 664 "common.w" p= hash[h]; while(p&&!names_match(p,first,l,t))p= p->link; @@ -810,10 +806,10 @@ p->link= hash[h];hash[h]= p; } /*:50*/ -#line 653 "common.w" +#line 647 "common.w" if(p==name_ptr)/*51:*/ -#line 681 "common.w" +#line 676 "common.w" { if(byte_ptr+l> byte_mem_end)overflow("byte memory"); if(name_ptr>=name_dir_end)overflow("name"); @@ -823,13 +819,13 @@ init_p(p,t); } /*:51*/ -#line 654 "common.w" +#line 648 "common.w" return p; } /*:48*//*52:*/ -#line 713 "common.w" +#line 708 "common.w" void print_section_name( @@ -839,18 +835,16 @@ char*ss,*s= first_chunk(p); name_pointer q= p+1; while(p!=name_dir){ ss= (p+1)->byte_start-1; -if(*ss==' '&&ss>=s){ -term_write(s,(size_t)(ss-s));p= q->link;q= p; -}else{ -term_write(s,(size_t)(ss+1-s));p= name_dir;q= NULL; -} +if(*ss==' '&&ss>=s)p= q->link,q= p; +else ss++,p= name_dir,q= NULL; +term_write(s,(size_t)(ss-s)); s= p->byte_start; } if(q)term_write("...",3); } /*:52*//*53:*/ -#line 732 "common.w" +#line 725 "common.w" void sprint_section_name( @@ -861,11 +855,8 @@ char*ss,*s= first_chunk(p); name_pointer q= p+1; while(p!=name_dir){ ss= (p+1)->byte_start-1; -if(*ss==' '&&ss>=s){ -p= q->link;q= p; -}else{ -ss++;p= name_dir; -} +if(*ss==' '&&ss>=s)p= q->link,q= p; +else ss++,p= name_dir; strncpy(dest,s,(size_t)(ss-s)),dest+= ss-s; s= p->byte_start; } @@ -873,26 +864,26 @@ s= p->byte_start; } /*:53*//*54:*/ -#line 753 "common.w" +#line 743 "common.w" void 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); } /*:54*//*56:*/ -#line 779 "common.w" +#line 769 "common.w" 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<k1&&j<j1&&*j==*k)k++,j++; @@ -904,7 +895,7 @@ else return greater; } /*:56*//*57:*/ -#line 808 "common.w" +#line 798 "common.w" static name_pointer add_section_name( @@ -912,11 +903,11 @@ name_pointer par, int c, char*first, char*last, -int ispref) +boolean ispref) { name_pointer p= name_ptr; char*s= first_chunk(p); -int name_len= (int)(last-first)+ispref; +size_t name_len= (size_t)(last-first+(int)ispref); if(s+name_len> byte_mem_end)overflow("byte memory"); if(name_ptr+1>=name_dir_end)overflow("name"); (++name_ptr)->byte_start= byte_ptr= s+name_len; @@ -928,25 +919,24 @@ name_ptr->link= name_dir; } set_prefix_length(p,name_len); strncpy(s,first,name_len); -p->llink= NULL; -p->rlink= NULL; +p->llink= p->rlink= NULL; init_node(p); return par==NULL?(root= p):c==less?(par->llink= p):(par->rlink= p); } /*:57*//*58:*/ -#line 837 "common.w" +#line 826 "common.w" static void extend_section_name( name_pointer p, char*first, char*last, -int ispref) +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; @@ -959,22 +949,22 @@ if(ispref)*(byte_ptr-1)= ' '; } /*:58*//*59:*/ -#line 865 "common.w" +#line 854 "common.w" name_pointer section_lookup( char*first,char*last, -int ispref) +boolean ispref) { -int c= 0; +int c= less; name_pointer p= root; 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 889 "common.w" +#line 878 "common.w" while(p){ c= web_strcmp(first,name_len,first_chunk(p),prefix_length(p)); @@ -1001,19 +991,19 @@ p= q,q= NULL; } /*:60*/ -#line 879 "common.w" +#line 868 "common.w" /*61:*/ -#line 914 "common.w" +#line 903 "common.w" if(r==NULL) return add_section_name(par,c,first,last+1,ispref); /*:61*/ -#line 880 "common.w" +#line 869 "common.w" /*62:*/ -#line 922 "common.w" +#line 911 "common.w" switch(section_name_cmp(&first,name_len,r)){ @@ -1026,16 +1016,16 @@ err_print(">"); } else if(name_len<prefix_length(r))set_prefix_length(r,name_len); -case equal:return r; +case equal:break; case extension:if(!ispref||first<=last) extend_section_name(r,first,last+1,ispref); -return r; +break; case bad_extension: fputs("\n! New name extends <",stdout); print_section_name(r); err_print(">"); -return r; +break; default: fputs("\n! Section name incompatible with <",stdout); @@ -1043,32 +1033,32 @@ print_prefix_name(r); fputs(">,\n which abbreviates <",stdout); print_section_name(r); err_print(">"); -return r; } +return r; /*:62*/ -#line 881 "common.w" +#line 870 "common.w" } /*:59*//*63:*/ -#line 970 "common.w" +#line 959 "common.w" static int section_name_cmp( char**pfirst, -int len, +size_t len, name_pointer r) { char*first= *pfirst; name_pointer q= r+1; char*ss,*s= first_chunk(r); -int c; -int ispref; +int c= less; +boolean ispref; while(true){ ss= (r+1)->byte_start-1; -if(*ss==' '&&ss>=r->byte_start)ispref= 1,q= q->link; -else ispref= 0,ss++,q= name_dir; -switch(c= web_strcmp(first,len,s,ss-s)){ +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,(size_t)(ss-s))){ case equal:if(q==name_dir) if(ispref){ *pfirst= first+(ptrdiff_t)(ss-s); @@ -1086,18 +1076,18 @@ default:return c; } /*:63*//*66:*/ -#line 1024 "common.w" +#line 1013 "common.w" void err_print( const char*s) { -char*k,*l; -printf(*s=='!'?"\n%s":"%s",s); +*s=='!'?printf("\n%s",s):printf("%s",s); if(web_file_open)/*67:*/ -#line 1044 "common.w" +#line 1032 "common.w" -{if(changing&&include_depth==change_depth) +{char*k,*l; +if(changing&&include_depth==change_depth) printf(". (l. %d of change file)\n",change_line); else if(include_depth==0)printf(". (l. %d)\n",cur_line); else printf(". (l. %d of include file %s)\n",cur_line,cur_file_name); @@ -1106,7 +1096,7 @@ if(l> buffer){ for(k= buffer;k<l;k++) if(*k=='\t')putchar(' '); else putchar(*k); -putchar('\n'); +new_line; for(k= buffer;k<l;k++)putchar(' '); } for(k= l;k<limit;k++)putchar(*k); @@ -1115,39 +1105,41 @@ putchar(' '); } /*:67*/ -#line 1031 "common.w" +#line 1019 "common.w" update_terminal;mark_error; } /*:66*//*68:*/ -#line 1076 "common.w" +#line 1065 "common.w" int wrap_up(void){ if(show_progress)new_line; if(show_stats) print_stats(); /*69:*/ -#line 1086 "common.w" +#line 1075 "common.w" switch(history){ -case spotless:if(show_happiness)puts("(No errors were found.)");break; +case spotless: +if(show_happiness)puts("(No errors were found.)");break; case harmless_message: puts("(Did you see the warning message above?)");break; case error_message: puts("(Pardon me, but I think I spotted something wrong.)");break; -case fatal_message:puts("(That was a fatal error, my friend.)"); +case fatal_message:default: +puts("(That was a fatal error, my friend.)"); } /*:69*/ -#line 1081 "common.w" +#line 1070 "common.w" if(history> harmless_message)return EXIT_FAILURE; else return EXIT_SUCCESS; } /*:68*//*70:*/ -#line 1102 "common.w" +#line 1093 "common.w" void fatal( const char*s,const char*t) @@ -1158,7 +1150,7 @@ history= fatal_message;exit(wrap_up()); } /*:70*//*71:*/ -#line 1113 "common.w" +#line 1104 "common.w" void overflow( const char*t) @@ -1168,7 +1160,7 @@ printf("\n! Sorry, %s capacity exceeded",t);fatal("",""); /*:71*//*75:*/ -#line 1167 "common.w" +#line 1157 "common.w" static void scan_args(void) @@ -1182,41 +1174,38 @@ boolean found_web= false,found_change= false,found_out= false; strcpy(change_file_name,"/dev/null"); while(--argc> 0){ if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*80:*/ -#line 1258 "common.w" +#line 1247 "common.w" -{ for(dot_pos= *argv+1;*dot_pos> '\0';dot_pos++) flags[(eight_bits)*dot_pos]= flag_change; -} /*:80*/ -#line 1179 "common.w" +#line 1169 "common.w" else{ s= name_pos= *argv;dot_pos= NULL; -while(*s){ +while(*s) if(*s=='.')dot_pos= s++; else if(*s=='/')dot_pos= NULL,name_pos= ++s; else s++; -} if(!found_web)/*77:*/ -#line 1206 "common.w" +#line 1195 "common.w" { if(s-*argv> max_file_name_length-5) /*82:*/ -#line 1276 "common.w" +#line 1263 "common.w" fatal("! Filename too long\n",*argv); /*:82*/ -#line 1209 "common.w" +#line 1198 "common.w" if(dot_pos==NULL) sprintf(web_file_name,"%s.w",*argv); else{ strcpy(web_file_name,*argv); -*dot_pos= 0; +*dot_pos= '\0'; } sprintf(alt_web_file_name,"%s.web",*argv); sprintf(tex_file_name,"%s.tex",name_pos); @@ -1227,21 +1216,21 @@ found_web= true; } /*:77*/ -#line 1188 "common.w" +#line 1177 "common.w" else if(!found_change)/*78:*/ -#line 1224 "common.w" +#line 1213 "common.w" { if(strcmp(*argv,"-")!=0){ if(s-*argv> max_file_name_length-4) /*82:*/ -#line 1276 "common.w" +#line 1263 "common.w" fatal("! Filename too long\n",*argv); /*:82*/ -#line 1228 "common.w" +#line 1217 "common.w" if(dot_pos==NULL) sprintf(change_file_name,"%s.ch",*argv); @@ -1251,20 +1240,20 @@ found_change= true; } /*:78*/ -#line 1189 "common.w" +#line 1178 "common.w" else if(!found_out)/*79:*/ -#line 1236 "common.w" +#line 1225 "common.w" { if(s-*argv> max_file_name_length-5) /*82:*/ -#line 1276 "common.w" +#line 1263 "common.w" fatal("! Filename too long\n",*argv); /*:82*/ -#line 1239 "common.w" +#line 1228 "common.w" if(dot_pos==NULL){ sprintf(tex_file_name,"%s.tex",*argv); @@ -1275,7 +1264,7 @@ sprintf(C_file_name,"%s.c",*argv); strcpy(tex_file_name,*argv); strcpy(C_file_name,*argv); if(make_xrefs){ -*dot_pos= 0; +*dot_pos= '\0'; sprintf(idx_file_name,"%s.idx",*argv); sprintf(scn_file_name,"%s.scn",*argv); } @@ -1284,10 +1273,10 @@ found_out= true; } /*:79*/ -#line 1190 "common.w" +#line 1179 "common.w" else/*81:*/ -#line 1264 "common.w" +#line 1251 "common.w" { if(program==ctangle) @@ -1301,12 +1290,12 @@ else fatal( } /*:81*/ -#line 1191 "common.w" +#line 1180 "common.w" } } if(!found_web)/*81:*/ -#line 1264 "common.w" +#line 1251 "common.w" { if(program==ctangle) @@ -1320,7 +1309,7 @@ else fatal( } /*:81*/ -#line 1194 "common.w" +#line 1183 "common.w" } |