From 099bed71ffa7fb4e19f4e614c077a149aae72930 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Wed, 10 Jun 2020 14:32:32 +0000 Subject: [WEB2C] Redactions in changefiles. Most notably: * Section [34] in PKTYPE: More consistent layout of meta-comments * Section [8] in TANGLE: Max out some array sizes as in CTANGLE. git-svn-id: svn://tug.org/texlive/trunk@55506 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/pktogf.ch | 6 +++++- Build/source/texk/web2c/pktype.ch | 20 +++++++++++++++----- Build/source/texk/web2c/tangle.ch | 6 +++--- Build/source/texk/web2c/tangleboot.pin | 4 ++-- 4 files changed, 25 insertions(+), 11 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/pktogf.ch b/Build/source/texk/web2c/pktogf.ch index 64419092f75..f8a03595d72 100644 --- a/Build/source/texk/web2c/pktogf.ch +++ b/Build/source/texk/web2c/pktogf.ch @@ -236,6 +236,7 @@ cur_loc:=cur_loc+2; if a<128 then signed_pair:=a*256+b else signed_pair:=(a-256)*256+b; end; +@# @{ function get_three_bytes:integer; {returns the next three bytes, unsigned} var a,@!b,@!c:eight_bits; @@ -243,7 +244,9 @@ begin read(pk_file,a); read(pk_file,b); read(pk_file,c); cur_loc:=cur_loc+3; get_three_bytes:=(a*256+b)*256+c; end; -@# +@{ +@/ +@} function signed_trio:integer; {returns the next three bytes, signed} var a,@!b,@!c:eight_bits; begin read(pk_file,a); read(pk_file,b); read(pk_file,c); @@ -252,6 +255,7 @@ if a<128 then signed_trio:=(a*256+b)*256+c else signed_trio:=((a-256)*256+b)*256+c; end; @} +@# function signed_quad:integer; {returns the next four bytes, signed} var a,@!b,@!c,@!d:eight_bits; begin read(pk_file,a); read(pk_file,b); read(pk_file,c); read(pk_file,d); diff --git a/Build/source/texk/web2c/pktype.ch b/Build/source/texk/web2c/pktype.ch index 7e18913318f..d6fd34353a9 100644 --- a/Build/source/texk/web2c/pktype.ch +++ b/Build/source/texk/web2c/pktype.ch @@ -141,7 +141,9 @@ end; @!cur_loc:integer; {how many bytes have we read?} @z -@x [??] Use modified routines to access pk_file. +@x [34] Use modified routines to access pk_file. +@ We also need a function that will get a single byte from the \.{pk} file. + @p function pk_byte : eight_bits ; var temp : eight_bits ; begin @@ -151,10 +153,10 @@ begin pk_byte := temp ; end ; @y -We shall use a set of simple functions to read the next byte or +@ We shall use a set of simple functions to read the next byte or bytes from |pk_file|. There are seven possibilities, each of which is treated as a separate function in order to minimize the overhead for -subroutine calls. We comment out the ones we don't need +subroutine calls. We comment out the ones we don't need. @^system dependencies@> @d pk_byte==get_byte @@ -166,6 +168,7 @@ begin if eof(pk_file) then get_byte:=0 else begin read(pk_file,b); incr(cur_loc); get_byte:=b; end; end; +@# @{ function signed_byte:integer; {returns the next byte, signed} var b:eight_bits; @@ -173,12 +176,14 @@ begin read(pk_file,b); incr(cur_loc); if b<128 then signed_byte:=b @+ else signed_byte:=b-256; end; @} +@# function get_two_bytes:integer; {returns the next two bytes, unsigned} var a,@!b:eight_bits; begin read(pk_file,a); read(pk_file,b); cur_loc:=cur_loc+2; get_two_bytes:=a*256+b; end; +@# @{ function signed_pair:integer; {returns the next two bytes, signed} var a,@!b:eight_bits; @@ -187,14 +192,18 @@ cur_loc:=cur_loc+2; if a<128 then signed_pair:=a*256+b else signed_pair:=(a-256)*256+b; end; -@# +@} +@/ +@{ function get_three_bytes:integer; {returns the next three bytes, unsigned} var a,@!b,@!c:eight_bits; begin read(pk_file,a); read(pk_file,b); read(pk_file,c); cur_loc:=cur_loc+3; get_three_bytes:=(a*256+b)*256+c; end; -@# +@} +@/ +@{ function signed_trio:integer; {returns the next three bytes, signed} var a,@!b,@!c:eight_bits; begin read(pk_file,a); read(pk_file,b); read(pk_file,c); @@ -203,6 +212,7 @@ if a<128 then signed_trio:=(a*256+b)*256+c else signed_trio:=((a-256)*256+b)*256+c; end; @} +@# function signed_quad:integer; {returns the next four bytes, signed} var a,@!b,@!c,@!d:eight_bits; begin read(pk_file,a); read(pk_file,b); read(pk_file,c); read(pk_file,d); diff --git a/Build/source/texk/web2c/tangle.ch b/Build/source/texk/web2c/tangle.ch index 68e119f6628..c1b568a1056 100644 --- a/Build/source/texk/web2c/tangle.ch +++ b/Build/source/texk/web2c/tangle.ch @@ -78,7 +78,7 @@ procedure initialize; @x [8] Constants: increase id lengths, for TeX--XeT and tex2pdf. @!buf_size=100; {maximum length of input line} @y -@!buf_size=3000; {maximum length of input line} +@!buf_size=1000; {maximum length of input line} @z @x @!max_bytes=45000; {|1/ww| times the number of bytes in identifiers, @@ -93,9 +93,9 @@ procedure initialize; strings, and module names; must be less than 65536} @!max_toks=65535; {|1/zz| times the number of bytes in compressed \PASCAL\ code; must be less than 65536} -@!max_names=10000; {number of identifiers, strings, module names; +@!max_names=10239; {number of identifiers, strings, module names; must be less than 10240} -@!max_texts=10000; {number of replacement texts, must be less than 10240} +@!max_texts=10239; {number of replacement texts, must be less than 10240} @z @x diff --git a/Build/source/texk/web2c/tangleboot.pin b/Build/source/texk/web2c/tangleboot.pin index 775aeb5399b..10a4dc1ddee 100644 --- a/Build/source/texk/web2c/tangleboot.pin +++ b/Build/source/texk/web2c/tangleboot.pin @@ -1,7 +1,7 @@ {2:}{4:}{$C-,A+,D-}{[$C+,D+]} {:4}program TANGLE(webfile,changefile,Pascalfile,pool); -const{8:}bufsize=3000;maxbytes=65535;maxtoks=65535;maxnames=10000; -maxtexts=10000;hashsize=353;longestname=400;linelength=72; +const{8:}bufsize=1000;maxbytes=65535;maxtoks=65535;maxnames=10239; +maxtexts=10239;hashsize=353;longestname=400;linelength=72; outbufsize=144;stacksize=100;maxidlength=50;defunambiglength=32; {:8}type{11:}ASCIIcode=0..255; {:11}{12:}textfile=packed file of ASCIIcode;{:12}{37:}eightbits=0..255; -- cgit v1.2.3