diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-10 10:27:09 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-10 10:27:09 +0000 |
commit | 5e8e9500102800e68c9e7fcac9e85c1668b71a36 (patch) | |
tree | 81d79ac70ffbb127e8063f18c8f55475ca169ee1 /Build/source/texk/web2c/mf.ch | |
parent | e6a9c88ada2f11dd61e4c4e39dff84944bed5787 (diff) |
towards TL2010: texk/web2c
git-svn-id: svn://tug.org/texlive/trunk@15964 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/mf.ch')
-rw-r--r-- | Build/source/texk/web2c/mf.ch | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/mf.ch b/Build/source/texk/web2c/mf.ch index 95801d39ee5..abce9532c7d 100644 --- a/Build/source/texk/web2c/mf.ch +++ b/Build/source/texk/web2c/mf.ch @@ -172,7 +172,7 @@ tini@/ @# @!bound_default:integer; {temporary for setup} -@!bound_name:^char; {temporary for setup} +@!bound_name:const_cstring; {temporary for setup} @# @!main_memory:integer; {total memory words allocated in initex} @!mem_top:integer; {largest index in the |mem| array dumped by \.{INIMF}; @@ -629,7 +629,7 @@ end; uexit(0); end @<Error hand...@>= -procedure jump_out; +noreturn procedure jump_out; begin close_files_and_terminate; do_final_end; @@ -686,6 +686,24 @@ not been commented out. jump_out; @z +@x [6.88] 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.89] 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.90] Declare confusion as noreturn. +procedure confusion(@!s:str_number); +@y +noreturn procedure confusion(@!s:str_number); +@z + @x [7.96] Do half in cpascal.h. And add halfp as in MetaPost for speed. @d half(#)==(#) div 2 @y @@ -1587,7 +1605,7 @@ name_of_file[name_length + 1] := 0; MF_base_default:='MFbases:plain.base'; @y @!base_default_length: integer; -@!MF_base_default: ^char; +@!MF_base_default: w2c_u_string; @ We set the name of the default format file and the length of that name in \.{texmfmp.c}, since we want them to depend on the name of the @@ -1699,7 +1717,7 @@ while ((buffer[k]=" ")or(buffer[k]=tab))and(k<last) do incr(k); @x [38.788] Adjust for C string conventions. @!months:packed array [1..36] of char; {abbreviations of month names} @y -@!months:^char; +@!months:const_cstring; @z @x [38.788] Set correct filename for recorder. @@ -1750,7 +1768,6 @@ loop@+ begin begin_file_reading; {set up |cur_file| and new level of input} if a_open_in(cur_file) then goto done; end; @y Don't assume a single . in filenames. -var temp_str: str_number; k: integer; begin @<Put the desired file name in |(cur_name,cur_ext,cur_area)|@>; pack_cur_name; loop@+begin @@ -1760,7 +1777,7 @@ loop@+begin pack_cur_name; end; {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_mf_format) then goto done; @z |