Port input_ptr and cur_input variable

Author: CraftSpider

crates/engine_xetex/src/c_api/engine.rs

@@ -7,6 +7,7 @@ use std::{ptr, slice};
 mod memory;
 
 use crate::c_api::is_dir_sep;
+use crate::c_api::output::{rs_print, rs_print_ln, rs_print_nl_bytes};
 use crate::c_api::pool::{
     rs_make_string, rs_search_string, rs_slow_make_string, StringPool, EMPTY_STRING, TOO_BIG_CHAR,
 };
@@ -48,6 +49,8 @@ pub struct EngineCtx {
     pub(crate) texmf_log_name: StrNumber,
     pub(crate) log_opened: bool,
     pub(crate) input_stack: Vec<InputState>,
+    pub(crate) input_ptr: usize,
+    pub(crate) cur_input: InputState,
 
     pub(crate) eqtb: Vec<MemoryWord>,
     pub(crate) prim: Box<[B32x2; PRIM_SIZE + 1]>,
@@ -103,6 +106,8 @@ impl EngineCtx {
             texmf_log_name: 0,
             log_opened: false,
             input_stack: Vec::new(),
+            input_ptr: 0,
+            cur_input: InputState::default(),
 
             eqtb: Vec::new(),
             prim: Box::new([B32x2 { s0: 0, s1: 0 }; PRIM_SIZE + 1]),
@@ -471,6 +476,31 @@ pub extern "C" fn clear_input_stack() {
     ENGINE_CTX.with_borrow_mut(|engine| engine.input_stack.clear())
 }
 
+#[no_mangle]
+pub extern "C" fn input_ptr() -> usize {
+    ENGINE_CTX.with_borrow(|engine| engine.input_ptr)
+}
+
+#[no_mangle]
+pub extern "C" fn set_input_ptr(val: usize) {
+    ENGINE_CTX.with_borrow_mut(|engine| engine.input_ptr = val)
+}
+
+#[no_mangle]
+pub extern "C" fn cur_input() -> InputState {
+    ENGINE_CTX.with_borrow(|engine| engine.cur_input.clone())
+}
+
+#[no_mangle]
+pub extern "C" fn cur_input_ptr() -> *mut InputState {
+    ENGINE_CTX.with_borrow_mut(|engine| ptr::from_mut(&mut engine.cur_input))
+}
+
+#[no_mangle]
+pub extern "C" fn set_cur_input(val: InputState) {
+    ENGINE_CTX.with_borrow_mut(|engine| engine.cur_input = val)
+}
+
 #[no_mangle]
 pub extern "C" fn eqtb(idx: usize) -> MemoryWord {
     ENGINE_CTX.with_borrow(|engine| engine.eqtb[idx])

crates/engine_xetex/src/c_api/output.rs

@@ -27,7 +27,7 @@ pub struct OutputCtx {
     term_offset: i32,
     file_offset: i32,
     rust_stdout: Option<OutputId>,
-    log_file: Option<OutputId>,
+    pub(crate) log_file: Option<OutputId>,
     write_file: Vec<Option<OutputId>>,
     doing_special: bool,
     digits: [u8; 23],

crates/engine_xetex/xetex/xetex-ini.c

@@ -99,9 +99,7 @@ eight_bits cur_cmd;
 int32_t cur_chr;
 int32_t cur_cs;
 int32_t cur_tok;
-int32_t input_ptr;
 int32_t max_in_stack;
-input_state_t cur_input;
 int32_t open_parens;
 UFILE **input_file;
 str_number *source_filename_stack;
@@ -2420,7 +2418,7 @@ load_fmt_file(void)
     int32_t x;
     rust_input_handle_t fmt_in;
 
-    j = cur_input.loc;
+    j = cur_input().loc;
 
     /* This is where a first line starting with "&" used to
      * trigger code that would change the format file. */
@@ -2431,7 +2429,7 @@ load_fmt_file(void)
     if (fmt_in == INVALID_HANDLE)
         _tt_abort("cannot open the format file \"%s\"", name_of_file());
 
-    cur_input.loc = j;
+    cur_input_ptr()->loc = j;
 
     if (in_initex_mode) {
         free(font_info);
@@ -2904,8 +2902,8 @@ final_cleanup(void)
     if (job_name() == 0)
         open_log_file();
 
-    while (input_ptr > 0)
-        if (cur_input.state == TOKEN_LIST)
+    while (input_ptr() > 0)
+        if (cur_input().state == TOKEN_LIST)
             end_token_list();
         else
             end_file_reading();
@@ -3004,8 +3002,8 @@ init_io(void)
 
     set_buffer(first, 0);
     last = first;
-    cur_input.loc = first;
-    cur_input.limit = last;
+    cur_input_ptr()->loc = first;
+    cur_input_ptr()->limit = last;
     first = last + 1;
 }
 
@@ -3675,7 +3673,7 @@ tt_run_engine(const char *dump_name, const char *input_file_name, time_t build_d
     else
         output_file_extension = ".xdv";
 
-    input_ptr = 0;
+    set_input_ptr(0);
     max_in_stack = 0;
     source_filename_stack[0] = 0;
     set_full_source_filename_stack(0, 0);
@@ -3695,11 +3693,11 @@ tt_run_engine(const char *dump_name, const char *input_file_name, time_t build_d
     scanner_status = NORMAL;
     warning_index = TEX_NULL;
     first = 1;
-    cur_input.state = NEW_LINE;
-    cur_input.start = 1;
-    cur_input.index = 0;
+    cur_input_ptr()->state = NEW_LINE;
+    cur_input_ptr()->start = 1;
+    cur_input_ptr()->index = 0;
     set_line(0);
-    cur_input.name = 0;
+    cur_input_ptr()->name = 0;
     force_eof = false;
     align_state = 1000000L;
 
@@ -3719,9 +3717,9 @@ tt_run_engine(const char *dump_name, const char *input_file_name, time_t build_d
     }
 
     if (INTPAR(end_line_char) < 0 || INTPAR(end_line_char) > BIGGEST_CHAR)
-        cur_input.limit--;
+        cur_input_ptr()->limit--;
     else
-        set_buffer(cur_input.limit, INTPAR(end_line_char));
+        set_buffer(cur_input().limit, INTPAR(end_line_char));
 
     if (in_initex_mode) {
         /* TeX initializes with the real date and time, but for format file

crates/engine_xetex/xetex/xetex-synctex.c

@@ -337,10 +337,10 @@ void synctex_start_input(void)
          *  use the 16 other bits to store the column number */
         synctex_ctxt.synctex_tag_counter = 0;
         /* was this, but this looks like a bug */
-        /* cur_input.synctex_tag = 0; */
+        /* cur_input_ptr()->synctex_tag = 0; */
         return;
     }
-    cur_input.synctex_tag = (int) synctex_ctxt.synctex_tag_counter;     /*  -> *TeX.web  */
+    cur_input_ptr()->synctex_tag = (int) synctex_ctxt.synctex_tag_counter;     /*  -> *TeX.web  */
     if (synctex_ctxt.synctex_tag_counter == 1) {
         /*  this is the first file TeX ever opens, in general \jobname.tex we
          *  do not know yet if synchronization will ever be enabled so we have
@@ -357,7 +357,7 @@ void synctex_start_input(void)
         || (INVALID_HANDLE != synctex_dot_open())) {
         char *tmp = get_current_name();
         /* Always record the input, even if INTPAR(synctex) is 0 */
-        synctex_record_input(cur_input.synctex_tag, tmp);
+        synctex_record_input(cur_input().synctex_tag, tmp);
         free(tmp);
     }
     return;