summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/cwebboot.cin
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2020-04-27 08:33:45 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2020-04-27 08:33:45 +0000
commite199d19767edd083e7e89e55c5d90c3c54803508 (patch)
tree5592a93c8190c4a94c57c96bf751614ef54a74ab /Build/source/texk/web2c/cwebboot.cin
parentb01f5b75cfc4ddfbe1377e090c64700763560df7 (diff)
[CWEB] Purge duplicate typedef.
git-svn-id: svn://tug.org/texlive/trunk@54906 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/cwebboot.cin')
-rw-r--r--Build/source/texk/web2c/cwebboot.cin269
1 files changed, 134 insertions, 135 deletions
diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin
index ba096a70d80..522e10db6f6 100644
--- a/Build/source/texk/web2c/cwebboot.cin
+++ b/Build/source/texk/web2c/cwebboot.cin
@@ -17,21 +17,21 @@
#include <stdlib.h>
/*:22*//*81:*/
-#line 1136 "cwebdir/comm-w2c.ch"
+#line 1135 "cwebdir/comm-w2c.ch"
#include <string.h>
#line 1417 "cwebdir/common.w"
-#line 1143 "cwebdir/comm-w2c.ch"
+#line 1142 "cwebdir/comm-w2c.ch"
/*:81*//*85:*/
-#line 1182 "cwebdir/comm-w2c.ch"
+#line 1181 "cwebdir/comm-w2c.ch"
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
/*:85*//*88:*/
-#line 1224 "cwebdir/comm-w2c.ch"
+#line 1223 "cwebdir/comm-w2c.ch"
#ifndef HAVE_GETTEXT
#define HAVE_GETTEXT 0
@@ -48,7 +48,7 @@
#endif
/*:88*//*90:*/
-#line 1314 "cwebdir/comm-w2c.ch"
+#line 1313 "cwebdir/comm-w2c.ch"
typedef bool boolean;
#define HAVE_BOOLEAN
@@ -185,10 +185,9 @@ err_print(_("! Include file name too long") ) ;goto restart;} \
#line 73 "cwebdir/common.w"
#line 51 "cwebdir/comm-w2c.ch"
-typedef bool boolean;
typedef uint8_t eight_bits;
typedef uint16_t sixteen_bits;
-#line 59 "cwebdir/comm-w2c.ch"
+#line 58 "cwebdir/comm-w2c.ch"
typedef enum{
ctangle,cweave,ctwill
}cweb;
@@ -196,7 +195,7 @@ cweb program;
#line 76 "cwebdir/common.w"
/*:2*//*6:*/
-#line 96 "cwebdir/comm-w2c.ch"
+#line 95 "cwebdir/comm-w2c.ch"
char section_text[longest_name+1];
char*section_text_end= section_text+longest_name;
@@ -259,7 +258,7 @@ char Ilk;
}dummy;
/*:40*//*55:*/
-#line 719 "cwebdir/comm-w2c.ch"
+#line 718 "cwebdir/comm-w2c.ch"
void*equiv_or_xref;
#line 1064 "cwebdir/common.w"
@@ -301,10 +300,10 @@ char**argv;
char C_file_name[max_file_name_length];
char tex_file_name[max_file_name_length];
char idx_file_name[max_file_name_length];
-#line 880 "cwebdir/comm-w2c.ch"
+#line 879 "cwebdir/comm-w2c.ch"
char scn_file_name[max_file_name_length];
char check_file_name[max_file_name_length];
-#line 887 "cwebdir/comm-w2c.ch"
+#line 886 "cwebdir/comm-w2c.ch"
boolean flags[128];
const char*use_language= "";
#line 1228 "cwebdir/common.w"
@@ -315,15 +314,15 @@ const char*use_language= "";
FILE*C_file;
FILE*tex_file;
FILE*idx_file;
-#line 1069 "cwebdir/comm-w2c.ch"
+#line 1068 "cwebdir/comm-w2c.ch"
FILE*scn_file;
FILE*check_file;
-#line 1076 "cwebdir/comm-w2c.ch"
+#line 1075 "cwebdir/comm-w2c.ch"
FILE*active_file;
char*found_filename;
#line 1376 "cwebdir/common.w"
-#line 1093 "cwebdir/comm-w2c.ch"
+#line 1092 "cwebdir/comm-w2c.ch"
/*:77*/
#line 61 "cwebdir/common.w"
@@ -338,7 +337,7 @@ char change_buffer[buf_size];
char*change_limit;
/*:11*//*86:*/
-#line 1198 "cwebdir/comm-w2c.ch"
+#line 1197 "cwebdir/comm-w2c.ch"
char cb_banner[max_banner];
string texmf_locale;
@@ -353,51 +352,51 @@ char separators[]= SEPARATORS;
/*33:*/
#line 650 "cwebdir/common.w"
-#line 448 "cwebdir/comm-w2c.ch"
+#line 447 "cwebdir/comm-w2c.ch"
extern boolean names_match(name_pointer,const char*,size_t,eight_bits);
#line 652 "cwebdir/common.w"
/*:33*//*38:*/
#line 703 "cwebdir/common.w"
-#line 478 "cwebdir/comm-w2c.ch"
+#line 477 "cwebdir/comm-w2c.ch"
extern void init_p(name_pointer,eight_bits);
#line 705 "cwebdir/common.w"
/*:38*//*46:*/
#line 852 "cwebdir/common.w"
-#line 558 "cwebdir/comm-w2c.ch"
+#line 557 "cwebdir/comm-w2c.ch"
extern void init_node(name_pointer);
#line 854 "cwebdir/common.w"
/*:46*//*53:*/
#line 1017 "cwebdir/common.w"
-#line 684 "cwebdir/comm-w2c.ch"
+#line 683 "cwebdir/comm-w2c.ch"
static int section_name_cmp(char**,int,name_pointer);
#line 1019 "cwebdir/common.w"
/*:53*//*57:*/
#line 1092 "cwebdir/common.w"
-#line 726 "cwebdir/comm-w2c.ch"
+#line 725 "cwebdir/comm-w2c.ch"
extern void err_print(const char*);
#line 1094 "cwebdir/common.w"
/*:57*//*60:*/
#line 1140 "cwebdir/common.w"
-#line 753 "cwebdir/comm-w2c.ch"
+#line 752 "cwebdir/comm-w2c.ch"
extern int wrap_up(void);
extern void print_stats(void);
#line 1143 "cwebdir/common.w"
-#line 764 "cwebdir/comm-w2c.ch"
+#line 763 "cwebdir/comm-w2c.ch"
/*:60*//*63:*/
#line 1173 "cwebdir/common.w"
-#line 827 "cwebdir/comm-w2c.ch"
+#line 826 "cwebdir/comm-w2c.ch"
extern void fatal(const char*,const char*);
extern void overflow(const char*);
#line 1175 "cwebdir/common.w"
@@ -405,12 +404,12 @@ extern void overflow(const char*);
/*:63*//*69:*/
#line 1251 "cwebdir/common.w"
-#line 909 "cwebdir/comm-w2c.ch"
+#line 908 "cwebdir/comm-w2c.ch"
static void scan_args(void);
#line 1253 "cwebdir/common.w"
/*:69*//*83:*/
-#line 1158 "cwebdir/comm-w2c.ch"
+#line 1157 "cwebdir/comm-w2c.ch"
boolean get_line(void);
name_pointer id_lookup(const char*,const char*,char);
@@ -423,7 +422,7 @@ void reset_input(void);
void sprint_section_name(char*,name_pointer);
/*:83*//*84:*/
-#line 1171 "cwebdir/comm-w2c.ch"
+#line 1170 "cwebdir/comm-w2c.ch"
static boolean input_ln(FILE*);
static int web_strcmp(char*,int,char*,int);
@@ -433,7 +432,7 @@ static void check_change(void);
static void prime_the_change_buffer(void);
/*:84*//*98:*/
-#line 1415 "cwebdir/comm-w2c.ch"
+#line 1414 "cwebdir/comm-w2c.ch"
static void cb_usage(const_string str);
static void cb_usagehelp(const_string*message,const_string bug_email);
@@ -446,12 +445,12 @@ void cb_show_banner(void);
/*:1*//*4:*/
#line 89 "cwebdir/common.w"
-#line 69 "cwebdir/comm-w2c.ch"
+#line 68 "cwebdir/comm-w2c.ch"
void
common_init(void)
#line 92 "cwebdir/common.w"
{
-#line 78 "cwebdir/comm-w2c.ch"
+#line 77 "cwebdir/comm-w2c.ch"
/*30:*/
#line 621 "cwebdir/common.w"
@@ -470,18 +469,18 @@ for(h= hash;h<=hash_end;*h++= NULL);
root= NULL;
/*:41*/
-#line 78 "cwebdir/comm-w2c.ch"
+#line 77 "cwebdir/comm-w2c.ch"
/*91:*/
-#line 1329 "cwebdir/comm-w2c.ch"
+#line 1328 "cwebdir/comm-w2c.ch"
kpse_set_program_name(argv[0],"cweb");
/*:91*/
-#line 79 "cwebdir/comm-w2c.ch"
+#line 78 "cwebdir/comm-w2c.ch"
/*89:*/
-#line 1280 "cwebdir/comm-w2c.ch"
+#line 1279 "cwebdir/comm-w2c.ch"
setlocale(LC_MESSAGES,setlocale(LC_CTYPE,""));
texmf_locale= kpse_var_expand("${TEXMFLOCALEDIR}");
@@ -497,20 +496,20 @@ textdomain("cweb");
/*:89*/
-#line 80 "cwebdir/comm-w2c.ch"
+#line 79 "cwebdir/comm-w2c.ch"
/*68:*/
#line 1233 "cwebdir/common.w"
-#line 894 "cwebdir/comm-w2c.ch"
+#line 893 "cwebdir/comm-w2c.ch"
temporary_output= 1;
#line 1235 "cwebdir/common.w"
/*:68*/
-#line 81 "cwebdir/comm-w2c.ch"
+#line 80 "cwebdir/comm-w2c.ch"
/*78:*/
-#line 1093 "cwebdir/comm-w2c.ch"
+#line 1092 "cwebdir/comm-w2c.ch"
scan_args();
if(program==ctangle){
@@ -537,7 +536,7 @@ fatal(_("! Cannot open output file "),check_file_name);
#line 1388 "cwebdir/common.w"
/*:78*/
-#line 82 "cwebdir/comm-w2c.ch"
+#line 81 "cwebdir/comm-w2c.ch"
#line 96 "cwebdir/common.w"
}
@@ -545,7 +544,7 @@ fatal(_("! Cannot open output file "),check_file_name);
/*:4*//*9:*/
#line 172 "cwebdir/common.w"
-#line 121 "cwebdir/comm-w2c.ch"
+#line 120 "cwebdir/comm-w2c.ch"
static boolean input_ln(
FILE*fp)
#line 175 "cwebdir/common.w"
@@ -555,12 +554,12 @@ register char*k;
if(feof(fp))return(0);
limit= k= buffer;
while(k<=buffer_end&&(c= getc(fp))!=EOF&&c!='\n')
-#line 128 "cwebdir/comm-w2c.ch"
+#line 127 "cwebdir/comm-w2c.ch"
if((*(k++)= c)!=' '&&c!='\r')limit= k;
#line 182 "cwebdir/common.w"
if(k> buffer_end)
if((c= getc(fp))!=EOF&&c!='\n'){
-#line 134 "cwebdir/comm-w2c.ch"
+#line 133 "cwebdir/comm-w2c.ch"
ungetc(c,fp);loc= buffer;err_print(_("! Input line too long"));
#line 185 "cwebdir/common.w"
@@ -573,7 +572,7 @@ return(1);
/*:9*//*12:*/
#line 251 "cwebdir/common.w"
-#line 160 "cwebdir/comm-w2c.ch"
+#line 159 "cwebdir/comm-w2c.ch"
static void
prime_the_change_buffer(void)
#line 254 "cwebdir/common.w"
@@ -587,13 +586,13 @@ change_line++;
if(!input_ln(change_file))return;
if(limit<buffer+2)continue;
if(buffer[0]!='@')continue;
-#line 167 "cwebdir/comm-w2c.ch"
+#line 166 "cwebdir/comm-w2c.ch"
if(xisupper(buffer[1]))buffer[1]= tolower((eight_bits)buffer[1]);
#line 272 "cwebdir/common.w"
if(buffer[1]=='x')break;
if(buffer[1]=='y'||buffer[1]=='z'||buffer[1]=='i'){
loc= buffer+2;
-#line 173 "cwebdir/comm-w2c.ch"
+#line 172 "cwebdir/comm-w2c.ch"
err_print(_("! Missing @x in change file"));
#line 276 "cwebdir/common.w"
@@ -609,7 +608,7 @@ err_print(_("! Missing @x in change file"));
do{
change_line++;
if(!input_ln(change_file)){
-#line 179 "cwebdir/comm-w2c.ch"
+#line 178 "cwebdir/comm-w2c.ch"
err_print(_("! Change file ended after @x"));
#line 287 "cwebdir/common.w"
@@ -624,7 +623,7 @@ return;
#line 292 "cwebdir/common.w"
{
-#line 186 "cwebdir/comm-w2c.ch"
+#line 185 "cwebdir/comm-w2c.ch"
change_limit= change_buffer+(ptrdiff_t)(limit-buffer);
strncpy(change_buffer,buffer,(size_t)(limit-buffer+1));
#line 296 "cwebdir/common.w"
@@ -638,7 +637,7 @@ strncpy(change_buffer,buffer,(size_t)(limit-buffer+1));
/*:12*//*16:*/
#line 320 "cwebdir/common.w"
-#line 194 "cwebdir/comm-w2c.ch"
+#line 193 "cwebdir/comm-w2c.ch"
static void
check_change(void)
#line 323 "cwebdir/common.w"
@@ -653,7 +652,7 @@ if(!change_pending)changed_section[section_count]= 1;
while(1){
changing= 1;print_where= 1;change_line++;
if(!input_ln(change_file)){
-#line 201 "cwebdir/comm-w2c.ch"
+#line 200 "cwebdir/comm-w2c.ch"
err_print(_("! Change file ended before @y"));
#line 335 "cwebdir/common.w"
@@ -661,14 +660,14 @@ change_limit= change_buffer;changing= 0;
return;
}
if(limit> buffer+1&&buffer[0]=='@'){
-#line 207 "cwebdir/comm-w2c.ch"
+#line 206 "cwebdir/comm-w2c.ch"
char xyz_code= xisupper(buffer[1])?tolower((eight_bits)buffer[1]):buffer[1];
#line 341 "cwebdir/common.w"
/*17:*/
#line 358 "cwebdir/common.w"
if(xyz_code=='x'||xyz_code=='z'){
-#line 219 "cwebdir/comm-w2c.ch"
+#line 218 "cwebdir/comm-w2c.ch"
loc= buffer+2;err_print(_("! Where is the matching @y?"));
#line 361 "cwebdir/common.w"
@@ -677,7 +676,7 @@ else if(xyz_code=='y'){
if(n> 0){
loc= buffer+2;
printf("\n! Hmm... %d ",n);
-#line 225 "cwebdir/comm-w2c.ch"
+#line 224 "cwebdir/comm-w2c.ch"
err_print(_("of the preceding lines failed to match"));
#line 368 "cwebdir/common.w"
@@ -694,7 +693,7 @@ return;
#line 292 "cwebdir/common.w"
{
-#line 186 "cwebdir/comm-w2c.ch"
+#line 185 "cwebdir/comm-w2c.ch"
change_limit= change_buffer+(ptrdiff_t)(limit-buffer);
strncpy(change_buffer,buffer,(size_t)(limit-buffer+1));
#line 296 "cwebdir/common.w"
@@ -706,7 +705,7 @@ strncpy(change_buffer,buffer,(size_t)(limit-buffer+1));
changing= 0;cur_line++;
while(!input_ln(cur_file)){
if(include_depth==0){
-#line 213 "cwebdir/comm-w2c.ch"
+#line 212 "cwebdir/comm-w2c.ch"
err_print(_("! CWEB file ended during a change"));
#line 349 "cwebdir/common.w"
@@ -721,7 +720,7 @@ if(lines_dont_match)n++;
/*:16*//*18:*/
#line 378 "cwebdir/common.w"
-#line 232 "cwebdir/comm-w2c.ch"
+#line 231 "cwebdir/comm-w2c.ch"
void
reset_input(void)
#line 381 "cwebdir/common.w"
@@ -730,7 +729,7 @@ limit= buffer;loc= buffer+1;buffer[0]= ' ';
/*19:*/
#line 393 "cwebdir/common.w"
-#line 243 "cwebdir/comm-w2c.ch"
+#line 242 "cwebdir/comm-w2c.ch"
if((found_filename= kpse_find_cweb(web_file_name))==NULL||
(web_file= fopen(found_filename,"r"))==NULL){
fatal(_("! Cannot open input file "),web_file_name);
@@ -745,7 +744,7 @@ free(found_filename);
web_file_open= 1;
-#line 259 "cwebdir/comm-w2c.ch"
+#line 258 "cwebdir/comm-w2c.ch"
if((found_filename= kpse_find_cweb(change_file_name))==NULL||
(change_file= fopen(found_filename,"r"))==NULL){
fatal(_("! Cannot open change file "),change_file_name);
@@ -770,7 +769,7 @@ limit= buffer;loc= buffer+1;buffer[0]= ' ';input_has_ended= 0;
/*:18*//*21:*/
#line 426 "cwebdir/common.w"
-#line 287 "cwebdir/comm-w2c.ch"
+#line 286 "cwebdir/comm-w2c.ch"
boolean get_line(void)
#line 428 "cwebdir/common.w"
{
@@ -781,7 +780,7 @@ if(changing&&include_depth==change_depth)
{
change_line++;
if(!input_ln(change_file)){
-#line 386 "cwebdir/comm-w2c.ch"
+#line 385 "cwebdir/comm-w2c.ch"
err_print(_("! Change file ended without @z"));
#line 541 "cwebdir/common.w"
@@ -796,12 +795,12 @@ changed_section[section_count]= 1;change_pending= 0;
}
*limit= ' ';
if(buffer[0]=='@'){
-#line 392 "cwebdir/comm-w2c.ch"
+#line 391 "cwebdir/comm-w2c.ch"
if(xisupper(buffer[1]))buffer[1]= tolower((eight_bits)buffer[1]);
#line 554 "cwebdir/common.w"
if(buffer[1]=='x'||buffer[1]=='y'){
loc= buffer+2;
-#line 398 "cwebdir/comm-w2c.ch"
+#line 397 "cwebdir/comm-w2c.ch"
err_print(_("! Where is the matching @z?"));
#line 557 "cwebdir/common.w"
@@ -847,14 +846,14 @@ if(buffer[0]=='@'&&(buffer[1]=='i'||buffer[1]=='I')){
loc= buffer+2;*limit= '"';
while(*loc==' '||*loc=='\t')loc++;
if(loc>=limit){
-#line 293 "cwebdir/comm-w2c.ch"
+#line 292 "cwebdir/comm-w2c.ch"
err_print(_("! Include file name not given"));
#line 443 "cwebdir/common.w"
goto restart;
}
if(include_depth>=max_include_depth-1){
-#line 299 "cwebdir/comm-w2c.ch"
+#line 298 "cwebdir/comm-w2c.ch"
err_print(_("! Too many nested includes"));
#line 448 "cwebdir/common.w"
@@ -864,7 +863,7 @@ include_depth++;
/*23:*/
#line 474 "cwebdir/common.w"
{
-#line 335 "cwebdir/comm-w2c.ch"
+#line 334 "cwebdir/comm-w2c.ch"
char*cur_file_name_end= cur_file_name+max_file_name_length-1;
char*k= cur_file_name;
#line 479 "cwebdir/common.w"
@@ -878,7 +877,7 @@ while(*loc!=' '&&*loc!='\t'&&*loc!='"'&&k<=cur_file_name_end)*k++= *loc++;
if(k> cur_file_name_end)too_long();
*k= '\0';
-#line 342 "cwebdir/comm-w2c.ch"
+#line 341 "cwebdir/comm-w2c.ch"
if((found_filename= kpse_find_cweb(cur_file_name))!=NULL&&
(cur_file= fopen(found_filename,"r"))!=NULL){
@@ -892,7 +891,7 @@ free(found_filename);
cur_line= 0;print_where= 1;
goto restart;
}
-#line 380 "cwebdir/comm-w2c.ch"
+#line 379 "cwebdir/comm-w2c.ch"
include_depth--;err_print(_("! Cannot open include file"));goto restart;
#line 518 "cwebdir/common.w"
}
@@ -904,11 +903,11 @@ include_depth--;err_print(_("! Cannot open include file"));goto restart;
return 1;
}
-#line 314 "cwebdir/comm-w2c.ch"
+#line 313 "cwebdir/comm-w2c.ch"
/*:21*//*26:*/
#line 569 "cwebdir/common.w"
-#line 408 "cwebdir/comm-w2c.ch"
+#line 407 "cwebdir/comm-w2c.ch"
void
check_complete(void){
if(change_limit!=change_buffer){
@@ -916,7 +915,7 @@ strncpy(buffer,change_buffer,(size_t)(change_limit-change_buffer+1));
limit= buffer+(ptrdiff_t)(change_limit-change_buffer);
#line 575 "cwebdir/common.w"
changing= 1;change_depth= include_depth;loc= buffer;
-#line 418 "cwebdir/comm-w2c.ch"
+#line 417 "cwebdir/comm-w2c.ch"
err_print(_("! Change file entry did not match"));
#line 577 "cwebdir/common.w"
@@ -926,7 +925,7 @@ err_print(_("! Change file entry did not match"));
/*:26*//*35:*/
#line 660 "cwebdir/common.w"
-#line 460 "cwebdir/comm-w2c.ch"
+#line 459 "cwebdir/comm-w2c.ch"
name_pointer
id_lookup(
const char*first,
@@ -939,7 +938,7 @@ int h;
int l;
name_pointer p;
if(last==NULL)for(last= first;*last!='\0';last++);
-#line 472 "cwebdir/comm-w2c.ch"
+#line 471 "cwebdir/comm-w2c.ch"
l= (int)(last-first);
#line 673 "cwebdir/common.w"
/*36:*/
@@ -968,13 +967,13 @@ p->link= hash[h];hash[h]= p;
if(p==name_ptr)/*39:*/
#line 706 "cwebdir/common.w"
{
-#line 485 "cwebdir/comm-w2c.ch"
+#line 484 "cwebdir/comm-w2c.ch"
if(byte_ptr+l> byte_mem_end)overflow(_("byte memory"));
if(name_ptr>=name_dir_end)overflow(_("name"));
#line 709 "cwebdir/common.w"
strncpy(byte_ptr,first,l);
(++name_ptr)->byte_start= byte_ptr+= l;
-#line 492 "cwebdir/comm-w2c.ch"
+#line 491 "cwebdir/comm-w2c.ch"
init_p(p,t);
#line 712 "cwebdir/common.w"
}
@@ -988,7 +987,7 @@ return(p);
/*:35*//*42:*/
#line 764 "cwebdir/common.w"
-#line 500 "cwebdir/comm-w2c.ch"
+#line 499 "cwebdir/comm-w2c.ch"
void
print_section_name(
name_pointer p)
@@ -999,7 +998,7 @@ name_pointer q= p+1;
while(p!=name_dir){
ss= (p+1)->byte_start-1;
if(*ss==' '&&ss>=s){
-#line 510 "cwebdir/comm-w2c.ch"
+#line 509 "cwebdir/comm-w2c.ch"
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;
@@ -1013,7 +1012,7 @@ if(q)term_write("...",3);
/*:42*//*43:*/
#line 783 "cwebdir/common.w"
-#line 521 "cwebdir/comm-w2c.ch"
+#line 520 "cwebdir/comm-w2c.ch"
void
sprint_section_name(
char*dest,
@@ -1029,7 +1028,7 @@ p= q->link;q= p;
}else{
ss++;p= name_dir;
}
-#line 530 "cwebdir/comm-w2c.ch"
+#line 529 "cwebdir/comm-w2c.ch"
strncpy(dest,s,(size_t)(ss-s)),dest+= ss-s;
#line 799 "cwebdir/common.w"
s= p->byte_start;
@@ -1040,7 +1039,7 @@ s= p->byte_start;
/*:43*//*44:*/
#line 804 "cwebdir/common.w"
-#line 538 "cwebdir/comm-w2c.ch"
+#line 537 "cwebdir/comm-w2c.ch"
void
print_prefix_name(
name_pointer p)
@@ -1055,7 +1054,7 @@ if(s+l<(p+1)->byte_start)term_write("...",3);
/*:44*//*45:*/
#line 825 "cwebdir/common.w"
-#line 548 "cwebdir/comm-w2c.ch"
+#line 547 "cwebdir/comm-w2c.ch"
static int web_strcmp(
char*j,
int j_len,
@@ -1075,7 +1074,7 @@ else return greater;
/*:45*//*47:*/
#line 855 "cwebdir/common.w"
-#line 570 "cwebdir/comm-w2c.ch"
+#line 569 "cwebdir/comm-w2c.ch"
static name_pointer
add_section_name(
name_pointer par,
@@ -1087,9 +1086,9 @@ int ispref)
{
name_pointer p= name_ptr;
char*s= first_chunk(p);
-#line 582 "cwebdir/comm-w2c.ch"
+#line 581 "cwebdir/comm-w2c.ch"
int name_len= (int)(last-first)+ispref;
-#line 589 "cwebdir/comm-w2c.ch"
+#line 588 "cwebdir/comm-w2c.ch"
if(s+name_len> byte_mem_end)overflow(_("byte memory"));
if(name_ptr+1>=name_dir_end)overflow(_("name"));
#line 869 "cwebdir/common.w"
@@ -1111,7 +1110,7 @@ return par==NULL?(root= p):c==less?(par->llink= p):(par->rlink= p);
/*:47*//*48:*/
#line 884 "cwebdir/common.w"
-#line 601 "cwebdir/comm-w2c.ch"
+#line 600 "cwebdir/comm-w2c.ch"
static void
extend_section_name(
name_pointer p,
@@ -1122,16 +1121,16 @@ int ispref)
{
char*s;
name_pointer q= p+1;
-#line 612 "cwebdir/comm-w2c.ch"
+#line 611 "cwebdir/comm-w2c.ch"
int name_len= (int)(last-first)+ispref;
-#line 618 "cwebdir/comm-w2c.ch"
+#line 617 "cwebdir/comm-w2c.ch"
if(name_ptr>=name_dir_end)overflow(_("name"));
#line 896 "cwebdir/common.w"
while(q->link!=name_dir)q= q->link;
q->link= name_ptr;
s= name_ptr->byte_start;
name_ptr->link= name_dir;
-#line 624 "cwebdir/comm-w2c.ch"
+#line 623 "cwebdir/comm-w2c.ch"
if(s+name_len> byte_mem_end)overflow(_("byte memory"));
#line 901 "cwebdir/common.w"
(++name_ptr)->byte_start= byte_ptr= s+name_len;
@@ -1142,7 +1141,7 @@ if(ispref)*(byte_ptr-1)= ' ';
/*:48*//*49:*/
#line 912 "cwebdir/common.w"
-#line 633 "cwebdir/comm-w2c.ch"
+#line 632 "cwebdir/comm-w2c.ch"
name_pointer
section_lookup(
char*first,char*last,
@@ -1155,7 +1154,7 @@ name_pointer q= NULL;
name_pointer r= NULL;
name_pointer par= NULL;
-#line 642 "cwebdir/comm-w2c.ch"
+#line 641 "cwebdir/comm-w2c.ch"
int name_len= (int)(last-first)+1;
#line 925 "cwebdir/common.w"
/*50:*/
@@ -1169,12 +1168,12 @@ par= p;
p= (c==less?p->llink:p->rlink);
}else{
if(r!=NULL){
-#line 648 "cwebdir/comm-w2c.ch"
+#line 647 "cwebdir/comm-w2c.ch"
fputs(_("\n! Ambiguous prefix: matches <"),stdout);
#line 946 "cwebdir/common.w"
print_prefix_name(p);
-#line 654 "cwebdir/comm-w2c.ch"
+#line 653 "cwebdir/comm-w2c.ch"
fputs(_(">\n and <"),stdout);
#line 949 "cwebdir/common.w"
print_prefix_name(r);
@@ -1208,7 +1207,7 @@ switch(section_name_cmp(&first,name_len,r)){
case prefix:
if(!ispref){
-#line 660 "cwebdir/comm-w2c.ch"
+#line 659 "cwebdir/comm-w2c.ch"
fputs(_("\n! New name is a prefix of <"),stdout);
#line 975 "cwebdir/common.w"
@@ -1222,7 +1221,7 @@ case extension:if(!ispref||first<=last)
extend_section_name(r,first,last+1,ispref);
return r;
case bad_extension:
-#line 666 "cwebdir/comm-w2c.ch"
+#line 665 "cwebdir/comm-w2c.ch"
fputs(_("\n! New name extends <"),stdout);
#line 987 "cwebdir/common.w"
@@ -1230,12 +1229,12 @@ print_section_name(r);
err_print(">");
return r;
default:
-#line 672 "cwebdir/comm-w2c.ch"
+#line 671 "cwebdir/comm-w2c.ch"
fputs(_("\n! Section name incompatible with <"),stdout);
#line 993 "cwebdir/common.w"
print_prefix_name(r);
-#line 678 "cwebdir/comm-w2c.ch"
+#line 677 "cwebdir/comm-w2c.ch"
fputs(_(">,\n which abbreviates <"),stdout);
#line 996 "cwebdir/common.w"
print_section_name(r);
@@ -1251,7 +1250,7 @@ return r;
/*:49*//*54:*/
#line 1020 "cwebdir/common.w"
-#line 693 "cwebdir/comm-w2c.ch"
+#line 692 "cwebdir/comm-w2c.ch"
static int section_name_cmp(
char**pfirst,
int len,
@@ -1270,7 +1269,7 @@ else ispref= 0,ss++,q= name_dir;
switch(c= web_strcmp(first,len,s,ss-s)){
case equal:if(q==name_dir)
if(ispref){
-#line 702 "cwebdir/comm-w2c.ch"
+#line 701 "cwebdir/comm-w2c.ch"
*pfirst= first+(ptrdiff_t)(ss-s);
#line 1039 "cwebdir/common.w"
return extension;
@@ -1279,7 +1278,7 @@ else return(q->byte_start==(q+1)->byte_start)?equal:prefix;
case extension:
if(!ispref)return bad_extension;
first+= ss-s;
-#line 708 "cwebdir/comm-w2c.ch"
+#line 707 "cwebdir/comm-w2c.ch"
if(q!=name_dir){len-= (int)(ss-s);s= q->byte_start;r= q;continue;}
#line 1046 "cwebdir/common.w"
*pfirst= first;return extension;
@@ -1291,7 +1290,7 @@ default:return c;
/*:54*//*58:*/
#line 1095 "cwebdir/common.w"
-#line 734 "cwebdir/comm-w2c.ch"
+#line 733 "cwebdir/comm-w2c.ch"
void
err_print(
const char*s)
@@ -1303,7 +1302,7 @@ if(web_file_open)/*59:*/
#line 1115 "cwebdir/common.w"
{if(changing&&include_depth==change_depth)
-#line 744 "cwebdir/comm-w2c.ch"
+#line 743 "cwebdir/comm-w2c.ch"
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);
@@ -1330,18 +1329,18 @@ update_terminal;mark_error;
/*:58*//*61:*/
#line 1150 "cwebdir/common.w"
-#line 783 "cwebdir/comm-w2c.ch"
+#line 782 "cwebdir/comm-w2c.ch"
int wrap_up(void){
if(show_progress)new_line;
#line 1153 "cwebdir/common.w"
if(show_stats)
print_stats();
-#line 790 "cwebdir/comm-w2c.ch"
+#line 789 "cwebdir/comm-w2c.ch"
/*62:*/
#line 1160 "cwebdir/common.w"
switch(history){
-#line 814 "cwebdir/comm-w2c.ch"
+#line 813 "cwebdir/comm-w2c.ch"
case spotless:
if(show_happiness)puts(_("(No errors were found.)"));break;
case harmless_message:
@@ -1354,10 +1353,10 @@ puts(_("(That was a fatal error, my friend.)"));
}
/*:62*/
-#line 790 "cwebdir/comm-w2c.ch"
+#line 789 "cwebdir/comm-w2c.ch"
/*87:*/
-#line 1209 "cwebdir/comm-w2c.ch"
+#line 1208 "cwebdir/comm-w2c.ch"
if(C_file)fclose(C_file);
if(tex_file)fclose(tex_file);
@@ -1366,9 +1365,9 @@ if(strlen(check_file_name))
remove(check_file_name);
/*:87*/
-#line 791 "cwebdir/comm-w2c.ch"
+#line 790 "cwebdir/comm-w2c.ch"
-#line 798 "cwebdir/comm-w2c.ch"
+#line 797 "cwebdir/comm-w2c.ch"
switch(history){
case harmless_message:return RETURN_WARN;
case error_message:return RETURN_ERROR;
@@ -1379,13 +1378,13 @@ default:return RETURN_OK;
}
/*:61*//*64:*/
-#line 836 "cwebdir/comm-w2c.ch"
+#line 835 "cwebdir/comm-w2c.ch"
void
fatal(
const char*s,const char*t)
#line 1182 "cwebdir/common.w"
{
-#line 844 "cwebdir/comm-w2c.ch"
+#line 843 "cwebdir/comm-w2c.ch"
if(*s)fputs(s,stdout);
#line 1184 "cwebdir/common.w"
err_print(t);
@@ -1393,13 +1392,13 @@ history= fatal_message;exit(wrap_up());
}
/*:64*//*65:*/
-#line 852 "cwebdir/comm-w2c.ch"
+#line 851 "cwebdir/comm-w2c.ch"
void
overflow(
const char*t)
#line 1193 "cwebdir/common.w"
{
-#line 860 "cwebdir/comm-w2c.ch"
+#line 859 "cwebdir/comm-w2c.ch"
printf(_("\n! Sorry, %s capacity exceeded"),t);fatal("","");
#line 1195 "cwebdir/common.w"
}
@@ -1408,7 +1407,7 @@ printf(_("\n! Sorry, %s capacity exceeded"),t);fatal("","");
/*:65*//*70:*/
#line 1254 "cwebdir/common.w"
-#line 916 "cwebdir/comm-w2c.ch"
+#line 915 "cwebdir/comm-w2c.ch"
static void
scan_args(void)
#line 1257 "cwebdir/common.w"
@@ -1420,7 +1419,7 @@ boolean found_web= 0,found_change= 0,found_out= 0;
#line 1264 "cwebdir/common.w"
-#line 928 "cwebdir/comm-w2c.ch"
+#line 927 "cwebdir/comm-w2c.ch"
#if defined DEV_NULL
strncpy(change_file_name,DEV_NULL,max_file_name_length-2);
@@ -1435,25 +1434,25 @@ strcpy(change_file_name,"/dev/null");
while(--argc> 0){
#line 1266 "cwebdir/common.w"
if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*74:*/
-#line 1006 "cwebdir/comm-w2c.ch"
+#line 1005 "cwebdir/comm-w2c.ch"
{
if(strcmp("-help",*argv)==0||strcmp("--help",*argv)==0)
/*94:*/
-#line 1354 "cwebdir/comm-w2c.ch"
+#line 1353 "cwebdir/comm-w2c.ch"
cb_usagehelp(program==ctangle?CTANGLEHELP:
program==cweave?CWEAVEHELP:CTWILLHELP,NULL);
/*:94*/
-#line 1010 "cwebdir/comm-w2c.ch"
+#line 1009 "cwebdir/comm-w2c.ch"
if(strcmp("-version",*argv)==0||strcmp("--version",*argv)==0)
/*96:*/
-#line 1396 "cwebdir/comm-w2c.ch"
+#line 1395 "cwebdir/comm-w2c.ch"
printversionandexit(cb_banner,
program==ctwill?"Donald E. Knuth":"Silvio Levy and Donald E. Knuth",
@@ -1461,7 +1460,7 @@ NULL,"Contemporary development on https://github.com/ascherer/cwebbin.\n");
/*:96*/
-#line 1013 "cwebdir/comm-w2c.ch"
+#line 1012 "cwebdir/comm-w2c.ch"
if(strcmp("-verbose",*argv)==0||strcmp("--verbose",*argv)==0)
@@ -1480,14 +1479,14 @@ if(*dot_pos=='d'){
if(sscanf(++dot_pos,"%u",&kpathsea_debug)!=1)/*75:*/
#line 1352 "cwebdir/common.w"
-#line 1056 "cwebdir/comm-w2c.ch"
+#line 1055 "cwebdir/comm-w2c.ch"
cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
#line 1363 "cwebdir/common.w"
-#line 1063 "cwebdir/comm-w2c.ch"
+#line 1062 "cwebdir/comm-w2c.ch"
/*:75*/
-#line 1028 "cwebdir/comm-w2c.ch"
+#line 1027 "cwebdir/comm-w2c.ch"
while(isdigit(*dot_pos))dot_pos++;
dot_pos--;
@@ -1496,7 +1495,7 @@ if(*dot_pos=='l'){
use_language= ++dot_pos;
break;
}else
-#line 1041 "cwebdir/comm-w2c.ch"
+#line 1040 "cwebdir/comm-w2c.ch"
flags[(eight_bits)*dot_pos]= flag_change;
#line 1350 "cwebdir/common.w"
}
@@ -1506,7 +1505,7 @@ break;
else{
s= name_pos= *argv;dot_pos= NULL;
-#line 949 "cwebdir/comm-w2c.ch"
+#line 948 "cwebdir/comm-w2c.ch"
while(*s){
if(*s=='.')dot_pos= s++;
else if(*s==DIR_SEPARATOR||*s==DEVICE_SEPARATOR||*s=='/')
@@ -1521,7 +1520,7 @@ if(!found_web)/*71:*/
{
if(s-*argv> max_file_name_length-5)
/*76:*/
-#line 1063 "cwebdir/comm-w2c.ch"
+#line 1062 "cwebdir/comm-w2c.ch"
fatal(_("! Filename too long\n"),*argv);
#line 1365 "cwebdir/common.w"
@@ -1550,12 +1549,12 @@ else if(!found_change)/*72:*/
#line 1310 "cwebdir/common.w"
{
-#line 981 "cwebdir/comm-w2c.ch"
+#line 980 "cwebdir/comm-w2c.ch"
if(strcmp(*argv,"-")!=0){
#line 1314 "cwebdir/common.w"
if(s-*argv> max_file_name_length-4)
/*76:*/
-#line 1063 "cwebdir/comm-w2c.ch"
+#line 1062 "cwebdir/comm-w2c.ch"
fatal(_("! Filename too long\n"),*argv);
#line 1365 "cwebdir/common.w"
@@ -1566,7 +1565,7 @@ fatal(_("! Filename too long\n"),*argv);
if(dot_pos==NULL)
sprintf(change_file_name,"%s.ch",*argv);
else strcpy(change_file_name,*argv);
-#line 988 "cwebdir/comm-w2c.ch"
+#line 987 "cwebdir/comm-w2c.ch"
}
found_change= 1;
#line 1321 "cwebdir/common.w"
@@ -1581,7 +1580,7 @@ else if(!found_out)/*73:*/
{
if(s-*argv> max_file_name_length-5)
/*76:*/
-#line 1063 "cwebdir/comm-w2c.ch"
+#line 1062 "cwebdir/comm-w2c.ch"
fatal(_("! Filename too long\n"),*argv);
#line 1365 "cwebdir/common.w"
@@ -1597,7 +1596,7 @@ sprintf(C_file_name,"%s.c",*argv);
}else{
strcpy(tex_file_name,*argv);
strcpy(C_file_name,*argv);
-#line 995 "cwebdir/comm-w2c.ch"
+#line 994 "cwebdir/comm-w2c.ch"
if(make_xrefs){
#line 1336 "cwebdir/common.w"
*dot_pos= 0;
@@ -1608,19 +1607,19 @@ sprintf(scn_file_name,"%s.scn",*argv);
found_out= 1;
}
-#line 1005 "cwebdir/comm-w2c.ch"
+#line 1004 "cwebdir/comm-w2c.ch"
/*:73*/
#line 1277 "cwebdir/common.w"
else/*75:*/
#line 1352 "cwebdir/common.w"
-#line 1056 "cwebdir/comm-w2c.ch"
+#line 1055 "cwebdir/comm-w2c.ch"
cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
#line 1363 "cwebdir/common.w"
-#line 1063 "cwebdir/comm-w2c.ch"
+#line 1062 "cwebdir/comm-w2c.ch"
/*:75*/
#line 1278 "cwebdir/common.w"
;
@@ -1629,21 +1628,21 @@ else/*75:*/
if(!found_web)/*75:*/
#line 1352 "cwebdir/common.w"
-#line 1056 "cwebdir/comm-w2c.ch"
+#line 1055 "cwebdir/comm-w2c.ch"
cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
#line 1363 "cwebdir/common.w"
-#line 1063 "cwebdir/comm-w2c.ch"
+#line 1062 "cwebdir/comm-w2c.ch"
/*:75*/
#line 1281 "cwebdir/common.w"
;
#line 1283 "cwebdir/common.w"
}
-#line 968 "cwebdir/comm-w2c.ch"
+#line 967 "cwebdir/comm-w2c.ch"
/*:70*//*95:*/
-#line 1362 "cwebdir/comm-w2c.ch"
+#line 1361 "cwebdir/comm-w2c.ch"
static void cb_usage(const_string str)
{
@@ -1676,7 +1675,7 @@ history= spotless;exit(wrap_up());
}
/*:95*//*97:*/
-#line 1404 "cwebdir/comm-w2c.ch"
+#line 1403 "cwebdir/comm-w2c.ch"
void cb_show_banner(void)
{