Port interaction variable and pre_error_message

CraftSpider · CraftSpider · commit 34e0b40a2c02 · 2025-09-10T13:01:51.000-07:00
diff --git a/crates/engine_xetex/src/c_api/engine.rs b/crates/engine_xetex/src/c_api/engine.rs
@@ -51,6 +51,7 @@ pub struct EngineCtx {
     pub(crate) input_stack: Vec<InputState>,
     pub(crate) input_ptr: usize,
     pub(crate) cur_input: InputState,
+    pub(crate) interaction: InteractionMode,
 
     pub(crate) eqtb: Vec<MemoryWord>,
     pub(crate) prim: Box<[B32x2; PRIM_SIZE + 1]>,
@@ -59,6 +60,28 @@ pub struct EngineCtx {
     pub(crate) buffer: Vec<char>,
 }
 
+#[derive(Copy, Clone, PartialEq, Eq)]
+pub enum InteractionMode {
+    Batch = 0,
+    Nonstop,
+    Scroll,
+    ErrorStop,
+}
+
+impl TryFrom<u8> for InteractionMode {
+    type Error = u8;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        Ok(match value {
+            0 => InteractionMode::Batch,
+            1 => InteractionMode::Nonstop,
+            2 => InteractionMode::Scroll,
+            3 => InteractionMode::ErrorStop,
+            _ => return Err(value),
+        })
+    }
+}
+
 #[derive(Clone, Default, PartialEq)]
 #[repr(C)]
 pub struct InputState {
@@ -108,6 +131,7 @@ impl EngineCtx {
             input_stack: Vec::new(),
             input_ptr: 0,
             cur_input: InputState::default(),
+            interaction: InteractionMode::Batch,
 
             eqtb: Vec::new(),
             prim: Box::new([B32x2 { s0: 0, s1: 0 }; PRIM_SIZE + 1]),
@@ -501,6 +525,17 @@ 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 interaction() -> u8 {
+    ENGINE_CTX.with_borrow(|engine| engine.interaction as u8)
+}
+
+#[no_mangle]
+pub extern "C" fn set_interaction(val: u8) {
+    ENGINE_CTX
+        .with_borrow_mut(|engine| engine.interaction = InteractionMode::try_from(val).unwrap())
+}
+
 #[no_mangle]
 pub extern "C" fn eqtb(idx: usize) -> MemoryWord {
     ENGINE_CTX.with_borrow(|engine| engine.eqtb[idx])
diff --git a/crates/engine_xetex/src/c_api/errors.rs b/crates/engine_xetex/src/c_api/errors.rs
@@ -0,0 +1,30 @@
+use crate::c_api::engine::{rs_open_log_file, InteractionMode, Selector};
+use crate::c_api::globals::Globals;
+use crate::c_api::output::rs_error_here_with_diagnostic;
+
+pub fn rs_pre_error_message(globals: &mut Globals<'_, '_>) {
+    if globals.engine.log_opened {
+        globals.engine.selector = Selector::TermAndLog;
+    } else {
+        globals.engine.selector = Selector::TermOnly;
+    }
+
+    if globals.engine.job_name == 0 {
+        rs_open_log_file(globals);
+    }
+
+    if globals.engine.interaction == InteractionMode::Batch {
+        globals.engine.selector = match globals.engine.selector {
+            Selector::TermAndLog => Selector::LogOnly,
+            Selector::TermOnly => Selector::NoPrint,
+            _ => panic!(),
+        }
+    }
+
+    rs_error_here_with_diagnostic(globals, b"");
+}
+
+#[no_mangle]
+extern "C" fn pre_error_message() {
+    Globals::with(|globals| rs_pre_error_message(globals))
+}
diff --git a/crates/engine_xetex/src/lib.rs b/crates/engine_xetex/src/lib.rs
@@ -237,6 +237,7 @@ pub mod c_api {
     use tectonic_bridge_core::CoreBridgeState;
 
     mod engine;
+    mod errors;
     mod globals;
     mod hash;
     mod inputs;
diff --git a/crates/engine_xetex/xetex/xetex-errors.c b/crates/engine_xetex/xetex/xetex-errors.c
@@ -11,34 +11,14 @@
 
 /* WEBby error-handling code: */
 
-static void
-pre_error_message (void)
-{
-    /* FKA normalize_selector(): */
-
-    if (log_opened())
-        set_selector(SELECTOR_TERM_AND_LOG);
-    else
-        set_selector(SELECTOR_TERM_ONLY);
-
-    if (job_name() == 0)
-        open_log_file();
-
-    if (interaction == BATCH_MODE)
-        set_selector(selector()-1);
-
-    error_here_with_diagnostic("");
-}
-
-
 /*82: */
 static void
 post_error_message(int need_to_print_it)
 {
     capture_to_diagnostic(NULL);
 
-    if (interaction == ERROR_STOP_MODE)
-        interaction = SCROLL_MODE;
+    if (interaction() == ERROR_STOP_MODE)
+        set_interaction(SCROLL_MODE);
 
     if (need_to_print_it && log_opened())
         error();
@@ -76,7 +56,7 @@ error(void)
         _tt_abort("halted after 100 potentially-recoverable errors");
     }
 
-    if (interaction > BATCH_MODE)
+    if (interaction() > BATCH_MODE)
         set_selector(selector()-1);
 
     if (use_err_help) {
@@ -90,7 +70,7 @@ error(void)
     }
 
     print_ln();
-    if (interaction > BATCH_MODE)
+    if (interaction() > BATCH_MODE)
         set_selector(selector()+1);
     print_ln();
 }
diff --git a/crates/engine_xetex/xetex/xetex-ini.c b/crates/engine_xetex/xetex/xetex-ini.c
@@ -51,7 +51,6 @@ UTF16_code *native_text;
 int32_t native_text_size;
 int32_t native_len;
 int32_t save_native_len;
-unsigned char interaction;
 bool deletions_allowed;
 bool set_box_allowed;
 tt_history_t history;
@@ -2053,8 +2052,8 @@ store_fmt_file(void)
         help_ptr = 1;
         help_line[0] = "`{...\\dump}' is a no-no.";
 
-        if (interaction == ERROR_STOP_MODE)
-            interaction = SCROLL_MODE;
+        if (interaction() == ERROR_STOP_MODE)
+            set_interaction(SCROLL_MODE);
         if (log_opened())
             error();
 
@@ -2075,7 +2074,7 @@ store_fmt_file(void)
     print_int(INTPAR(day));
     print_char(')');
 
-    if (interaction == BATCH_MODE)
+    if (interaction() == BATCH_MODE)
         set_selector(SELECTOR_LOG_ONLY);
     else
         set_selector(SELECTOR_TERM_AND_LOG);
@@ -2939,7 +2938,7 @@ final_cleanup(void)
     }
 
     if (history != HISTORY_SPOTLESS) {
-        if ((history == HISTORY_WARNING_ISSUED || (interaction < ERROR_STOP_MODE))) {
+        if ((history == HISTORY_WARNING_ISSUED || (interaction() < ERROR_STOP_MODE))) {
 
             if (selector() == SELECTOR_TERM_AND_LOG) {
                 set_selector(SELECTOR_TERM_ONLY);
@@ -3018,7 +3017,7 @@ initialize_more_variables(void)
     native_text_size = 128;
     native_text = xmalloc(native_text_size * sizeof(UTF16_code));
 
-    interaction = ERROR_STOP_MODE;
+    set_interaction(ERROR_STOP_MODE);
 
     deletions_allowed = true;
     set_box_allowed = true;
@@ -3815,7 +3814,7 @@ tt_run_engine(const char *dump_name, const char *input_file_name, time_t build_d
     random_seed = (microseconds * 1000) + (epochseconds % 1000000L);
     init_randoms(random_seed);
 
-    if (interaction == BATCH_MODE)
+    if (interaction() == BATCH_MODE)
         set_selector(SELECTOR_NO_PRINT);
     else
         set_selector(SELECTOR_TERM_ONLY); /*:79*/
diff --git a/crates/engine_xetex/xetex/xetex-xetex0.c b/crates/engine_xetex/xetex/xetex-xetex0.c
@@ -7306,7 +7306,7 @@ scan_something_internal(small_number level, bool negative)
         if (m == 0)
             cur_val = dead_cycles;
         else if (m == 2)
-            cur_val = interaction;
+            cur_val = interaction();
         else
             cur_val = insert_penalties;
         cur_val_level = INT_VAL;
@@ -15928,8 +15928,8 @@ void new_font(small_number a)
 void new_interaction(void)
 {
     print_ln();
-    interaction = cur_chr;
-    if (interaction == BATCH_MODE)
+    set_interaction(cur_chr);
+    if (interaction() == BATCH_MODE)
         set_selector(SELECTOR_NO_PRINT);
     else
         set_selector(SELECTOR_TERM_ONLY);
@@ -15974,7 +15974,7 @@ void issue_message(void)
             help_line[0] = "(That was another \\errmessage.)";
         } else {
 
-            if (interaction < ERROR_STOP_MODE)
+            if (interaction() < ERROR_STOP_MODE)
                 long_help_seen = true;
             {
                 help_ptr = 4;
@@ -16151,7 +16151,7 @@ void show_whatever(void)
 
 common_ending:
     capture_to_diagnostic(NULL); // calling with null twice is fine
-    if (interaction < ERROR_STOP_MODE) {
+    if (interaction() < ERROR_STOP_MODE) {
         help_ptr = 0;
         error_count--;
     } else if (INTPAR(tracing_online) > 0) {
diff --git a/crates/engine_xetex/xetex/xetex-xetexd.h b/crates/engine_xetex/xetex/xetex-xetexd.h
@@ -411,7 +411,6 @@ extern UTF16_code *native_text;
 extern int32_t native_text_size;
 extern int32_t native_len;
 extern int32_t save_native_len;
-extern unsigned char interaction;
 extern bool deletions_allowed;
 extern bool set_box_allowed;
 extern tt_history_t history;
diff --git a/crates/engine_xetex/xetex/xetex_bindings.h b/crates/engine_xetex/xetex/xetex_bindings.h
@@ -250,6 +250,10 @@ input_state_t *cur_input_ptr(void);
 
 void set_cur_input(input_state_t val);
 
+uint8_t interaction(void);
+
+void set_interaction(uint8_t val);
+
 MemoryWord eqtb(uintptr_t idx);
 
 void set_eqtb(uintptr_t idx, MemoryWord val);
@@ -304,6 +308,10 @@ bool more_name(uint16_t c);
 
 StrNumber make_name_string(void);
 
+void open_log_file(void);
+
+void pre_error_message(void);
+
 void resize_hash(uintptr_t len);
 
 B32x2 hash(uintptr_t idx);
