X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Ftexsourc%2Fcoerce.h;h=379db83682d9a1842fb4d7025027de683325d7ad;hb=3cd757e7a52f1467023a444da340e1e8961d68c9;hp=c8941314107c19df80d80cb09b8a866a31b313a0;hpb=0cc92a0a7fcf1abab81fc0656651be6d2ee2f976;p=putex%2Fputex.git diff --git a/src/texsourc/coerce.h b/src/texsourc/coerce.h index c894131..379db83 100644 --- a/src/texsourc/coerce.h +++ b/src/texsourc/coerce.h @@ -16,33 +16,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* #define USEREGISTERS tells compiler use registers for mem and eqtb bkph */ -/* this may make executable slightly smaller and slightly faster ... */ -/* HOWEVER, won't work anymore for mem with dynamic memory allocation ... */ -/* so can use registers now *only* for eqtb ... NOT for mem ... */ -/* It is OK for eqtb, because, even though we may allocate eqtb, */ -/* we won't ever reallocate it ... */ - -/* WARNING: with dynamic allocation cannot use memory_word *mem=zmem */ -/* in this case, just let mem be alias for zmem */ -/* BUT: allow continued use of register for eqtb at least ! */ -#define mem zmem -#ifndef ALLOCATEZEQTB -/* if eqtb is NOT allocated, can just let eqtb be an alias for zeqtb */ -//#define eqtb zeqtb /* EXPERIMENT 1996/JAN/18 */ -#else -/* uncomment `register memory_word *eqtb=zeqtb' */ -/* but with present compiler its faster to not do it this way 99/Jan/18 */ -#endif - -#ifndef ALLOCATEDVIBUF -/* if dvi_buf is NOT allocated, can just let dvi_buf be an alias for zdvibuf */ - #define dvi_buf zdvibuf /* EXPERIMENT 1996/JAN/18 */ -#else -/* uncomment `register memory_word *dvi_buf=zdvibuf' */ -/* but with present compiler its faster to not do it this way 99/Jan/18 */ -#endif - void print_err (const char * s); void initialize (void); void print_ln (void); @@ -70,8 +43,8 @@ void print_file_name_(integer, integer, integer); #define print_file_name(n, a, e) print_file_name_((integer) (n), (integer) (a), (integer) (e)) void print_size_(integer); #define print_size(s) print_size_((integer) (s)) -void print_write_whatsit_(str_number, halfword); -#define print_write_whatsit(s, p) print_write_whatsit_((str_number) (s), (halfword) (p)) +void print_write_whatsit_(str_number, pointer); +#define print_write_whatsit(s, p) print_write_whatsit_((str_number) (s), (pointer) (p)) void jump_out(void); void error(void); void fatal_error_(char *); @@ -80,13 +53,13 @@ void overflow_(char *, integer); #define overflow(s, n) overflow_((char *) (s), (integer) (n)) void confusion_(char *); #define confusion(s) confusion_((char *) (s)) -bool init_terminal(void); +boolean init_terminal(void); str_number make_string(void); -bool str_eq_buf_(str_number, integer); +boolean str_eq_buf_(str_number, integer); #define str_eq_buf(s, k) str_eq_buf_((str_number) (s), (integer) (k)) -bool str_eq_str_(str_number, str_number); +boolean str_eq_str_(str_number, str_number); #define str_eq_str(s, t) str_eq_str_((str_number) (s), (str_number) (t)) -bool get_strings_started(void); +boolean get_strings_started(void); void print_two_(integer); #define print_two(n) print_two_((integer) (n)) void print_hex_(integer); @@ -114,41 +87,41 @@ scaled xn_over_d_(scaled, integer, integer); halfword badness_(scaled, scaled); #define badness(t, s) badness_((scaled) (t), (scaled) (s)) void print_word_(memory_word); -#define print_word(w) print_word_((memory_word) (w)) +#define print_word(w) print_word_((w)) void show_token_list_(integer, integer, integer); #define show_token_list(p, q, l) show_token_list_((integer) (p), (integer) (q), (integer) (l)) void runaway(void); halfword get_avail(void); -void flush_list_(halfword); -#define flush_list(p) flush_list_((halfword) (p)) -halfword get_node_(integer); +void flush_list_(pointer); +#define flush_list(p) flush_list_((pointer) (p)) +pointer get_node_(integer); #define get_node(s) get_node_((integer) (s)) void free_node_(halfword, halfword); #define free_node(p, s) free_node_((halfword) (p), (halfword) (s)) void sort_avail(void); -halfword new_null_box(void); -halfword new_rule(void); -halfword new_ligature_(quarterword, quarterword, halfword); -#define new_ligature(f, c, q) new_ligature_((quarterword) (f), (quarterword) (c), (halfword) (q)) -halfword new_lig_item_(quarterword); +pointer new_null_box(void); +pointer new_rule(void); +pointer new_ligature_(quarterword, quarterword, pointer); +#define new_ligature(f, c, q) new_ligature_((quarterword) (f), (quarterword) (c), (pointer) (q)) +pointer new_lig_item_(quarterword); #define new_lig_item(c) new_lig_item_((quarterword) (c)) -halfword new_disc(void); -halfword new_math_(scaled, small_number); +pointer new_disc(void); +pointer new_math_(scaled, small_number); #define new_math(w, s) new_math_((scaled) (w), (small_number) (s)) -halfword new_spec_(halfword); -#define new_spec(p) new_spec_((halfword) (p)) -halfword new_param_glue_(small_number); +pointer new_spec_(pointer); +#define new_spec(p) new_spec_((pointer) (p)) +pointer new_param_glue_(small_number); #define new_param_glue(n) new_param_glue_((small_number) (n)) -halfword new_glue_(halfword); -#define new_glue(q) new_glue_((halfword) (q)) -halfword new_skip_param_(small_number); +pointer new_glue_(pointer); +#define new_glue(q) new_glue_((pointer) (q)) +pointer new_skip_param_(small_number); #define new_skip_param(n) new_skip_param_((small_number) (n)) -halfword new_kern_(scaled); +pointer new_kern_(scaled); #define new_kern(w) new_kern_((scaled) (w)) -halfword new_penalty_(integer); +pointer new_penalty_(integer); #define new_penalty(m) new_penalty_((integer) (m)) -void check_mem_(bool); -#define check_mem(printlocs) check_mem_((bool) (printlocs)) +void check_mem_(boolean); +#define check_mem(printlocs) check_mem_((boolean) (printlocs)) void search_mem_(halfword); #define search_mem(p) search_mem_((halfword) (p)) void short_display_(integer); @@ -175,8 +148,8 @@ void print_skip_param_(integer); #define print_skip_param(n) print_skip_param_((integer) (n)) void show_node_list_(integer); #define show_node_list(p) show_node_list_((integer) (p)) -void show_box_(halfword); -#define show_box(p) show_box_((halfword) (p)) +void show_box_(pointer); +#define show_box(p) show_box_((pointer) (p)) void delete_token_ref_(halfword); #define delete_token_ref(p) delete_token_ref_((halfword) (p)) void delete_glue_ref_(halfword); @@ -193,8 +166,8 @@ void show_activities(void); void print_param_(integer); #define print_param(n) print_param_((integer) (n)) void begin_diagnostic(void); -void end_diagnostic_(bool); -#define end_diagnostic(blankline) end_diagnostic_((bool) (blankline)) +void end_diagnostic_(boolean); +#define end_diagnostic(blankline) end_diagnostic_((boolean) (blankline)) void print_length_param_(integer); #define print_length_param(n) print_length_param_((integer) (n)) void print_cmd_chr_(quarterword, halfword); @@ -203,14 +176,13 @@ void show_eqtb_(halfword); #define show_eqtb(n) show_eqtb_((halfword) (n)) halfword id_lookup_(integer, integer); #define id_lookup(j, l) id_lookup_((integer) (j), (integer) (l)) -str_number make_string_pool (char *s); void primitive_s (char * s, quarterword c, halfword o); void primitive_(str_number, quarterword, halfword); #define primitive(s, c, o) primitive_(make_string_pool((char *) s), (quarterword) (c), (halfword) (o)) void new_save_level_(group_code); #define new_save_level(c) new_save_level_((group_code) (c)) void eq_destroy_(memory_word); -#define eq_destroy(w) eq_destroy_((memory_word) (w)) +#define eq_destroy(w) eq_destroy_((w)) void eq_save_(halfword, quarterword); #define eq_save(p, l) eq_save_((halfword) (p), (quarterword) (l)) void eq_define_(halfword, quarterword, halfword); @@ -252,8 +224,8 @@ void get_x_token(void); void x_token(void); void scan_left_brace(void); void scan_optional_equals(void); -bool scan_keyword_(char *); -#define scan_keyword(s) scan_keyword_((char *) (s)) +boolean scan_keyword_(const char *); +#define scan_keyword(s) scan_keyword_((const char *) (s)) void mu_error(void); void scan_eight_bit_int(void); void scan_char_num(void); @@ -261,13 +233,13 @@ void scan_four_bit_int(void); void scan_fifteen_bit_int(void); void scan_twenty_seven_bit_int(void); void scan_font_ident(void); -void find_font_dimen_(bool); -#define find_font_dimen(writing) find_font_dimen_((bool) (writing)) -void scan_something_internal_(small_number, bool); -#define scan_something_internal(level, negative) scan_something_internal_((small_number) (level), (bool) (negative)) +void find_font_dimen_(boolean); +#define find_font_dimen(writing) find_font_dimen_((boolean) (writing)) +void scan_something_internal_(small_number, boolean); +#define scan_something_internal(level, negative) scan_something_internal_((small_number) (level), (boolean) (negative)) void scan_int(void); void scan_dimen_(bool, bool, bool); -#define scan_dimen(mu, inf, shortcut) scan_dimen_((bool) (mu), (bool) (inf), (bool) (shortcut)) +#define scan_dimen(mu, inf, shortcut) scan_dimen_((boolean) (mu), (boolean) (inf), (boolean) (shortcut)) void scan_glue_(small_number); #define scan_glue(level) scan_glue_((small_number) (level)) halfword scan_rule_spec(void); @@ -277,7 +249,7 @@ halfword the_toks(void); void ins_the_toks(void); void conv_toks(void); halfword scan_toks_(bool, bool); -#define scan_toks(macrodef, xpand) scan_toks_((bool) (macrodef), (bool) (xpand)) +#define scan_toks(macrodef, xpand) scan_toks_((boolean) (macrodef), (boolean) (xpand)) void read_toks_(integer, halfword); #define read_toks(n, r) read_toks_((integer) (n), (halfword) (r)) void pass_text(void); @@ -285,7 +257,7 @@ void change_if_limit_(small_number, halfword); #define change_if_limit(l, p) change_if_limit_((small_number) (l), (halfword) (p)) void conditional(void); void begin_name(void); -bool more_name_(ASCII_code); +boolean more_name_(ASCII_code); #define more_name(c) more_name_((ASCII_code) (c)) void end_name(void); void pack_file_name_(str_number, str_number, str_number); @@ -303,7 +275,7 @@ void scan_file_name(void); void pack_job_name_(str_number); #define pack_job_name(s) pack_job_name_(make_string_pool((char*)s)) void prompt_file_name_(char *, str_number); -#define prompt_file_name(s, e) prompt_file_name_((char *) s, make_string_pool((char*)e)) +#define prompt_file_name(s, e) prompt_file_name_((char *) s, make_string_pool((char*) e)) void open_log_file(void); void start_input(void); internal_font_number read_font_info_(halfword, str_number, str_number, scaled); @@ -312,47 +284,29 @@ void char_warning_(internal_font_number, eight_bits); #define char_warning(f, c) char_warning_((internal_font_number) (f), (eight_bits) (c)) halfword new_character_(internal_font_number, eight_bits); #define new_character(f, c) new_character_((internal_font_number) (f), (eight_bits) (c)) -#ifdef ALLOCATEDVIBUF - void dvi_swap(void); - void dvi_four_(integer); - #define dvi_four(x) dvi_four_((integer) (x)) - void zdvipop(integer); - #define dvi_pop(l) zdvipop((integer) (l)) - void dvi_font_def_(internal_font_number); - #define dvi_font_def(f) dvi_font_def_((internal_font_number) (f)) - void zmovement(scaled, eight_bits); - #define movement(w, o) zmovement((scaled) (w), (eight_bits) (o)) - void special_out_(halfword); - #define special_out(p) special_out_((halfword) (p)) - void hlist_out(void); - void vlist_out(void); - void ship_out_(halfword); - #define ship_out(p) ship_out_((halfword) (p)) -#else /* not ALLOCATEDVIBUF */ - void dvi_swap(void); - void dvi_four_(integer); - #define dvi_four(x) dvi_four_((integer) (x)) - void zdvipop(integer); - #define dvi_pop(l) zdvipop((integer) (l)) - void dvi_font_def_(internal_font_number); - #define dvi_font_def(f) dvi_font_def_((internal_font_number) (f)) - void zmovement(scaled, eight_bits); - #define movement(w, o) zmovement((scaled) (w), (eight_bits) (o)) - void special_out_(halfword); - #define special_out(p) special_out_((halfword) (p)) - void hlist_out(void); - void vlist_out(void); - void ship_out_(halfword); - #define ship_out(p) ship_out_((halfword) (p)) -#endif +void dvi_swap(void); +void dvi_four_(integer); +#define dvi_four(x) dvi_four_((integer) (x)) +void zdvipop(integer); +#define dvi_pop(l) zdvipop((integer) (l)) +void dvi_font_def_(internal_font_number); +#define dvi_font_def(f) dvi_font_def_((internal_font_number) (f)) +void zmovement(scaled, eight_bits); +#define movement(w, o) zmovement((scaled) (w), (eight_bits) (o)) +void special_out_(pointer); +#define special_out(p) special_out_((pointer) (p)) +void hlist_out(void); +void vlist_out(void); +void ship_out_(halfword); +#define ship_out(p) ship_out_((halfword) (p)) void prune_movements_(integer); #define prune_movements(l) prune_movements_((integer) (l)) -void write_out_(halfword); -#define write_out(p) write_out_((halfword) (p)) -void out_what_(halfword); -#define out_what(p) out_what_((halfword) (p)) -void scan_spec_(group_code, bool); -#define scan_spec(c, threecodes) scan_spec_((group_code) (c), (bool) (threecodes)) +void write_out_(pointer); +#define write_out(p) write_out_((pointer) (p)) +void out_what_(pointer); +#define out_what(p) out_what_((pointer) (p)) +void scan_spec_(group_code, boolean); +#define scan_spec(c, threecodes) scan_spec_((group_code) (c), (boolean) (threecodes)) halfword hpack_(halfword, scaled, small_number); #define hpack(p, w, m) hpack_((halfword) (p), (scaled) (w), (small_number) (m)) halfword vpackage_(halfword, scaled, small_number, scaled); @@ -372,8 +326,8 @@ halfword char_box_(internal_font_number, quarterword); #define char_box(f, c) char_box_((internal_font_number) (f), (quarterword) (c)) void stack_into_box_(halfword, internal_font_number, quarterword); #define stack_into_box(b, f, c) stack_into_box_((halfword) (b), (internal_font_number) (f), (quarterword) (c)) -scaled height_plus_depth_(internal_font_number, fquarterword); -#define height_plus_depth(f, c) height_plus_depth_((internal_font_number) (f), (fquarterword) (c)) +scaled height_plus_depth_(internal_font_number, quarterword); +#define height_plus_depth(f, c) height_plus_depth_((internal_font_number) (f), (quarterword) (c)) halfword var_delimiter_(halfword, small_number, scaled); #define var_delimiter(d, s, v) var_delimiter_((halfword) (d), (small_number) (s), (scaled) (v)) halfword rebox_(halfword, scaled); @@ -416,7 +370,7 @@ void init_span_(halfword); #define init_span(p) init_span_((halfword) (p)) void init_row(void); void init_col(void); -bool fin_col(void); +boolean fin_col(void); void fin_row(void); void fin_align(void); void align_peek(void); @@ -466,8 +420,8 @@ void app_space(void); void insert_dollar_sign(void); void you_cant(void); void report_illegal_case(void); -bool privileged(void); -bool its_all_over(void); +boolean privileged(void); +boolean its_all_over(void); void append_glue(void); void append_kern(void); void off_save(void); @@ -483,8 +437,8 @@ void package_(small_number); #define package(c) package_((small_number) (c)) small_number norm_min_(integer); #define norm_min(h) norm_min_((integer) (h)) -void new_graf_(bool); -#define new_graf(indented) new_graf_((bool) (indented)) +void new_graf_(boolean); +#define new_graf(indented) new_graf_((boolean) (indented)) void indent_in_hmode(void); void head_for_vmode(void); void end_graf(void); @@ -506,13 +460,13 @@ void push_math_(group_code); #define push_math(c) push_math_((group_code) (c)) void init_math(void); void start_eq_no(void); -void scan_math_(halfword); -#define scan_math(p) scan_math_((halfword) (p)) +void scan_math_(pointer); +#define scan_math(p) scan_math_((pointer) (p)) void set_math_char_(integer); #define set_math_char(c) set_math_char_((integer) (c)) void math_limit_switch(void); -void scan_delimiter_(halfword, bool); -#define scan_delimiter(p, r) scan_delimiter_((halfword) (p), (bool) (r)) +void scan_delimiter_(pointer, boolean); +#define scan_delimiter(p, r) scan_delimiter_((pointer) (p), (boolean) (r)) void math_radical(void); void math_ac(void); void append_choices(void); @@ -552,28 +506,11 @@ void fix_language(void); void handle_right_brace(void); void main_control(void); void give_err_help(void); -bool open_fmt_file(void); -bool load_fmt_file(void); +boolean open_fmt_file(void); +boolean load_fmt_file(void); void close_files_and_terminate(void); -#ifdef ALLOCATEDVIBUF - #define closefilesandterminate_regmem register eight_bits *dvi_buf=zdvibuf; -#else - #define closefilesandterminate_regmem /* register memory_word *eqtb=zeqtb; */ -#endif void final_cleanup(void); void init_prim(void); void debug_help(void); -int texbody(void); /* 1993/Dec/16 bkph */ - -/* may want to consider copying other addresses to local registers ... */ - -/* - * The C compiler ignores most unnecessary casts (i.e., casts of something - * to its own type). However, for structures, it doesn't. Therefore, - * we have to redefine these two macros so that they don't try to cast - * the argument (a memory_word) as a memory_word. - */ -#undef eq_destroy -#define eq_destroy(x) eq_destroy_(x) -#undef print_word -#define print_word(x) print_word_(x) +int main_program(void); +int main_init(int, char **); \ No newline at end of file