From 60e661c09833bc4d2d092c37f8bc57bc4c9818d7 Mon Sep 17 00:00:00 2001 From: maqiyuan Date: Sun, 1 Jun 2014 13:36:49 +0800 Subject: [PATCH] bool to boolean. --- src/texsourc/coerce.h | 58 ++++++++--------- src/texsourc/itex.c | 39 ++++++------ src/texsourc/local.c | 20 +++--- src/texsourc/openinou.c | 6 +- src/texsourc/subroute.c | 2 +- src/texsourc/tex0.c | 30 ++++----- src/texsourc/tex1.c | 2 +- src/texsourc/tex2.c | 25 +++----- src/texsourc/tex3.c | 30 ++++----- src/texsourc/tex4.c | 10 +-- src/texsourc/tex5.c | 4 +- src/texsourc/tex6.c | 12 ++-- src/texsourc/tex7.c | 10 +-- src/texsourc/tex8.c | 4 +- src/texsourc/tex9.c | 2 +- src/texsourc/texd.h | 134 +++++++++++++++++++-------------------- src/texsourc/texmf.h | 4 +- src/texsourc/texmfmem.h | 18 ------ src/texsourc/yandy_pdf_backend.c | 10 +-- src/texsourc/yandytex.c | 4 +- src/texsourc/yandytex.h | 7 +- 21 files changed, 202 insertions(+), 229 deletions(-) diff --git a/src/texsourc/coerce.h b/src/texsourc/coerce.h index bca40ff..ec39bb4 100644 --- a/src/texsourc/coerce.h +++ b/src/texsourc/coerce.h @@ -53,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); @@ -120,8 +120,8 @@ halfword new_kern_(scaled); #define new_kern(w) new_kern_((scaled) (w)) halfword 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); @@ -166,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); @@ -225,8 +225,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); @@ -234,13 +234,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); @@ -250,7 +250,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); @@ -258,7 +258,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); @@ -276,7 +276,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); @@ -306,8 +306,8 @@ 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 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); @@ -371,7 +371,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); @@ -421,8 +421,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); @@ -438,8 +438,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); @@ -466,8 +466,8 @@ void scan_math_(halfword); 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_(halfword, boolean); +#define scan_delimiter(p, r) scan_delimiter_((halfword) (p), (boolean) (r)) void math_radical(void); void math_ac(void); void append_choices(void); @@ -507,8 +507,8 @@ 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); void final_cleanup(void); void init_prim(void); diff --git a/src/texsourc/itex.c b/src/texsourc/itex.c index fd61647..d87768d 100644 --- a/src/texsourc/itex.c +++ b/src/texsourc/itex.c @@ -135,10 +135,8 @@ void initialize (void) #ifdef DEBUG was_mem_end = mem_min; -/* was_lo_max = mem_min; */ - was_lo_max = mem_bot; -/* was_hi_min = mem_max; */ - was_hi_min = mem_top; + was_lo_max = mem_bot; // mem_min + was_hi_min = mem_top; // mem_max panicking = false; #endif @@ -237,7 +235,6 @@ void initialize (void) cur_head = 0; cur_tail = 0; - /* *not* OK with ALLOCATEHYPHEN, since may not be allocated yet */ #ifndef ALLOCATEHYPHEN for (z = 0; z <= hyphen_prime; z++) @@ -280,12 +277,11 @@ void initialize_aux (void) { #ifdef DEBUG was_mem_end = mem_min; -/* was_lo_max = mem_min; */ - was_lo_max = mem_bot; -/* was_hi_min = mem_max; */ - was_hi_min = mem_top; + was_lo_max = mem_bot; // mem_min + was_hi_min = mem_top; // mem_max panicking = false; -#endif /* DEBUG */ +#endif + /* nest_ptr = 0; */ /* max_nest_stack = 0; */ mode = 1; @@ -303,7 +299,7 @@ void initialize_aux (void) /* sec 0815 */ void line_break_ (integer final_widow_penalty) { - bool auto_breaking; + boolean auto_breaking; halfword prevp; halfword q, r, s, prevs; internal_font_number f; @@ -1008,7 +1004,7 @@ void prefixed_command (void) font_index k; halfword p, q; integer n; - bool e; + boolean e; a = 0; @@ -1597,7 +1593,7 @@ lab30: } } /* sec 1303 */ -bool load_fmt_file (void) +boolean load_fmt_file (void) { integer j, k; halfword p, q; @@ -2533,7 +2529,7 @@ lab1: scanner_status = 0; warning_index = 0; first = 1; - cur_input.state_field = 33; + cur_input.state_field = new_line; cur_input.start_field = 1; cur_input.index_field = 0; line = 0; @@ -2601,7 +2597,7 @@ lab1: show_frozen(); main_time = clock(); - history = 0; + history = spotless; if (show_cs_names) print_cs_names(stdout, 0); @@ -2612,7 +2608,6 @@ lab1: print_cs_names(stdout, 1); final_cleanup(); - close_files_and_terminate(); lab9999: @@ -2889,6 +2884,10 @@ void do_initex (void) font_glue[null_font] = 0; font_params[null_font] = 7; param_base[null_font] = -1; + + for (k = 0; k <= 6; k++) + font_info[k].cint = 0; + reset_trie(); text(frozen_protection) = 1184; /* "inaccessible" */ format_ident = 1251; @@ -2901,7 +2900,7 @@ void do_initex (void) #ifdef INITEX /* sec 0047 */ -bool get_strings_started (void) +boolean get_strings_started (void) { integer k; str_number g; @@ -3282,10 +3281,10 @@ void new_patterns (void) /* was small_number k, l; in 3.141 */ char k, l; /* ******************************************************************* */ - bool digitsensed; + boolean digitsensed; trie_op_code v; trie_pointer p, q; - bool firstchild; + boolean firstchild; /* ASCII_code c; */ int c; /* 95/Jan/7 */ @@ -3621,7 +3620,7 @@ void store_fmt_file (void) dump_int(mem_top); dump_int(eqtb_size); dump_int(hash_prime); - dump_int(hyphen_prime); /* bkph */ + dump_int(hyphen_prime); dump_int(pool_ptr); dump_int(str_ptr); diff --git a/src/texsourc/local.c b/src/texsourc/local.c index 130cfeb..38b1c40 100644 --- a/src/texsourc/local.c +++ b/src/texsourc/local.c @@ -60,7 +60,7 @@ char log_line[MAXLINE]; // used also in tex9.c int mem_spec_flag = 0; /* non-zero if `-m=...' was used */ int format_spec = 0; /* non-zero if a format specified on command line */ int closed_already = 0; /* make sure we don't try this more than once */ -bool reorder_arg_flag = true; /* put command line flags/arguments first */ +boolean reorder_arg_flag = true; /* put command line flags/arguments first */ /* Mapping from Windows ANSI to DOS code page 850 96/Jan/20 */ /* Used in tex0.c with wintodos[c-128] */ @@ -714,7 +714,7 @@ int allocate_tries (int trie_max) #endif #ifdef ALLOCATEHYPHEN -bool prime (int); /* test function later in this file */ +boolean prime (int); /* test function later in this file */ int current_prime = 0; /* remember in case reallocated later */ @@ -1265,7 +1265,7 @@ int allocate_ini (int size) nh = nr = nl = (size + 1) * sizeof(trie_pointer); no = (size + 1) * sizeof(trie_op_code); nc = (size + 1) * sizeof(packed_ASCII_code); -/* nt = (size + 1) * sizeof(bool); */ +/* nt = (size + 1) * sizeof(boolean); */ nt = (size + 1) * sizeof(char); n = nl + no + nc + nr + nh + nt; /* n = (size + 1) * (sizeof(packed_ASCII_code) + sizeof(trie_op_code) + @@ -1878,7 +1878,7 @@ int allocate_memory (void) { trie_l = trie_r = trie_o = trie_hash = NULL; /* (trie_size + 1) * integer */ trie_c = NULL; /* (trie_size + 1) * char */ - trie_taken = NULL; /* (trie_size + 1) * bool */ + trie_taken = NULL; /* (trie_size + 1) * boolean */ } #endif #ifdef PREALLOCHOLE @@ -2047,7 +2047,7 @@ int free_memory (void) return 0; } -bool prime (int x) +boolean prime (int x) { int k; int sum = 1; /* 1 + 3 + 5 + k = (k + 1) * (k + 1) / 4 */ @@ -2070,8 +2070,8 @@ bool prime (int x) } int quitflag = 0; -bool show_use = false; -bool floating = false; +boolean show_use = false; +boolean floating = false; void complainarg (int c, char *s) { @@ -2350,9 +2350,9 @@ void check_alloc_align (int flag) #endif } -bool backwardflag = false; /* don't cripple all advanced features */ -bool shorten_file_name = false; /* don't shorten file names to 8+3 for DOS */ -bool usesourcedirectory = true; /* use source file directory as local when WorkingDirectory is set */ /* if working directory set in ini */ +boolean backwardflag = false; /* don't cripple all advanced features */ +boolean shorten_file_name = false; /* don't shorten file names to 8+3 for DOS */ +boolean usesourcedirectory = true; /* use source file directory as local when WorkingDirectory is set */ /* if working directory set in ini */ /* cache to prevent allocating twice in a row */ diff --git a/src/texsourc/openinou.c b/src/texsourc/openinou.c index bce87a5..335c220 100644 --- a/src/texsourc/openinou.c +++ b/src/texsourc/openinou.c @@ -172,9 +172,9 @@ void retwiddle (unsigned char *s) } /* in lib/openclose.c */ -bool open_input (FILE **f, path_constant_type path_index, char *fopen_mode) +boolean open_input (FILE **f, path_constant_type path_index, char *fopen_mode) { - bool openable = false; + boolean openable = false; char * file_name = NULL; #if defined (FUNNY_CORE_DUMP) && !defined (BibTeX) @@ -352,7 +352,7 @@ int check_fclose (FILE * f) } // open_output moved down here to avoid potential pragma problem -bool open_output (FILE **f, char *fopen_mode) +boolean open_output (FILE **f, char *fopen_mode) { unsigned temp_length; diff --git a/src/texsourc/subroute.c b/src/texsourc/subroute.c index 4185e29..2efc5ab 100644 --- a/src/texsourc/subroute.c +++ b/src/texsourc/subroute.c @@ -63,7 +63,7 @@ integer zround (double r) return i; } // texk/web2c/lib/eofeoln.c -bool eoln (FILE * file) +boolean eoln (FILE * file) { register int c; diff --git a/src/texsourc/tex0.c b/src/texsourc/tex0.c index ab8dc7d..28f2379 100644 --- a/src/texsourc/tex0.c +++ b/src/texsourc/tex0.c @@ -844,7 +844,7 @@ void confusion_(char * s) succumb(); } /* sec 0037 */ -bool init_terminal (void) +boolean init_terminal (void) { int flag; @@ -918,11 +918,11 @@ str_number make_string (void) return (str_ptr - 1); } /* sec 0044 */ -bool str_eq_buf_ (str_number s, integer k) +boolean str_eq_buf_ (str_number s, integer k) { - register bool Result; + register boolean Result; pool_pointer j; - bool result; + boolean result; j = str_start[s]; @@ -943,11 +943,11 @@ lab45: return Result; } /* sec 0045 */ -bool str_eq_str_ (str_number s, str_number t) +boolean str_eq_str_ (str_number s, str_number t) { - register bool Result; + register boolean Result; pool_pointer j, k; - bool result; + boolean result; result = false; @@ -1348,7 +1348,7 @@ scaled mult_and_add_(integer n, scaled x, scaled y, scaled maxanswer) scaled x_over_n_(scaled x, integer n) { register scaled Result; - bool negative; + boolean negative; negative = false; @@ -1388,7 +1388,7 @@ scaled x_over_n_(scaled x, integer n) scaled xn_over_d_(scaled x, integer n, integer d) { register scaled Result; - bool positive; + boolean positive; nonnegative_integer t, u, v; if (x >= 0) @@ -1821,7 +1821,7 @@ lab20: overflow("main memory size", mem_max + 1 - mem_min); /* darn: allocation failed ! */ return 0; // abort_flag set } -/* avoid function call in following ? */ + add_variable_space (block_size); /* now to be found in itex.c */ goto lab20; /* go try get_node again */ @@ -2017,10 +2017,10 @@ halfword new_penalty_(integer m) #ifdef DEBUG /* sec 0167 */ -void check_mem_(bool printlocs) +void check_mem_(boolean printlocs) { halfword p, q; - bool clobbered; + boolean clobbered; for (p = mem_min; p <= lo_mem_max; p++) freearr[p] = false; for (p = hi_mem_min; p <= mem_end; p++) freearr[p] = false; @@ -2272,7 +2272,7 @@ void print_mark_ (integer p) { print_char('{'); - if ((p < hi_mem_min)||(p > mem_end)) + if ((p < hi_mem_min) || (p > mem_end)) print_esc("CLOBBERED."); else show_token_list(link(p), 0, max_print_line - 10); @@ -2308,7 +2308,7 @@ void print_glue_(scaled d, integer order, char * s) /* sec 0178 */ void print_spec_(integer p, char * s) { - if ((p < mem_min)||(p >= lo_mem_max)) + if ((p < mem_min) || (p >= lo_mem_max)) print_char('*'); else { @@ -3002,7 +3002,7 @@ void show_node_list_(integer p) } if ((small_fam(right_delimiter(p)) != 0) || (small_char(right_delimiter(p)) != 0) || - (large_fam(right_delimiter(p)) != 0)||(large_char(right_delimiter(p)) != 0)) + (large_fam(right_delimiter(p)) != 0) || (large_char(right_delimiter(p)) != 0)) { print_string(", right-delimiter "); print_delimiter(right_delimiter(p)); diff --git a/src/texsourc/tex1.c b/src/texsourc/tex1.c index 7344bab..d9b1723 100644 --- a/src/texsourc/tex1.c +++ b/src/texsourc/tex1.c @@ -870,7 +870,7 @@ void begin_diagnostic (void) } } /* sec 0245 */ -void end_diagnostic_(bool blankline) +void end_diagnostic_(boolean blankline) { print_nl(""); diff --git a/src/texsourc/tex2.c b/src/texsourc/tex2.c index b27a446..6471d8f 100644 --- a/src/texsourc/tex2.c +++ b/src/texsourc/tex2.c @@ -186,7 +186,7 @@ void show_context (void) { char old_setting; integer nn; - bool bottomline; + boolean bottomline; integer i; integer j; integer l; @@ -1442,11 +1442,11 @@ void scan_optional_equals (void) back_input(); } /* sec 0407 */ -bool scan_keyword_(char * s) +boolean scan_keyword_(const char * s) { halfword p; halfword q; - char * k; + const char * k; p = backup_head; link(p) = 0; @@ -1586,7 +1586,7 @@ void scan_font_ident (void) cur_val = f; } /* sec 0578 */ -void find_font_dimen_(bool writing) +void find_font_dimen_(boolean writing) { internal_font_number f; integer n; @@ -1640,17 +1640,12 @@ void find_font_dimen_(bool writing) cur_val = fmem_ptr - 1; } else if (n > 0) - cur_val = n + param_base[f]; /* 98/Oct/5 */ -// else -// cur_val = (&font_check[f] - &font_info[0]); /* 98/Oct/5 */ -/* checksum = (((font_check[f].b0) << 8 | font_check[f].b1) << 8 | - font_check[f].b2) << 8 | font_check[f].b3; */ + cur_val = n + param_base[f]; } -/* compiler error: '-' : incompatible types - from 'union fmemoryword *' to 'struct fourunsignedchars *' */ + if (cur_val == fmem_ptr) { print_err("Font "); -/* print_esc(hash[(hash_size + 524) + f].rh); */ print_esc(""); print(font_id_text(f)); print_string(" has only "); print_int(font_params[f]); @@ -1661,7 +1656,7 @@ void find_font_dimen_(bool writing) } } /* sec 0413 */ -void scan_something_internal_(small_number level, bool negative) +void scan_something_internal_(small_number level, boolean negative) { halfword m; integer p; @@ -1728,7 +1723,7 @@ void scan_something_internal_(small_number level, bool negative) scan_font_ident(); { - cur_val = font_id_base + cur_val; /* 96/Jan/10 */ + cur_val = font_id_base + cur_val; cur_val_level = ident_val; } } @@ -1763,7 +1758,7 @@ void scan_something_internal_(small_number level, bool negative) break; case set_aux: - if (abs(mode)!= m) + if (abs(mode) != m) { print_err("Improper "); print_cmd_chr(set_aux, m); @@ -1807,7 +1802,7 @@ void scan_something_internal_(small_number level, bool negative) nest[nest_ptr] = cur_list; p = nest_ptr; - while (abs(nest[p].mode_field)!= vmode) + while (abs(nest[p].mode_field) != vmode) decr(p); { diff --git a/src/texsourc/tex3.c b/src/texsourc/tex3.c index c348349..0baadff 100644 --- a/src/texsourc/tex3.c +++ b/src/texsourc/tex3.c @@ -22,11 +22,11 @@ /* sec 0440 */ void scan_int (void) { - bool negative; + boolean negative; integer m; small_number d; - bool vacuous; - bool OKsofar; + boolean vacuous; + boolean OKsofar; radix = 0; OKsofar = true; @@ -158,9 +158,9 @@ lab30:; cur_val = - (integer) cur_val; } /* sec 0448 */ -void scan_dimen_(bool mu, bool inf, bool shortcut) +void scan_dimen_(boolean mu, boolean inf, boolean shortcut) { - bool negative; + boolean negative; integer f; integer num, denom; small_number k, kk; @@ -465,9 +465,9 @@ lab89: /* sec 0461 */ void scan_glue_(small_number level) { - bool negative; + boolean negative; halfword q; - bool mu; + boolean mu; mu = (level == mu_val); negative = false; @@ -620,7 +620,7 @@ halfword the_toks (void) if (cur_val_level >= ident_val) { - p = temp_head; + p = temp_head; link(p) = 0; if (cur_val_level == ident_val) @@ -629,7 +629,7 @@ halfword the_toks (void) { r = link(cur_val); - while (r != 0) /* while r<>null do l.9178 */ + while (r != 0) { fast_store_new_token(info(r)); r = link(r); @@ -761,7 +761,7 @@ void conv_toks (void) begin_token_list(link(temp_head), 4); } /* sec 0473 */ -halfword scan_toks_(bool macrodef, bool xpand) +halfword scan_toks_(boolean macrodef, boolean xpand) { register halfword Result; halfword t; @@ -1110,7 +1110,7 @@ void change_if_limit_(small_number l, halfword p) /* sec 0498 */ void conditional (void) { - bool b; + boolean b; char r; integer m, n; halfword p, q; @@ -1434,7 +1434,7 @@ void begin_name (void) /* We assume tilde has been converted to pseudo_tilde and space to pseudo_space */ /* returns false if it is given a space character - end of file name */ /* sec 0516 */ -bool more_name_(ASCII_code c) +boolean more_name_(ASCII_code c) { if (quoted_file_name == 0 && c == ' ') return false; @@ -2160,7 +2160,7 @@ void job_name_append (void) /* sec 0537 */ void start_input(void) { - bool added_extension = false; + boolean added_extension = false; scan_file_name(); pack_file_name(cur_name, cur_area, cur_ext); @@ -2296,7 +2296,7 @@ void show_tex_fonts (void) internal_font_number read_font_info_(halfword u, str_number nom, str_number aire, scaled s) { font_index k; - bool file_opened; + boolean file_opened; halfword lf, lh, nw, nh, nd, ni, nl, nk, ne, np; int bc, ec; internal_font_number f; @@ -2478,7 +2478,7 @@ internal_font_number read_font_info_(halfword u, str_number nom, str_number aire case list_tag: { { - if ((d < bc)||(d > ec)) + if ((d < bc) || (d > ec)) goto lab11; } diff --git a/src/texsourc/tex4.c b/src/texsourc/tex4.c index 3a607b2..a4ca980 100644 --- a/src/texsourc/tex4.c +++ b/src/texsourc/tex4.c @@ -584,7 +584,7 @@ void hlist_out (void) halfword leader_box; scaled leader_wd; scaled lx; - bool outer_doing_leaders; + boolean outer_doing_leaders; scaled edge; real glue_temp; real cur_glue; @@ -891,7 +891,7 @@ void vlist_out (void) halfword leader_box; scaled leader_ht; scaled lx; - bool outer_doing_leaders; + boolean outer_doing_leaders; scaled edge; real glue_temp; real cur_glue; @@ -1299,7 +1299,7 @@ void ship_out_(halfword p) dvi_ship_out_(p); } /* sec 0645 */ -void scan_spec_(group_code c, bool three_codes) +void scan_spec_(group_code c, boolean three_codes) { integer s; char spec_code; @@ -1424,7 +1424,7 @@ lab21: { link(adjust_tail) = adjust_ptr(p); - while (link(adjust_tail)!= 0) + while (link(adjust_tail) != 0) adjust_tail = link(adjust_tail); p = link(p); @@ -2036,7 +2036,7 @@ halfword var_delimiter_(halfword d, small_number s, scaled v) eight_bits hd; /* small_number z; */ int z; /* 95/Jan/7 */ -/* bool large_attempt; */ +/* boolean large_attempt; */ int large_attempt; /* 95/Jan/7 */ f = null_font; diff --git a/src/texsourc/tex5.c b/src/texsourc/tex5.c index c53092d..b6fdcc0 100644 --- a/src/texsourc/tex5.c +++ b/src/texsourc/tex5.c @@ -669,7 +669,7 @@ small_number make_left_right_(halfword q, small_number style, scaled max_d, scal void mlist_to_hlist (void) { halfword mlist; - bool penalties; + boolean penalties; small_number style; small_number save_style; halfword q; @@ -1878,7 +1878,7 @@ void fin_align (void) /* Moved down here 96/Oct/12 in response to problem with texerror.tex */ /* pragma optimize("a", off) not strong enough - this may slow things */ /* sec 0791 */ -bool fin_col (void) +boolean fin_col (void) { halfword p; halfword q, r; diff --git a/src/texsourc/tex6.c b/src/texsourc/tex6.c index 56b791e..51b51dc 100644 --- a/src/texsourc/tex6.c +++ b/src/texsourc/tex6.c @@ -81,7 +81,7 @@ void try_break_ (integer pi, small_number break_type) halfword r; halfword prev_r; halfword old_l; - bool no_break_yet; + boolean no_break_yet; halfword prev_prev_r; halfword s; halfword q; @@ -89,12 +89,12 @@ void try_break_ (integer pi, small_number break_type) integer t; internal_font_number f; halfword l; - bool node_r_stays_active; + boolean node_r_stays_active; scaled line_width; char fit_class; halfword b; /* current badness */ integer d; - bool artificial_demerits; + boolean artificial_demerits; halfword save_link; scaled shortfall; @@ -595,8 +595,8 @@ lab10: void post_line_break_(integer final_widow_penalty) { halfword q, r, s; - bool disc_break; - bool post_disc_break; + boolean disc_break; + boolean post_disc_break; scaled cur_width; scaled cur_indent; quarterword t; @@ -1950,7 +1950,7 @@ void fire_up_(halfword c) halfword prev_p; /* unsigned char n; */ unsigned int n; /* 95/Jan/7 */ - bool wait; + boolean wait; integer save_vbadness; scaled save_vfuzz; halfword save_split_top_skip; diff --git a/src/texsourc/tex7.c b/src/texsourc/tex7.c index 0a0ab3c..d6cbf1c 100644 --- a/src/texsourc/tex7.c +++ b/src/texsourc/tex7.c @@ -465,7 +465,7 @@ void report_illegal_case (void) error(); } /* sec 1051 */ -bool privileged (void) +boolean privileged (void) { if (mode > 0) return true; @@ -476,7 +476,7 @@ bool privileged (void) } } /* sec 1054 */ -bool its_all_over (void) +boolean its_all_over (void) { if (privileged ()) { @@ -716,7 +716,7 @@ void box_end_(integer box_context) } while(!((cur_cmd != spacer) && (cur_cmd != relax))); - if (((cur_cmd == hskip) && (abs(mode)!= vmode)) || ((cur_cmd == vskip) && (abs(mode) == vmode))) + if (((cur_cmd == hskip) && (abs(mode) != vmode)) || ((cur_cmd == vskip) && (abs(mode) == vmode))) { append_glue(); subtype(tail) = box_context - (leader_flag - a_leaders); @@ -919,7 +919,7 @@ small_number norm_min_ (integer h) return h; } /* sec 1091 */ -void new_graf_(bool indented) +void new_graf_(boolean indented) { prev_graf = 0; @@ -1773,7 +1773,7 @@ void math_limit_switch (void) error(); } /* sec 1160 */ -void scan_delimiter_(halfword p, bool r) +void scan_delimiter_(halfword p, boolean r) { if (r) { diff --git a/src/texsourc/tex8.c b/src/texsourc/tex8.c index 902182b..2873866 100644 --- a/src/texsourc/tex8.c +++ b/src/texsourc/tex8.c @@ -128,8 +128,8 @@ void math_left_right (void) /* sec 1194 */ void after_math (void) { - bool l; - bool danger; + boolean l; + boolean danger; integer m; halfword p; halfword a; diff --git a/src/texsourc/tex9.c b/src/texsourc/tex9.c index ef1234e..46a7c4d 100644 --- a/src/texsourc/tex9.c +++ b/src/texsourc/tex9.c @@ -26,7 +26,7 @@ void give_err_help (void) token_show(err_help); } /* sec 0524 */ -bool open_fmt_file (void) +boolean open_fmt_file (void) { integer j; diff --git a/src/texsourc/texd.h b/src/texsourc/texd.h index 3de3d6b..3da803b 100644 --- a/src/texsourc/texd.h +++ b/src/texsourc/texd.h @@ -28,7 +28,6 @@ #include "texmf.h" // #define max_halfword 65535L /* for 32 bit memory word */ -// #define max_halfword 262143L /* for 36 bit memory word */ #define min_halfword -2147483647L /* for 64 bit memory word (signed) */ #define max_halfword 2147483647L /* for 64 bit memory word (signed) */ @@ -197,8 +196,7 @@ typedef integer dvi_index; /* sec 0920 */ typedef integer trie_op_code; /* sec 0925 */ -typedef integer trie_pointer; -/* typedef short hyph_pointer; */ +typedef integer trie_pointer; typedef integer hyph_pointer; EXTERN integer bad; @@ -238,16 +236,16 @@ EXTERN ASCII_code trick_buf[error_line + 1]; EXTERN integer trick_count; EXTERN integer first_count; EXTERN int interaction; -EXTERN bool deletions_allowed; -EXTERN bool set_box_allowed; +EXTERN boolean deletions_allowed; +EXTERN boolean set_box_allowed; EXTERN int history; EXTERN int error_count; EXTERN char * help_line[6]; EXTERN int help_ptr; -EXTERN bool use_err_help; -EXTERN volatile integer interrupt; /* bkph - do avoid compiler optimization */ -EXTERN bool OK_to_interrupt; -EXTERN bool arith_error; +EXTERN boolean use_err_help; +EXTERN volatile integer interrupt; +EXTERN boolean OK_to_interrupt; +EXTERN boolean arith_error; EXTERN scaled tex_remainder; EXTERN halfword temp_ptr; @@ -286,7 +284,7 @@ EXTERN halfword rover; #ifdef ALLOCATEMAIN EXTERN char *zzzac; #else -/* EXTERN bool */ /* save (4 - 1) * mem_max - mem_min */ +/* EXTERN boolean */ /* save (4 - 1) * mem_max - mem_min */ EXTERN char /* #define wasfree (zzzac - (int)(mem_min)) */ #define wasfree (zzzac - (int)(mem_bot)) @@ -295,7 +293,7 @@ EXTERN char #endif EXTERN halfword was_mem_end, was_lo_max, was_hi_min; -EXTERN bool panicking; +EXTERN boolean panicking; #endif /* DEBUG */ EXTERN integer font_in_short_display; @@ -359,7 +357,7 @@ EXTERN quarterword zzzad[844]; #endif EXTERN halfword hash_used; -EXTERN bool no_new_control_sequence; +EXTERN boolean no_new_control_sequence; EXTERN integer cs_count; /* *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** */ @@ -441,7 +439,7 @@ EXTERN integer align_state; EXTERN integer base_ptr; EXTERN halfword par_loc; EXTERN halfword par_token; -EXTERN bool force_eof; +EXTERN boolean force_eof; EXTERN halfword cur_mark[6]; EXTERN int long_state; EXTERN halfword pstack[10]; @@ -463,9 +461,9 @@ EXTERN pool_pointer area_delimiter; EXTERN pool_pointer ext_delimiter; EXTERN integer format_default_length; EXTERN char * TEX_format_default; -EXTERN bool name_in_progress; -EXTERN bool log_opened; -EXTERN bool quoted_file_name; +EXTERN boolean name_in_progress; +EXTERN boolean log_opened; +EXTERN boolean quoted_file_name; EXTERN str_number job_name; EXTERN str_number output_file_name; EXTERN str_number texmf_log_name; @@ -494,7 +492,7 @@ EXTERN str_number font_area[font_max + 1]; EXTERN eight_bits font_bc[font_max + 1]; EXTERN eight_bits font_ec[font_max + 1]; EXTERN halfword font_glue[font_max + 1]; -EXTERN bool font_used[font_max + 1]; +EXTERN boolean font_used[font_max + 1]; EXTERN integer hyphen_char[font_max + 1]; EXTERN integer skew_char[font_max + 1]; EXTERN font_index bchar_label[font_max + 1]; @@ -518,7 +516,7 @@ EXTERN scaled max_h; EXTERN integer max_push; EXTERN integer last_bop; EXTERN integer dead_cycles; -EXTERN bool doing_leaders; +EXTERN boolean doing_leaders; EXTERN int c, f; EXTERN scaled rule_ht, rule_dp, rule_wd; EXTERN halfword g; @@ -549,7 +547,7 @@ EXTERN halfword cur_mlist; EXTERN int cur_style; EXTERN int cur_size; EXTERN scaled cur_mu; -EXTERN bool mlist_penalties; +EXTERN boolean mlist_penalties; EXTERN internal_font_number cur_f; EXTERN int cur_c; EXTERN four_quarters cur_i; @@ -567,10 +565,10 @@ EXTERN scaled active_width[8]; EXTERN scaled cur_active_width[8]; EXTERN scaled background[8]; EXTERN scaled break_width[8]; -EXTERN bool no_shrink_error_yet; +EXTERN boolean no_shrink_error_yet; EXTERN halfword cur_p; -EXTERN bool second_pass; -EXTERN bool final_pass; +EXTERN boolean second_pass; +EXTERN boolean final_pass; EXTERN integer threshold; EXTERN integer minimal_demerits[4]; EXTERN integer minimum_demerits; @@ -600,14 +598,14 @@ EXTERN integer init_l_hyf, init_r_hyf; EXTERN halfword hyfbchar; EXTERN char hyf[68]; EXTERN halfword init_list; -EXTERN bool init_lig; -EXTERN bool init_lft; +EXTERN boolean init_lig; +EXTERN boolean init_lft; EXTERN int hyphen_passed; EXTERN int cur_l, cur_r; EXTERN halfword cur_q; EXTERN halfword lig_stack; -EXTERN bool ligature_present; -EXTERN bool lft_hit, rt_hit; +EXTERN boolean ligature_present; +EXTERN boolean lft_hit, rt_hit; #ifdef ALLOCATETRIES EXTERN halfword * trie_trl; @@ -671,12 +669,12 @@ EXTERN trie_op_code max_op_used; #ifdef ALLOCATEINI EXTERN char *trie_taken; #else - EXTERN bool trie_taken[trie_size + 1]; + EXTERN boolean trie_taken[trie_size + 1]; #endif EXTERN trie_pointer trie_min[256]; EXTERN trie_pointer trie_max; - EXTERN bool trie_not_ready; + EXTERN boolean trie_not_ready; #endif /* INITEX */ EXTERN scaled best_height_plus_depth; @@ -739,7 +737,7 @@ EXTERN halfword last_glue; EXTERN integer last_penalty; EXTERN scaled last_kern; EXTERN integer insert_penalties; -EXTERN bool output_active; +EXTERN boolean output_active; EXTERN internal_font_number main_f; EXTERN four_quarters main_i; @@ -750,11 +748,11 @@ EXTERN halfword main_p; EXTERN integer main_s; EXTERN halfword bchar; EXTERN halfword false_bchar; -EXTERN bool cancel_boundary; -EXTERN bool ins_disc; +EXTERN boolean cancel_boundary; +EXTERN boolean ins_disc; EXTERN halfword cur_box; EXTERN halfword after_token; -EXTERN bool long_help_seen; +EXTERN boolean long_help_seen; EXTERN str_number format_ident; EXTERN word_file fmt_file; EXTERN gzFile gz_fmt_file; @@ -762,7 +760,7 @@ EXTERN gzFile gz_fmt_file; EXTERN integer ready_already; /* sec 1342 */ EXTERN alpha_file write_file[16]; -EXTERN bool write_open[18]; +EXTERN boolean write_open[18]; /* sec 1345 */ EXTERN halfword write_loc; EXTERN pool_pointer edit_name_start; @@ -770,30 +768,30 @@ EXTERN integer edit_name_length, edit_line; EXTERN int tfm_temp; /* new stuff defined in local.c - bkph */ -EXTERN bool is_initex; -EXTERN bool verbose_flag; -EXTERN bool trace_flag; -EXTERN bool debug_flag; -EXTERN bool open_trace_flag; -EXTERN bool knuth_flag; -EXTERN bool no_interrupts; -EXTERN bool c_style_flag; -EXTERN bool non_ascii; -EXTERN bool key_replace; -EXTERN bool deslash; -EXTERN bool trimeof; -EXTERN bool allow_patterns; -EXTERN bool show_fonts_used; -EXTERN bool reset_exceptions; -EXTERN bool show_current; -EXTERN bool return_flag; -EXTERN bool want_version; -EXTERN bool civilize_flag; -EXTERN bool show_numeric; -EXTERN bool restrict_to_ascii; -EXTERN bool show_missing; -EXTERN bool full_file_name_flag; -EXTERN bool save_strings_flag; +EXTERN boolean is_initex; +EXTERN boolean verbose_flag; +EXTERN boolean trace_flag; +EXTERN boolean debug_flag; +EXTERN boolean open_trace_flag; +EXTERN boolean knuth_flag; +EXTERN boolean no_interrupts; +EXTERN boolean c_style_flag; +EXTERN boolean non_ascii; +EXTERN boolean key_replace; +EXTERN boolean deslash; +EXTERN boolean trimeof; +EXTERN boolean allow_patterns; +EXTERN boolean show_fonts_used; +EXTERN boolean reset_exceptions; +EXTERN boolean show_current; +EXTERN boolean return_flag; +EXTERN boolean want_version; +EXTERN boolean civilize_flag; +EXTERN boolean show_numeric; +EXTERN boolean restrict_to_ascii; +EXTERN boolean show_missing; +EXTERN boolean full_file_name_flag; +EXTERN boolean save_strings_flag; EXTERN int mem_initex; EXTERN int mem_extra_high; EXTERN int mem_extra_low; @@ -803,9 +801,9 @@ EXTERN int show_in_hex; EXTERN int show_in_dos; EXTERN int show_fmt_flag; EXTERN int show_tfm_flag; -EXTERN bool show_texinput_flag; -EXTERN bool truncate_long_lines; -EXTERN bool show_cs_names; +EXTERN boolean show_texinput_flag; +EXTERN boolean truncate_long_lines; +EXTERN boolean show_cs_names; EXTERN int tab_step; EXTERN int pseudo_tilde; EXTERN int pseudo_space; @@ -815,9 +813,9 @@ EXTERN char * format_file; EXTERN char * source_direct; EXTERN char * format_name; EXTERN char * encoding_name; -EXTERN bool format_specific; -EXTERN bool encoding_specific; -EXTERN bool show_line_break_stats; +EXTERN boolean format_specific; +EXTERN boolean encoding_specific; +EXTERN boolean show_line_break_stats; EXTERN int first_pass_count; EXTERN int second_pass_count; EXTERN int final_pass_count; @@ -830,7 +828,7 @@ EXTERN int single_line; EXTERN FILE * errout; EXTERN int font_dimen_zero; EXTERN int ignore_frozen; -EXTERN bool suppress_f_ligs; +EXTERN boolean suppress_f_ligs; EXTERN int abort_flag; EXTERN int err_level; EXTERN int jump_used; @@ -871,7 +869,7 @@ void perrormod(char *); char *grabenv(char *); void stamp_it (char *); void stampcopy (char *); -bool prime (int); +boolean prime (int); int endit (int); void uexit (int unix_code); @@ -926,10 +924,10 @@ typedef struct _mapping_entry mapping_entry; EXTERN HPDF_Doc yandy_pdf; EXTERN HPDF_Page yandy_page; EXTERN HPDF_Font yandy_font[1024]; -EXTERN bool pdf_doing_string; -EXTERN bool pdf_doing_text; +EXTERN boolean pdf_doing_string; +EXTERN boolean pdf_doing_text; EXTERN integer scaled_out; -EXTERN bool pdf_output_flag; +EXTERN boolean pdf_output_flag; EXTERN mapping_table * gentbl; EXTERN mapping_table * font_name_hash_init (void); EXTERN void font_name_hash_free (mapping_table * tbl); diff --git a/src/texsourc/texmf.h b/src/texsourc/texmf.h index aa035a4..659829b 100644 --- a/src/texsourc/texmf.h +++ b/src/texsourc/texmf.h @@ -37,7 +37,7 @@ typedef FILE * byte_file; typedef FILE * word_file; /* Read a line of input as quickly as possible. */ -extern bool input_line (FILE *); +extern boolean input_line (FILE *); #define input_ln(stream, flag) input_line(stream) /* `b_open_in' (and out) is used only for reading (and writing) .tfm @@ -129,4 +129,4 @@ extern int do_undump (char *, int, int, FILE *); /* Declare routines in texmf.c. */ extern void get_date_and_time(); extern void t_open_in(); -extern bool input_line(); \ No newline at end of file +extern boolean input_line(); diff --git a/src/texsourc/texmfmem.h b/src/texsourc/texmfmem.h index a603d19..6701650 100644 --- a/src/texsourc/texmfmem.h +++ b/src/texsourc/texmfmem.h @@ -105,26 +105,8 @@ typedef union { glue_ratio gr; two_halves hh; -#ifdef WORDS_BIGENDIAN integer cint; four_quarters qqqq; -#else /* not WORDS_BIGENDIAN */ - struct - { -#if defined (TeX) && !defined (SMALLTeX) || !defined (TeX) && !defined (SMALLMF) - halfword junk; -#endif /* big TeX or big MF */ - integer CINT; - } u; - - struct - { -#if defined (TeX) && !defined (SMALLTeX) || !defined (TeX) && !defined (SMALLMF) - halfword junk; -#endif /* big TeX or big MF */ - four_quarters QQQQ; - } v; -#endif /* not WORDS_BIGENDIAN */ } memory_word; #ifndef WORDS_BIGENDIAN diff --git a/src/texsourc/yandy_pdf_backend.c b/src/texsourc/yandy_pdf_backend.c index 1285b41..e42abac 100644 --- a/src/texsourc/yandy_pdf_backend.c +++ b/src/texsourc/yandy_pdf_backend.c @@ -19,8 +19,8 @@ #include "texd.h" -bool pdf_doing_string; -bool pdf_doing_text; +boolean pdf_doing_string; +boolean pdf_doing_text; static integer ten_pow[10] = { 1, @@ -249,7 +249,7 @@ scaled divide_scaled(scaled s, scaled m, integer dd) } scaled round_xn_over_d(scaled x, integer n, integer d) { - bool positive; + boolean positive; nonnegative_integer t, u, v; if (x >= 0) @@ -554,7 +554,7 @@ void pdf_hlist_out (void) halfword leader_box; scaled leader_wd; scaled lx; - bool outer_doing_leaders; + boolean outer_doing_leaders; scaled edge; real glue_temp; real cur_glue; @@ -819,7 +819,7 @@ void pdf_vlist_out (void) halfword leader_box; scaled leader_ht; scaled lx; - bool outer_doing_leaders; + boolean outer_doing_leaders; scaled edge; real glue_temp; real cur_glue; diff --git a/src/texsourc/yandytex.c b/src/texsourc/yandytex.c index 941e738..4986f74 100644 --- a/src/texsourc/yandytex.c +++ b/src/texsourc/yandytex.c @@ -332,7 +332,7 @@ void show_bad_line (FILE *output, int first, int last) } // split off for convenience and use in ConsoleInput -bool input_line_finish (void) +boolean input_line_finish (void) { int i = '\0'; int ch, flag; @@ -414,7 +414,7 @@ bool input_line_finish (void) length(line except trailing whitespace). */ /* texmfmp.c */ -bool input_line (FILE *f) +boolean input_line (FILE *f) { // int ch, flag; /* for restrict_to_ascii case 94/Jan/21 */ char *u; /* 1994/July/3 for key_replace */ diff --git a/src/texsourc/yandytex.h b/src/texsourc/yandytex.h index 309dd25..4b41e6a 100644 --- a/src/texsourc/yandytex.h +++ b/src/texsourc/yandytex.h @@ -62,7 +62,6 @@ typedef long long integer; typedef double glue_ratio; -typedef boolean bool; typedef double real; typedef FILE * alpha_file; typedef unsigned char ASCII_code; @@ -105,9 +104,9 @@ typedef enum #define MAXLINE 256 extern integer zround (double); -extern bool eoln (FILE * file); -extern bool open_input (FILE **f, path_constant_type path_index, char *fopen_mode); -extern bool open_output (FILE **f, char *fopen_mode); +extern boolean eoln (FILE * file); +extern boolean open_input (FILE **f, path_constant_type path_index, char *fopen_mode); +extern boolean open_output (FILE **f, char *fopen_mode); extern int check_fclose (FILE * f); #define show_line(str,flag) fputs(str,stdout) -- 2.11.0