From 21789d78376b470876b5e1f80a10fb5c7c653b37 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Mon, 8 Feb 2021 08:21:23 +0000 Subject: [CWEB] Don't repeat yourself. Purge repeated lines in *.w by uncommenting line in common.h. Unfortunately, this shifts all #line numbers. ;o) git-svn-id: svn://tug.org/texlive/trunk@57676 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ctangleboot.cin | 306 ++++++++++++++++---------------- 1 file changed, 153 insertions(+), 153 deletions(-) (limited to 'Build/source/texk/web2c/ctangleboot.cin') diff --git a/Build/source/texk/web2c/ctangleboot.cin b/Build/source/texk/web2c/ctangleboot.cin index d29a6ad3944..aa32ae911bb 100644 --- a/Build/source/texk/web2c/ctangleboot.cin +++ b/Build/source/texk/web2c/ctangleboot.cin @@ -273,7 +273,7 @@ extern char cb_banner[]; #line 69 "cwebdir/ctangle.w" /*19:*/ -#line 124 "cwebdir/ctangle.w" +#line 122 "cwebdir/ctangle.w" typedef struct{ eight_bits*tok_start; @@ -282,7 +282,7 @@ sixteen_bits text_link; typedef text*text_pointer; /*:19*//*31:*/ -#line 272 "cwebdir/ctangle.w" +#line 270 "cwebdir/ctangle.w" typedef struct{ eight_bits*end_field; @@ -297,7 +297,7 @@ typedef output_state*stack_pointer; #line 70 "cwebdir/ctangle.w" /*20:*/ -#line 131 "cwebdir/ctangle.w" +#line 129 "cwebdir/ctangle.w" text text_info[max_texts]; text_pointer text_info_end= text_info+max_texts-1; @@ -307,12 +307,12 @@ eight_bits*tok_mem_end= tok_mem+max_toks-1; eight_bits*tok_ptr; /*:20*//*26:*/ -#line 200 "cwebdir/ctangle.w" +#line 198 "cwebdir/ctangle.w" text_pointer last_unnamed; /*:26*//*32:*/ -#line 288 "cwebdir/ctangle.w" +#line 286 "cwebdir/ctangle.w" output_state cur_state; @@ -321,18 +321,18 @@ stack_pointer stack_ptr; stack_pointer stack_end= stack+stack_size; /*:32*//*37:*/ -#line 364 "cwebdir/ctangle.w" +#line 362 "cwebdir/ctangle.w" int cur_val; /*:37*//*42:*/ -#line 456 "cwebdir/ctangle.w" +#line 454 "cwebdir/ctangle.w" eight_bits out_state; boolean protect; /*:42*//*45:*/ -#line 488 "cwebdir/ctangle.w" +#line 486 "cwebdir/ctangle.w" name_pointer output_files[max_files]; name_pointer*cur_out_file,*end_output_files,*an_output_file; @@ -340,39 +340,39 @@ char cur_section_name_char; char output_file_name[longest_name+1]; /*:45*//*52:*/ -#line 588 "cwebdir/ctangle.w" +#line 586 "cwebdir/ctangle.w" boolean output_defs_seen= 0; /*:52*//*57:*/ -#line 697 "cwebdir/ctangle.w" +#line 695 "cwebdir/ctangle.w" char translit[128][translit_length]; /*:57*//*62:*/ -#line 776 "cwebdir/ctangle.w" +#line 774 "cwebdir/ctangle.w" eight_bits ccode[256]; /*:62*//*66:*/ -#line 836 "cwebdir/ctangle.w" +#line 834 "cwebdir/ctangle.w" boolean comment_continues= 0; /*:66*//*68:*/ -#line 875 "cwebdir/ctangle.w" +#line 873 "cwebdir/ctangle.w" name_pointer cur_section_name; int no_where; /*:68*//*82:*/ -#line 1189 "cwebdir/ctangle.w" +#line 1187 "cwebdir/ctangle.w" text_pointer cur_text; eight_bits next_control; /*:82*//*90:*/ -#line 1350 "cwebdir/ctangle.w" +#line 1348 "cwebdir/ctangle.w" extern sixteen_bits section_count; @@ -415,65 +415,65 @@ extern void print_stats(void); extern void cb_show_banner(void); /*:16*//*29:*/ -#line 233 "cwebdir/ctangle.w" +#line 231 "cwebdir/ctangle.w" static void store_two_bytes(sixteen_bits); /*:29*//*34:*/ -#line 312 "cwebdir/ctangle.w" +#line 310 "cwebdir/ctangle.w" static void push_level(name_pointer); static void pop_level(int); /*:34*//*38:*/ -#line 371 "cwebdir/ctangle.w" +#line 369 "cwebdir/ctangle.w" static void get_output(void); /*:38*//*43:*/ -#line 464 "cwebdir/ctangle.w" +#line 462 "cwebdir/ctangle.w" static void flush_buffer(void); /*:43*//*48:*/ -#line 519 "cwebdir/ctangle.w" +#line 517 "cwebdir/ctangle.w" static void phase_two(void); /*:48*//*53:*/ -#line 591 "cwebdir/ctangle.w" +#line 589 "cwebdir/ctangle.w" static void output_defs(void); static void out_char(eight_bits); /*:53*//*64:*/ -#line 800 "cwebdir/ctangle.w" +#line 798 "cwebdir/ctangle.w" static eight_bits skip_ahead(void); static boolean skip_comment(boolean); /*:64*//*69:*/ -#line 887 "cwebdir/ctangle.w" +#line 885 "cwebdir/ctangle.w" static eight_bits get_next(void); /*:69*//*83:*/ -#line 1193 "cwebdir/ctangle.w" +#line 1191 "cwebdir/ctangle.w" static void scan_repl(eight_bits); /*:83*//*91:*/ -#line 1357 "cwebdir/ctangle.w" +#line 1355 "cwebdir/ctangle.w" static void scan_section(void); /*:91*//*99:*/ -#line 1460 "cwebdir/ctangle.w" +#line 1458 "cwebdir/ctangle.w" static void phase_one(void); /*:99*//*101:*/ -#line 1478 "cwebdir/ctangle.w" +#line 1476 "cwebdir/ctangle.w" static void skip_limbo(void); @@ -491,28 +491,28 @@ char**av) argc= ac;argv= av; program= ctangle; /*21:*/ -#line 139 "cwebdir/ctangle.w" +#line 137 "cwebdir/ctangle.w" text_info->tok_start= tok_ptr= tok_mem; text_ptr= text_info+1;text_ptr->tok_start= tok_mem; /*:21*//*23:*/ -#line 149 "cwebdir/ctangle.w" +#line 147 "cwebdir/ctangle.w" init_node(name_dir); /*:23*//*27:*/ -#line 203 "cwebdir/ctangle.w" +#line 201 "cwebdir/ctangle.w" last_unnamed= text_info;text_info->text_link= 0; /*:27*//*46:*/ -#line 498 "cwebdir/ctangle.w" +#line 496 "cwebdir/ctangle.w" cur_out_file= end_output_files= output_files+max_files; /*:46*//*58:*/ -#line 700 "cwebdir/ctangle.w" +#line 698 "cwebdir/ctangle.w" { int i; @@ -520,7 +520,7 @@ for(i= 0;i<128;i++)sprintf(translit[i],"X%02X",(unsigned int)(128+i)); } /*:58*//*63:*/ -#line 779 "cwebdir/ctangle.w" +#line 777 "cwebdir/ctangle.w" { int c; for(c= 0;c<256;c++)ccode[c]= ignore; @@ -540,7 +540,7 @@ ccode['\'']= ord; } /*:63*//*78:*/ -#line 1110 "cwebdir/ctangle.w" +#line 1108 "cwebdir/ctangle.w" section_text[0]= ' '; /*:78*//*117:*/ @@ -561,7 +561,7 @@ return wrap_up(); } /*:2*//*24:*/ -#line 155 "cwebdir/ctangle.w" +#line 153 "cwebdir/ctangle.w" boolean names_match( name_pointer p, @@ -574,7 +574,7 @@ return!strncmp(first,p->byte_start,l); } /*:24*//*25:*/ -#line 171 "cwebdir/ctangle.w" +#line 169 "cwebdir/ctangle.w" void init_node( @@ -586,7 +586,7 @@ void init_p(name_pointer p,eight_bits t){(void)p;(void)t;} /*:25*//*30:*/ -#line 236 "cwebdir/ctangle.w" +#line 234 "cwebdir/ctangle.w" void store_two_bytes( @@ -594,13 +594,13 @@ sixteen_bits x) { #line 65 "cwebdir/ctang-w2c.ch" if(tok_ptr+2> tok_mem_end)overflow(_("token")); -#line 242 "cwebdir/ctangle.w" +#line 240 "cwebdir/ctangle.w" *tok_ptr++= x>>8; *tok_ptr++= x&0377; } /*:30*//*35:*/ -#line 316 "cwebdir/ctangle.w" +#line 314 "cwebdir/ctangle.w" static void push_level( @@ -608,7 +608,7 @@ name_pointer p) { #line 71 "cwebdir/ctang-w2c.ch" if(stack_ptr==stack_end)overflow(_("stack")); -#line 322 "cwebdir/ctangle.w" +#line 320 "cwebdir/ctangle.w" *stack_ptr= cur_state; stack_ptr++; if(p!=NULL){ @@ -619,7 +619,7 @@ cur_section= 0; } /*:35*//*36:*/ -#line 335 "cwebdir/ctangle.w" +#line 333 "cwebdir/ctangle.w" static void pop_level( @@ -635,7 +635,7 @@ if(stack_ptr> stack)cur_state= *stack_ptr; } /*:36*//*39:*/ -#line 374 "cwebdir/ctangle.w" +#line 372 "cwebdir/ctangle.w" static void get_output(void) @@ -658,7 +658,7 @@ switch(a/024000){ case 0:cur_val= a;out_char(identifier);break; case 1:if(a==output_defs_flag)output_defs(); else/*40:*/ -#line 406 "cwebdir/ctangle.w" +#line 404 "cwebdir/ctangle.w" { a-= 024000; @@ -666,7 +666,7 @@ if((a+name_dir)->equiv!=(void*)text_info)push_level(a+name_dir); else if(a!=0){ #line 77 "cwebdir/ctang-w2c.ch" fputs(_("\n! Not present: <"),stdout); -#line 412 "cwebdir/ctangle.w" +#line 410 "cwebdir/ctangle.w" print_section_name(a+name_dir);err_print(">"); } @@ -674,7 +674,7 @@ goto restart; } /*:40*/ -#line 395 "cwebdir/ctangle.w" +#line 393 "cwebdir/ctangle.w" break; default:cur_val= a-050000;if(cur_val> 0)cur_section= cur_val; @@ -684,7 +684,7 @@ out_char(section_number); } /*:39*//*44:*/ -#line 467 "cwebdir/ctangle.w" +#line 465 "cwebdir/ctangle.w" static void flush_buffer(void) @@ -699,34 +699,34 @@ cur_line++; } /*:44*//*49:*/ -#line 522 "cwebdir/ctangle.w" +#line 520 "cwebdir/ctangle.w" static void phase_two(void){ web_file_open= 0; cur_line= 1; /*33:*/ -#line 301 "cwebdir/ctangle.w" +#line 299 "cwebdir/ctangle.w" 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 527 "cwebdir/ctangle.w" +#line 525 "cwebdir/ctangle.w" /*51:*/ -#line 584 "cwebdir/ctangle.w" +#line 582 "cwebdir/ctangle.w" if(!output_defs_seen) output_defs(); /*:51*/ -#line 528 "cwebdir/ctangle.w" +#line 526 "cwebdir/ctangle.w" if(text_info->text_link==0&&cur_out_file==end_output_files){ #line 89 "cwebdir/ctang-w2c.ch" fputs(_("\n! No program text was specified."),stdout);mark_harmless; -#line 531 "cwebdir/ctangle.w" +#line 529 "cwebdir/ctangle.w" } else{ @@ -734,13 +734,13 @@ if(cur_out_file==end_output_files){ if(show_progress) #line 95 "cwebdir/ctang-w2c.ch" printf(_("\nWriting the output file (%s):"),C_file_name); -#line 537 "cwebdir/ctangle.w" +#line 535 "cwebdir/ctangle.w" } else{ if(show_progress){ #line 101 "cwebdir/ctang-w2c.ch" fputs(_("\nWriting the output files:"),stdout); -#line 541 "cwebdir/ctangle.w" +#line 539 "cwebdir/ctangle.w" printf(" (%s)",C_file_name); update_terminal; @@ -984,22 +984,22 @@ rename(check_file_name,output_file_name); } strcpy(check_file_name,""); -#line 579 "cwebdir/ctangle.w" +#line 577 "cwebdir/ctangle.w" /*:50*/ -#line 549 "cwebdir/ctangle.w" +#line 547 "cwebdir/ctangle.w" if(show_happiness){ if(show_progress)new_line; #line 107 "cwebdir/ctang-w2c.ch" fputs(_("Done."),stdout); -#line 553 "cwebdir/ctangle.w" +#line 551 "cwebdir/ctangle.w" } } } /*:49*//*54:*/ -#line 595 "cwebdir/ctangle.w" +#line 593 "cwebdir/ctangle.w" static void output_defs(void) @@ -1027,7 +1027,7 @@ cur_val= a;out_char(identifier); } #line 159 "cwebdir/ctang-w2c.ch" else if(a<050000){confusion(_("macro defs have strange char"));} -#line 621 "cwebdir/ctangle.w" +#line 619 "cwebdir/ctangle.w" else{ cur_val= a-050000;cur_section= cur_val;out_char(section_number); } @@ -1041,7 +1041,7 @@ pop_level(0); } /*:54*//*55:*/ -#line 638 "cwebdir/ctangle.w" +#line 636 "cwebdir/ctangle.w" static void out_char( @@ -1054,7 +1054,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 706 "cwebdir/ctangle.w" +#line 704 "cwebdir/ctangle.w" case identifier: if(out_state==num_or_id)C_putc(' '); @@ -1069,10 +1069,10 @@ j++; out_state= num_or_id;break; /*:59*/ -#line 649 "cwebdir/ctangle.w" +#line 647 "cwebdir/ctangle.w" /*60:*/ -#line 719 "cwebdir/ctangle.w" +#line 717 "cwebdir/ctangle.w" case section_number: if(cur_val> 0)C_printf("/*%d:*/",cur_val); @@ -1099,10 +1099,10 @@ C_printf("%s","\"\n"); break; /*:60*/ -#line 650 "cwebdir/ctangle.w" +#line 648 "cwebdir/ctangle.w" /*56:*/ -#line 668 "cwebdir/ctangle.w" +#line 666 "cwebdir/ctangle.w" case plus_plus:C_putc('+');C_putc('+');out_state= normal;break; case minus_minus:C_putc('-');C_putc('-');out_state= normal;break; @@ -1123,7 +1123,7 @@ case minus_gt_ast:C_putc('-');C_putc('>');C_putc('*');out_state= normal; break; /*:56*/ -#line 651 "cwebdir/ctangle.w" +#line 649 "cwebdir/ctangle.w" case'=':case'>':C_putc(cur_char);C_putc(' '); out_state= normal;break; @@ -1142,7 +1142,7 @@ default:C_putc(cur_char);out_state= normal;break; } /*:55*//*65:*/ -#line 804 "cwebdir/ctangle.w" +#line 802 "cwebdir/ctangle.w" static eight_bits skip_ahead(void) @@ -1160,7 +1160,7 @@ if(c!=ignore||*(loc-1)=='>')return(c); } /*:65*//*67:*/ -#line 839 "cwebdir/ctangle.w" +#line 837 "cwebdir/ctangle.w" static boolean skip_comment( boolean is_long_comment) @@ -1173,7 +1173,7 @@ if(get_line())return(comment_continues= 1); else{ #line 165 "cwebdir/ctang-w2c.ch" err_print(_("! Input ended in mid-comment")); -#line 850 "cwebdir/ctangle.w" +#line 848 "cwebdir/ctangle.w" return(comment_continues= 0); } @@ -1188,7 +1188,7 @@ if(c=='@'){ if(ccode[(eight_bits)*loc]==new_section){ #line 171 "cwebdir/ctang-w2c.ch" err_print(_("! Section name ended in mid-comment"));loc--; -#line 863 "cwebdir/ctangle.w" +#line 861 "cwebdir/ctangle.w" return(comment_continues= 0); } @@ -1198,7 +1198,7 @@ else loc++; } /*:67*//*70:*/ -#line 890 "cwebdir/ctangle.w" +#line 888 "cwebdir/ctangle.w" static eight_bits get_next(void) @@ -1212,7 +1212,7 @@ if(get_line()==0)return(new_section); else if(print_where&&!no_where){ print_where= 0; /*85:*/ -#line 1222 "cwebdir/ctangle.w" +#line 1220 "cwebdir/ctangle.w" store_two_bytes(0150000); if(changing&&include_depth==change_depth){ @@ -1227,7 +1227,7 @@ id_loc= id_first+strlen(id_first); app_repl(a_l%0400);} /*:85*/ -#line 902 "cwebdir/ctangle.w" +#line 900 "cwebdir/ctangle.w" } else return('\n'); @@ -1241,7 +1241,7 @@ else continue; } loc++; if(xisdigit(c)||c=='.')/*73:*/ -#line 971 "cwebdir/ctangle.w" +#line 969 "cwebdir/ctangle.w" { id_first= loc-1; if(*id_first=='.'&&!xisdigit(*loc))goto mistake; @@ -1266,13 +1266,13 @@ return(constant); } /*:73*/ -#line 914 "cwebdir/ctangle.w" +#line 912 "cwebdir/ctangle.w" else if(c=='\''||c=='"' ||((c=='L'||c=='u'||c=='U')&&(*loc=='\''||*loc=='"')) ||((c=='u'&&*loc=='8')&&(*(loc+1)=='\''||*(loc+1)=='"'))) /*74:*/ -#line 999 "cwebdir/ctangle.w" +#line 997 "cwebdir/ctangle.w" { char delim= c; id_first= section_text+1; @@ -1286,13 +1286,13 @@ if(loc>=limit){ if(*(limit-1)!='\\'){ #line 177 "cwebdir/ctang-w2c.ch" err_print(_("! String didn't end"));loc= limit;break; -#line 1011 "cwebdir/ctangle.w" +#line 1009 "cwebdir/ctangle.w" } if(get_line()==0){ #line 183 "cwebdir/ctang-w2c.ch" err_print(_("! Input ended in middle of string"));loc= buffer;break; -#line 1015 "cwebdir/ctangle.w" +#line 1013 "cwebdir/ctangle.w" } else if(++id_loc<=section_text_end)*id_loc= '\n'; @@ -1312,7 +1312,7 @@ if(++id_loc<=section_text_end)*id_loc= c; if(id_loc>=section_text_end){ #line 189 "cwebdir/ctang-w2c.ch" fputs(_("\n! String too long: "),stdout); -#line 1033 "cwebdir/ctangle.w" +#line 1031 "cwebdir/ctangle.w" term_write(section_text+1,25); err_print("..."); @@ -1322,11 +1322,11 @@ return(string); } /*:74*/ -#line 918 "cwebdir/ctangle.w" +#line 916 "cwebdir/ctangle.w" else if(isalpha(c)||isxalpha(c)||ishigh(c)) /*72:*/ -#line 964 "cwebdir/ctangle.w" +#line 962 "cwebdir/ctangle.w" { id_first= --loc; while(isalpha((eight_bits)*++loc)||isdigit((eight_bits)*loc) @@ -1335,47 +1335,47 @@ id_loc= loc;return(identifier); } /*:72*/ -#line 920 "cwebdir/ctangle.w" +#line 918 "cwebdir/ctangle.w" else if(c=='@')/*75:*/ -#line 1044 "cwebdir/ctangle.w" +#line 1042 "cwebdir/ctangle.w" { c= ccode[(eight_bits)*loc++]; switch(c){ case ignore:continue; #line 195 "cwebdir/ctang-w2c.ch" case translit_code:err_print(_("! Use @l in limbo only"));continue; -#line 1049 "cwebdir/ctangle.w" +#line 1047 "cwebdir/ctangle.w" case control_text:while((c= skip_ahead())=='@'); if(*(loc-1)!='>') #line 201 "cwebdir/ctang-w2c.ch" err_print(_("! Double @ should be used in control text")); -#line 1054 "cwebdir/ctangle.w" +#line 1052 "cwebdir/ctangle.w" continue; case section_name: cur_section_name_char= *(loc-1); /*77:*/ -#line 1092 "cwebdir/ctangle.w" +#line 1090 "cwebdir/ctangle.w" { char*k; /*79:*/ -#line 1112 "cwebdir/ctangle.w" +#line 1110 "cwebdir/ctangle.w" k= section_text; while(1){ if(loc> limit&&get_line()==0){ #line 219 "cwebdir/ctang-w2c.ch" err_print(_("! Input ended in section name")); -#line 1117 "cwebdir/ctangle.w" +#line 1115 "cwebdir/ctangle.w" loc= buffer+1;break; } c= *loc; /*80:*/ -#line 1136 "cwebdir/ctangle.w" +#line 1134 "cwebdir/ctangle.w" if(c=='@'){ c= *(loc+1); @@ -1385,20 +1385,20 @@ loc+= 2;break; if(ccode[(eight_bits)c]==new_section){ #line 231 "cwebdir/ctang-w2c.ch" err_print(_("! Section name didn't end"));break; -#line 1144 "cwebdir/ctangle.w" +#line 1142 "cwebdir/ctangle.w" } if(ccode[(eight_bits)c]==section_name){ #line 237 "cwebdir/ctang-w2c.ch" err_print(_("! Nesting of section names not allowed"));break; -#line 1148 "cwebdir/ctangle.w" +#line 1146 "cwebdir/ctangle.w" } *(++k)= '@';loc++; } /*:80*/ -#line 1121 "cwebdir/ctangle.w" +#line 1119 "cwebdir/ctangle.w" loc++;if(k=section_text_end){ #line 225 "cwebdir/ctang-w2c.ch" fputs(_("\n! Section name too long: "),stdout); -#line 1130 "cwebdir/ctangle.w" +#line 1128 "cwebdir/ctangle.w" term_write(section_text+1,25); printf("...");mark_harmless; @@ -1417,14 +1417,14 @@ printf("...");mark_harmless; if(*k==' '&&k> section_text)k--; /*:79*/ -#line 1094 "cwebdir/ctangle.w" +#line 1092 "cwebdir/ctangle.w" if(k-section_text> 3&&strncmp(k-2,"...",3)==0) cur_section_name= section_lookup(section_text+1,k-3,1); else cur_section_name= section_lookup(section_text+1,k,0); if(cur_section_name_char=='(') /*47:*/ -#line 502 "cwebdir/ctangle.w" +#line 500 "cwebdir/ctangle.w" { for(an_output_file= cur_out_file; @@ -1436,38 +1436,38 @@ if(cur_out_file> output_files) else{ #line 83 "cwebdir/ctang-w2c.ch" overflow(_("output files")); -#line 512 "cwebdir/ctangle.w" +#line 510 "cwebdir/ctangle.w" } } } /*:47*/ -#line 1100 "cwebdir/ctangle.w" +#line 1098 "cwebdir/ctangle.w" return(section_name); } /*:77*/ -#line 1058 "cwebdir/ctangle.w" +#line 1056 "cwebdir/ctangle.w" case string:/*81:*/ -#line 1158 "cwebdir/ctangle.w" +#line 1156 "cwebdir/ctangle.w" { id_first= loc++;*(limit+1)= '@';*(limit+2)= '>'; while(*loc!='@'||*(loc+1)!='>')loc++; #line 243 "cwebdir/ctang-w2c.ch" if(loc>=limit)err_print(_("! Verbatim string didn't end")); -#line 1162 "cwebdir/ctangle.w" +#line 1160 "cwebdir/ctangle.w" id_loc= loc;loc+= 2; return(string); } /*:81*/ -#line 1059 "cwebdir/ctangle.w" +#line 1057 "cwebdir/ctangle.w" case ord:/*76:*/ -#line 1071 "cwebdir/ctangle.w" +#line 1069 "cwebdir/ctangle.w" id_first= loc; if(*loc=='\\'){ @@ -1478,7 +1478,7 @@ if(*loc=='@'){ if(*(loc+1)!='@') #line 207 "cwebdir/ctang-w2c.ch" err_print(_("! Double @ should be used in ASCII constant")); -#line 1080 "cwebdir/ctangle.w" +#line 1078 "cwebdir/ctangle.w" else loc++; } @@ -1486,7 +1486,7 @@ loc++; if(loc> limit){ #line 213 "cwebdir/ctang-w2c.ch" err_print(_("! String didn't end"));loc= limit-1;break; -#line 1086 "cwebdir/ctangle.w" +#line 1084 "cwebdir/ctangle.w" } } @@ -1494,14 +1494,14 @@ loc++; return(ord); /*:76*/ -#line 1060 "cwebdir/ctangle.w" +#line 1058 "cwebdir/ctangle.w" default:return(c); } } /*:75*/ -#line 921 "cwebdir/ctangle.w" +#line 919 "cwebdir/ctangle.w" else if(xisspace(c)){ if(!preprocessing||loc> limit)continue; @@ -1510,7 +1510,7 @@ else return(' '); } else if(c=='#'&&loc==buffer+1)preprocessing= 1; mistake:/*71:*/ -#line 942 "cwebdir/ctangle.w" +#line 940 "cwebdir/ctangle.w" switch(c){ case'+':if(*loc=='+')compress(plus_plus);break; @@ -1534,14 +1534,14 @@ case'!':if(*loc=='=')compress(non_eq);break; } /*:71*/ -#line 928 "cwebdir/ctangle.w" +#line 926 "cwebdir/ctangle.w" return(c); } } /*:70*//*84:*/ -#line 1196 "cwebdir/ctangle.w" +#line 1194 "cwebdir/ctangle.w" static void scan_repl( @@ -1549,7 +1549,7 @@ eight_bits t) { sixteen_bits a; if(t==section_name){/*85:*/ -#line 1222 "cwebdir/ctangle.w" +#line 1220 "cwebdir/ctangle.w" store_two_bytes(0150000); if(changing&&include_depth==change_depth){ @@ -1564,11 +1564,11 @@ id_loc= id_first+strlen(id_first); app_repl(a_l%0400);} /*:85*/ -#line 1202 "cwebdir/ctangle.w" +#line 1200 "cwebdir/ctangle.w" } while(1)switch(a= get_next()){ /*86:*/ -#line 1235 "cwebdir/ctangle.w" +#line 1233 "cwebdir/ctangle.w" case identifier:a= id_lookup(id_first,id_loc,0)-name_dir; app_repl((a/0400)+0200); @@ -1576,7 +1576,7 @@ app_repl(a%0400);break; case section_name:if(t!=section_name)goto done; else{ /*87:*/ -#line 1268 "cwebdir/ctangle.w" +#line 1266 "cwebdir/ctangle.w" { char*try_loc= loc; while(*try_loc==' '&&try_loc text_info_end)overflow(_("text")); -#line 1215 "cwebdir/ctangle.w" +#line 1213 "cwebdir/ctangle.w" cur_text= text_ptr;(++text_ptr)->tok_start= tok_ptr; } /*:84*//*92:*/ -#line 1360 "cwebdir/ctangle.w" +#line 1358 "cwebdir/ctangle.w" static void scan_section(void) @@ -1761,7 +1761,7 @@ printf("*%d",section_count);update_terminal; next_control= 0; while(1){ /*93:*/ -#line 1399 "cwebdir/ctangle.w" +#line 1397 "cwebdir/ctangle.w" while(next_controltext_link= 0; } /*:94*/ -#line 1376 "cwebdir/ctangle.w" +#line 1374 "cwebdir/ctangle.w" continue; } @@ -1805,14 +1805,14 @@ p= name_dir;break; if(next_control==section_name){ p= cur_section_name; /*95:*/ -#line 1431 "cwebdir/ctangle.w" +#line 1429 "cwebdir/ctangle.w" while((next_control= get_next())=='+'); if(next_control!='='&&next_control!=eq_eq) continue; /*:95*/ -#line 1384 "cwebdir/ctangle.w" +#line 1382 "cwebdir/ctangle.w" break; } @@ -1820,20 +1820,20 @@ return; } no_where= print_where= 0; /*96:*/ -#line 1436 "cwebdir/ctangle.w" +#line 1434 "cwebdir/ctangle.w" /*97:*/ -#line 1441 "cwebdir/ctangle.w" +#line 1439 "cwebdir/ctangle.w" store_two_bytes((sixteen_bits)(0150000+section_count)); /*:97*/ -#line 1437 "cwebdir/ctangle.w" +#line 1435 "cwebdir/ctangle.w" scan_repl(section_name); /*98:*/ -#line 1445 "cwebdir/ctangle.w" +#line 1443 "cwebdir/ctangle.w" if(p==name_dir||p==0){ (last_unnamed)->text_link= cur_text-text_info;last_unnamed= cur_text; @@ -1850,16 +1850,16 @@ cur_text->text_link= section_flag; /*:98*/ -#line 1439 "cwebdir/ctangle.w" +#line 1437 "cwebdir/ctangle.w" /*:96*/ -#line 1390 "cwebdir/ctangle.w" +#line 1388 "cwebdir/ctangle.w" } /*:92*//*100:*/ -#line 1463 "cwebdir/ctangle.w" +#line 1461 "cwebdir/ctangle.w" static void phase_one(void){ @@ -1873,7 +1873,7 @@ phase= 2; } /*:100*//*102:*/ -#line 1481 "cwebdir/ctangle.w" +#line 1479 "cwebdir/ctangle.w" static void skip_limbo(void) @@ -1888,7 +1888,7 @@ c= *loc++; if(ccode[(eight_bits)c]==new_section)break; switch(ccode[(eight_bits)c]){ case translit_code:/*103:*/ -#line 1510 "cwebdir/ctangle.w" +#line 1508 "cwebdir/ctangle.w" while(xisspace(*loc)&&loc limit||!xisxdigit(*(loc-3))||!xisxdigit(*(loc-2)) ||(*(loc-3)>='0'&&*(loc-3)<='7')||!xisspace(*(loc-1))) #line 309 "cwebdir/ctang-w2c.ch" err_print(_("! Improper hex number following @l")); -#line 1516 "cwebdir/ctangle.w" +#line 1514 "cwebdir/ctangle.w" else{ unsigned int i; @@ -1908,7 +1908,7 @@ while(loc=translit_length) #line 315 "cwebdir/ctang-w2c.ch" err_print(_("! Replacement string in @l too long")); -#line 1526 "cwebdir/ctangle.w" +#line 1524 "cwebdir/ctangle.w" else{ strncpy(translit[i-0200],beg,(size_t)(loc-beg)); @@ -1917,7 +1917,7 @@ translit[i-0200][loc-beg]= '\0'; } /*:103*/ -#line 1494 "cwebdir/ctangle.w" +#line 1492 "cwebdir/ctangle.w" break; case format_code:case'@':break; case control_text:if(c=='q'||c=='Q'){ @@ -1925,13 +1925,13 @@ while((c= skip_ahead())=='@'); if(*(loc-1)!='>') #line 297 "cwebdir/ctang-w2c.ch" err_print(_("! Double @ should be used in control text")); -#line 1500 "cwebdir/ctangle.w" +#line 1498 "cwebdir/ctangle.w" break; } #line 303 "cwebdir/ctang-w2c.ch" default:err_print(_("! Double @ should be used in limbo")); -#line 1504 "cwebdir/ctangle.w" +#line 1502 "cwebdir/ctangle.w" } } @@ -1939,7 +1939,7 @@ default:err_print(_("! Double @ should be used in limbo")); } /*:102*//*104:*/ -#line 1536 "cwebdir/ctangle.w" +#line 1534 "cwebdir/ctangle.w" void print_stats(void){ @@ -1952,7 +1952,7 @@ printf(_("%ld replacement texts (out of %ld)\n"), printf(_("%ld bytes (out of %ld)\n"), (ptrdiff_t)(byte_ptr-byte_mem),(long)max_bytes); printf(_("%ld tokens (out of %ld)\n"), -#line 1547 "cwebdir/ctangle.w" +#line 1545 "cwebdir/ctangle.w" (ptrdiff_t)(tok_ptr-tok_mem),(long)max_toks); } -- cgit v1.2.3