summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/cwebboot.cin
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2021-02-19 12:34:28 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2021-02-19 12:34:28 +0000
commit301b1d4268858508a0a144e685087f125aab5dc5 (patch)
tree82d3968b38d76fc1e97207ddf255ee199f5f7246 /Build/source/texk/web2c/cwebboot.cin
parent6a10f6706019d969e3de5568e6016a2c98f014d0 (diff)
[CWEB] Replace 'boolean' values upstream.
git-svn-id: svn://tug.org/texlive/trunk@57795 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/cwebboot.cin')
-rw-r--r--Build/source/texk/web2c/cwebboot.cin83
1 files changed, 41 insertions, 42 deletions
diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin
index 0b8baa2bd79..14f5d558fd0 100644
--- a/Build/source/texk/web2c/cwebboot.cin
+++ b/Build/source/texk/web2c/cwebboot.cin
@@ -82,8 +82,7 @@ typedef bool boolean;
#define llink link
#define rlink dummy.Rlink
#define root name_dir->rlink \
-
-#define chunk_marker 0 \
+ \
#define spotless 0
#define harmless_message 1
@@ -203,7 +202,7 @@ extern char*loc;
extern char*limit;
/*:5*//*6:*/
-#line 120 "cwebdir/comm-w2c.h"
+#line 119 "cwebdir/comm-w2c.h"
typedef struct name_info{
char*byte_start;
@@ -228,12 +227,12 @@ extern hash_pointer hash_end;
extern hash_pointer h;
/*:6*//*8:*/
-#line 164 "cwebdir/comm-w2c.h"
+#line 163 "cwebdir/comm-w2c.h"
extern int history;
/*:8*//*10:*/
-#line 184 "cwebdir/comm-w2c.h"
+#line 183 "cwebdir/comm-w2c.h"
extern int include_depth;
extern FILE*file[];
@@ -254,7 +253,7 @@ extern boolean changing;
extern boolean web_file_open;
/*:10*//*12:*/
-#line 209 "cwebdir/comm-w2c.h"
+#line 208 "cwebdir/comm-w2c.h"
extern sixteen_bits section_count;
extern boolean changed_section[];
@@ -262,7 +261,7 @@ extern boolean change_pending;
extern boolean print_where;
/*:12*//*13:*/
-#line 223 "cwebdir/comm-w2c.h"
+#line 222 "cwebdir/comm-w2c.h"
extern int argc;
extern char**argv;
@@ -270,7 +269,7 @@ extern boolean flags[];
extern const char*use_language;
/*:13*//*14:*/
-#line 236 "cwebdir/comm-w2c.h"
+#line 235 "cwebdir/comm-w2c.h"
extern FILE*C_file;
extern FILE*tex_file;
@@ -324,7 +323,7 @@ int change_line;
int change_depth;
boolean input_has_ended;
boolean changing;
-boolean web_file_open= 0;
+boolean web_file_open= false;
/*:25*//*26:*/
#line 220 "cwebdir/common.w"
@@ -339,7 +338,7 @@ sixteen_bits section_count;
boolean changed_section[max_sections];
boolean change_pending;
-boolean print_where= 0;
+boolean print_where= false;
/*:37*//*43:*/
#line 598 "cwebdir/common.w"
@@ -416,7 +415,7 @@ char separators[]= SEPARATORS;
#line 70 "cwebdir/common.w"
/*7:*/
-#line 143 "cwebdir/comm-w2c.h"
+#line 142 "cwebdir/comm-w2c.h"
extern boolean names_match(name_pointer,const char*,size_t,eight_bits);
extern name_pointer id_lookup(const char*,const char*,char);
@@ -429,7 +428,7 @@ extern void print_section_name(name_pointer);
extern void sprint_section_name(char*,name_pointer);
/*:7*//*9:*/
-#line 167 "cwebdir/comm-w2c.h"
+#line 166 "cwebdir/comm-w2c.h"
extern int wrap_up(void);
extern void err_print(const char*);
@@ -437,14 +436,14 @@ extern void fatal(const char*,const char*);
extern void overflow(const char*);
/*:9*//*11:*/
-#line 203 "cwebdir/comm-w2c.h"
+#line 202 "cwebdir/comm-w2c.h"
extern boolean get_line(void);
extern void check_complete(void);
extern void reset_input(void);
/*:11*//*15:*/
-#line 245 "cwebdir/comm-w2c.h"
+#line 244 "cwebdir/comm-w2c.h"
extern void common_init(void);
extern void print_stats(void);
@@ -604,7 +603,7 @@ FILE*fp)
{
register int c= EOF;
register char*k;
-if(feof(fp))return(0);
+if(feof(fp))return(false);
limit= k= buffer;
while(k<=buffer_end&&(c= getc(fp))!=EOF&&c!='\n')
#line 92 "cwebdir/comm-w2c.ch"
@@ -617,9 +616,9 @@ ungetc(c,fp);loc= buffer;err_print(_("! Input line too long"));
#line 175 "cwebdir/common.w"
}
-if(c==EOF&&limit==buffer)return(0);
+if(c==EOF&&limit==buffer)return(false);
-return(1);
+return(true);
}
/*:24*//*28:*/
@@ -632,7 +631,7 @@ change_limit= change_buffer;
/*29:*/
#line 248 "cwebdir/common.w"
-while(1){
+while(true){
change_line++;
if(!input_ln(change_file))return;
if(limit<buffer+2)continue;
@@ -689,19 +688,19 @@ check_change(void)
{
int n= 0;
if(lines_dont_match)return;
-change_pending= 0;
+change_pending= false;
if(!changed_section[section_count]){
-if_section_start_make_pending(1);
-if(!change_pending)changed_section[section_count]= 1;
+if_section_start_make_pending(true);
+if(!change_pending)changed_section[section_count]= true;
}
-while(1){
-changing= 1;print_where= 1;change_line++;
+while(true){
+changing= true;print_where= true;change_line++;
if(!input_ln(change_file)){
#line 121 "cwebdir/comm-w2c.ch"
err_print(_("! Change file ended before @y"));
#line 321 "cwebdir/common.w"
-change_limit= change_buffer;changing= 0;
+change_limit= change_buffer;changing= false;
return;
}
if(limit> buffer+1&&buffer[0]=='@'){
@@ -743,14 +742,14 @@ strncpy(change_buffer,buffer,(size_t)(limit-buffer+1));
/*:31*/
#line 330 "cwebdir/common.w"
-changing= 0;cur_line++;
+changing= false;cur_line++;
while(!input_ln(cur_file)){
if(include_depth==0){
#line 127 "cwebdir/comm-w2c.ch"
err_print(_("! CWEB file ended during a change"));
#line 335 "cwebdir/common.w"
-input_has_ended= 1;return;
+input_has_ended= true;return;
}
include_depth--;cur_line++;
}
@@ -782,7 +781,7 @@ free(found_filename);
#line 385 "cwebdir/common.w"
-web_file_open= 1;
+web_file_open= true;
#line 165 "cwebdir/comm-w2c.ch"
if((found_filename= kpse_find_cweb(change_file_name))==NULL||
(change_file= fopen(found_filename,"r"))==NULL){
@@ -802,7 +801,7 @@ free(found_filename);
include_depth= 0;cur_line= 0;change_line= 0;
change_depth= include_depth;
changing= 1;prime_the_change_buffer();changing= !changing;
-limit= buffer;loc= buffer+1;buffer[0]= ' ';input_has_ended= 0;
+limit= buffer;loc= buffer+1;buffer[0]= ' ';input_has_ended= false;
}
/*:35*//*38:*/
@@ -825,9 +824,9 @@ buffer[0]= '@';buffer[1]= 'z';limit= buffer+2;
}
if(limit> buffer){
if(change_pending){
-if_section_start_make_pending(0);
+if_section_start_make_pending(false);
if(change_pending){
-changed_section[section_count]= 1;change_pending= 0;
+changed_section[section_count]= true;change_pending= false;
}
}
*limit= ' ';
@@ -841,7 +840,7 @@ err_print(_("! Where is the matching @z?"));
}
else if(buffer[1]=='z'){
-prime_the_change_buffer();changing= !changing;print_where= 1;
+prime_the_change_buffer();changing= !changing;print_where= true;
}
}
}
@@ -856,8 +855,8 @@ if(!changing||include_depth> change_depth){
{
cur_line++;
while(!input_ln(cur_file)){
-print_where= 1;
-if(include_depth==0){input_has_ended= 1;break;}
+print_where= true;
+if(include_depth==0){input_has_ended= true;break;}
else{
fclose(cur_file);include_depth--;
if(changing&&include_depth==change_depth)break;
@@ -875,7 +874,7 @@ if(change_limit> change_buffer)check_change();
if(changing&&include_depth==change_depth)goto restart;
}
-if(input_has_ended)return 0;
+if(input_has_ended)return false;
loc= buffer;*limit= ' ';
if(buffer[0]=='@'&&(buffer[1]=='i'||buffer[1]=='I')){
loc= buffer+2;*limit= '"';
@@ -923,7 +922,7 @@ strcpy(cur_file_name,found_filename+
free(found_filename);
}else fatal(_("! Filename too long\n"),found_filename);
#line 469 "cwebdir/common.w"
-cur_line= 0;print_where= 1;
+cur_line= 0;print_where= true;
goto restart;
}
#line 268 "cwebdir/comm-w2c.ch"
@@ -935,7 +934,7 @@ include_depth--;err_print(_("! Cannot open include file"));goto restart;
#line 434 "cwebdir/common.w"
}
-return 1;
+return true;
}
#line 201 "cwebdir/comm-w2c.ch"
@@ -947,7 +946,7 @@ check_complete(void){
if(change_limit!=change_buffer){
strncpy(buffer,change_buffer,(size_t)(change_limit-change_buffer+1));
limit= buffer+(ptrdiff_t)(change_limit-change_buffer);
-changing= 1;change_depth= include_depth;loc= buffer;
+changing= true;change_depth= include_depth;loc= buffer;
#line 286 "cwebdir/comm-w2c.ch"
err_print(_("! Change file entry did not match"));
#line 556 "cwebdir/common.w"
@@ -1265,7 +1264,7 @@ name_pointer q= r+1;
char*ss,*s= first_chunk(r);
int c;
int ispref;
-while(1){
+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;
@@ -1404,7 +1403,7 @@ scan_args(void)
char*dot_pos;
char*name_pos;
register char*s;
-boolean found_web= 0,found_change= 0,found_out= 0;
+boolean found_web= false,found_change= false,found_out= false;
#line 462 "cwebdir/comm-w2c.ch"
@@ -1526,7 +1525,7 @@ sprintf(tex_file_name,"%s.tex",name_pos);
sprintf(idx_file_name,"%s.idx",name_pos);
sprintf(scn_file_name,"%s.scn",name_pos);
sprintf(C_file_name,"%s.c",name_pos);
-found_web= 1;
+found_web= true;
}
/*:77*/
@@ -1551,7 +1550,7 @@ if(dot_pos==NULL)
sprintf(change_file_name,"%s.ch",*argv);
else strcpy(change_file_name,*argv);
}
-found_change= 1;
+found_change= true;
}
/*:78*/
@@ -1585,7 +1584,7 @@ sprintf(idx_file_name,"%s.idx",*argv);
sprintf(scn_file_name,"%s.scn",*argv);
}
}
-found_out= 1;
+found_out= true;
}
/*:79*/