From 5e8e9500102800e68c9e7fcac9e85c1668b71a36 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 10 Nov 2009 10:27:09 +0000 Subject: towards TL2010: texk/web2c git-svn-id: svn://tug.org/texlive/trunk@15964 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/tex.ch | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) (limited to 'Build/source/texk/web2c/tex.ch') diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch index 41c6a64e800..5d524ab11cf 100644 --- a/Build/source/texk/web2c/tex.ch +++ b/Build/source/texk/web2c/tex.ch @@ -901,7 +901,7 @@ end; end @= -procedure jump_out; +noreturn procedure jump_out; begin close_files_and_terminate; do_final_end; @@ -958,6 +958,24 @@ been commented~out. jump_out; @z +@x [6.93] l.2056 - Declare fatal_error as noreturn. +procedure fatal_error(@!s:str_number); {prints |s|, and that's it} +@y +noreturn procedure fatal_error(@!s:str_number); {prints |s|, and that's it} +@z + +@x [6.94] l.2065 - Declare overflow as noreturn. +procedure overflow(@!s:str_number;@!n:integer); {stop due to finiteness} +@y +noreturn procedure overflow(@!s:str_number;@!n:integer); {stop due to finiteness} +@z + +@x [6.95] l.2084 - Declare confusion as noreturn. +procedure confusion(@!s:str_number); +@y +noreturn procedure confusion(@!s:str_number); +@z + % [7.104] `remainder' is a library routine on some systems, so change % its name to avoid conflicts. @x [7.104] l.2227 - avoid name conflicts with lib routine remainder() @@ -2164,7 +2182,7 @@ length will be set in the main program. TEX_format_default:='TeXformats:plain.fmt'; @y @!format_default_length: integer; -@!TEX_format_default: ^char; +@!TEX_format_default: w2c_u_string; @ We set the name of the default format file and the length of that name in C, instead of Pascal, since we want them to depend on the name of the @@ -2428,7 +2446,7 @@ loop@+begin begin_file_reading; {set up |cur_file| and new level of input} tex_input_type := 1; {Tell |open_input| we are \.{\\input}.} {Kpathsea tries all the various ways to get the file.} - if open_in_name_ok(stringcast(name_of_file+1)) + if kpse_in_name_ok(stringcast(name_of_file+1)) and a_open_in(cur_file, kpse_tex_format) then goto done; @z @@ -3900,7 +3918,7 @@ else kpse_make_tex_discard_errors := 0; @y pack_cur_name; tex_input_type:=0; {Tell |open_input| we are \.{\\openin}.} - if open_in_name_ok(stringcast(name_of_file+1)) + if kpse_in_name_ok(stringcast(name_of_file+1)) and a_open_in(read_file[n], kpse_tex_format) then read_open[n]:=just_open; @z @@ -4891,6 +4909,14 @@ primitive("special",extension,special_node);@/ text(frozen_special):="special"; eqtb[frozen_special]:=eqtb[cur_val];@/ @z +@x [53.1348] (do_extension) Remove unused variables +var i,@!j,@!k:integer; {all-purpose integers} +@!p,@!q,@!r:pointer; {all-purpose pointers} +@y +var k:integer; {all-purpose integers} +@!p:pointer; {all-purpose pointers} +@z + % [53.1350] (new_write_whatsit) Allow 18 as a \write stream. We never % refer to an actual file, though, so we don't need to change the % write_file or write_open arrays. We provide for disabling this at @@ -5085,7 +5111,7 @@ var j:small_number; {write stream number} prompt_file_name("output file name",".tex"); write_open[j]:=true; @y - while not open_out_name_ok(stringcast(name_of_file+1)) + while not kpse_out_name_ok(stringcast(name_of_file+1)) or not a_open_out(write_file[j]) do prompt_file_name("output file name",".tex"); write_open[j]:=true; -- cgit v1.2.3