Port history variable

Author: CraftSpider

crates/engine_xetex/src/c_api/engine.rs

@@ -52,6 +52,7 @@ pub struct EngineCtx {
     pub(crate) input_ptr: usize,
     pub(crate) cur_input: InputState,
     pub(crate) interaction: InteractionMode,
+    pub(crate) history: History,
 
     pub(crate) eqtb: Vec<MemoryWord>,
     pub(crate) prim: Box<[B32x2; PRIM_SIZE + 1]>,
@@ -105,6 +106,29 @@ struct NodeError {
     subty: u16,
 }
 
+#[derive(Copy, Clone, PartialEq, Eq)]
+#[repr(C)]
+pub enum History {
+    Spotless = 0,
+    WarningIssued = 1,
+    ErrorIssued = 2,
+    FatalError = 3,
+}
+
+impl TryFrom<u8> for History {
+    type Error = u8;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        Ok(match value {
+            0 => History::Spotless,
+            1 => History::WarningIssued,
+            2 => History::ErrorIssued,
+            3 => History::FatalError,
+            _ => return Err(value),
+        })
+    }
+}
+
 impl EngineCtx {
     fn new() -> EngineCtx {
         EngineCtx {
@@ -132,6 +156,7 @@ impl EngineCtx {
             input_ptr: 0,
             cur_input: InputState::default(),
             interaction: InteractionMode::Batch,
+            history: History::Spotless,
 
             eqtb: Vec::new(),
             prim: Box::new([B32x2 { s0: 0, s1: 0 }; PRIM_SIZE + 1]),
@@ -536,6 +561,16 @@ pub extern "C" fn set_interaction(val: u8) {
         .with_borrow_mut(|engine| engine.interaction = InteractionMode::try_from(val).unwrap())
 }
 
+#[no_mangle]
+pub extern "C" fn history() -> History {
+    ENGINE_CTX.with_borrow(|engine| engine.history)
+}
+
+#[no_mangle]
+pub extern "C" fn set_history(val: u8) {
+    ENGINE_CTX.with_borrow_mut(|engine| engine.history = History::try_from(val).unwrap())
+}
+
 #[no_mangle]
 pub extern "C" fn eqtb(idx: usize) -> MemoryWord {
     ENGINE_CTX.with_borrow(|engine| engine.eqtb[idx])

crates/engine_xetex/xetex/xetex-errors.c

@@ -23,7 +23,7 @@ post_error_message(int need_to_print_it)
     if (need_to_print_it && log_opened())
         error();
 
-    history = HISTORY_FATAL_ERROR;
+    set_history(HISTORY_FATAL_ERROR);
     close_files_and_terminate();
     tt_cleanup();
     ttstub_output_flush(rust_stdout());
@@ -33,13 +33,13 @@ post_error_message(int need_to_print_it)
 void
 error(void)
 {
-    if (history < HISTORY_ERROR_ISSUED)
-        history = HISTORY_ERROR_ISSUED;
+    if (history() < HISTORY_ERROR_ISSUED)
+        set_history(HISTORY_ERROR_ISSUED);
 
     print_char('.');
     show_context();
     if (halt_on_error_p) {
-        history = HISTORY_FATAL_ERROR;
+        set_history(HISTORY_FATAL_ERROR);
         post_error_message(0);
         _tt_abort("halted on potentially-recoverable error as specified");
     }
@@ -51,7 +51,7 @@ error(void)
     error_count++;
     if (error_count == 100) {
         print_nl_cstr("(That makes 100 errors; please try again.)");
-        history = HISTORY_FATAL_ERROR;
+        set_history(HISTORY_FATAL_ERROR);
         post_error_message(0);
         _tt_abort("halted after 100 potentially-recoverable errors");
     }
@@ -115,7 +115,7 @@ confusion(const char* s)
 {
     pre_error_message();
 
-    if (history < HISTORY_ERROR_ISSUED) {
+    if (history() < HISTORY_ERROR_ISSUED) {
         print_cstr("This can't happen (");
         print_cstr(s);
         print_char(')');

crates/engine_xetex/xetex/xetex-ini.c

@@ -53,7 +53,6 @@ int32_t native_len;
 int32_t save_native_len;
 bool deletions_allowed;
 bool set_box_allowed;
-tt_history_t history;
 signed char error_count;
 const char* help_line[6];
 unsigned char help_ptr;
@@ -2057,7 +2056,7 @@ store_fmt_file(void)
         if (log_opened())
             error();
 
-        history = HISTORY_FATAL_ERROR;
+        set_history(HISTORY_FATAL_ERROR);
         close_files_and_terminate();
         ttstub_output_flush(rust_stdout());
         _tt_abort("\\dump inside a group");
@@ -2937,8 +2936,8 @@ final_cleanup(void)
         free_node(temp_ptr, IF_NODE_SIZE);
     }
 
-    if (history != HISTORY_SPOTLESS) {
-        if ((history == HISTORY_WARNING_ISSUED || (interaction() < ERROR_STOP_MODE))) {
+    if (history() != HISTORY_SPOTLESS) {
+        if ((history() == HISTORY_WARNING_ISSUED || (interaction() < ERROR_STOP_MODE))) {
 
             if (selector() == SELECTOR_TERM_AND_LOG) {
                 set_selector(SELECTOR_TERM_ONLY);
@@ -3602,7 +3601,7 @@ tt_run_engine(const char *dump_name, const char *input_file_name, time_t build_d
 
     /* Sanity-check various invariants. */
 
-    history = HISTORY_FATAL_ERROR;
+    set_history(HISTORY_FATAL_ERROR);
     bad = 0;
 
     if (half_error_line < 30 || half_error_line > error_line() - 15)
@@ -3712,7 +3711,7 @@ tt_run_engine(const char *dump_name, const char *input_file_name, time_t build_d
 
     if (!in_initex_mode) {
         if (!load_fmt_file())
-            return history;
+            return history();
     }
 
     if (INTPAR(end_line_char) < 0 || INTPAR(end_line_char) > BIGGEST_CHAR)
@@ -3825,12 +3824,12 @@ tt_run_engine(const char *dump_name, const char *input_file_name, time_t build_d
     pdf_files_init();
     synctex_init_command();
     start_input(input_file_name);
-    history = HISTORY_SPOTLESS;
+    set_history(HISTORY_SPOTLESS);
     main_control();
     final_cleanup();
     close_files_and_terminate();
 
     tt_cleanup();
 
-    return history;
+    return history();
 }

crates/engine_xetex/xetex/xetex-xetex0.c

@@ -2110,8 +2110,8 @@ void begin_diagnostic(void)
 
     if (INTPAR(tracing_online) <= 0 && selector() == SELECTOR_TERM_AND_LOG) {
         set_selector(selector()-1);
-        if (history == HISTORY_SPOTLESS)
-            history = HISTORY_WARNING_ISSUED;
+        if (history() == HISTORY_SPOTLESS)
+            set_history(HISTORY_WARNING_ISSUED);
     }
 }
 
@@ -4023,8 +4023,8 @@ void group_warning(void)
 
         if (INTPAR(tracing_nesting) > 1)
             show_context();
-        if (history == HISTORY_SPOTLESS)
-            history = HISTORY_WARNING_ISSUED;
+        if (history() == HISTORY_SPOTLESS)
+            set_history(HISTORY_WARNING_ISSUED);
 
         capture_to_diagnostic(NULL);
     }
@@ -4066,8 +4066,8 @@ void if_warning(void)
             show_context();
 
         capture_to_diagnostic(NULL);
-        if (history == HISTORY_SPOTLESS)
-            history = HISTORY_WARNING_ISSUED;
+        if (history() == HISTORY_SPOTLESS)
+            set_history(HISTORY_WARNING_ISSUED);
     }
 }
 
@@ -4131,8 +4131,8 @@ void file_warning(void)
         show_context();
         capture_to_diagnostic(NULL);
     }
-    if (history == HISTORY_SPOTLESS)
-        history = HISTORY_WARNING_ISSUED;
+    if (history() == HISTORY_SPOTLESS)
+        set_history(HISTORY_WARNING_ISSUED);
 }
 
 void delete_sa_ref(int32_t q)

crates/engine_xetex/xetex/xetex-xetexd.h

@@ -413,7 +413,6 @@ extern int32_t native_len;
 extern int32_t save_native_len;
 extern bool deletions_allowed;
 extern bool set_box_allowed;
-extern tt_history_t history;
 extern signed char error_count;
 extern const char* help_line[6];
 extern unsigned char help_ptr;

crates/engine_xetex/xetex/xetex_bindings.h

@@ -64,6 +64,13 @@
 
 #define TOO_BIG_CHAR 65536
 
+typedef enum {
+  History_Spotless = 0,
+  History_WarningIssued = 1,
+  History_ErrorIssued = 2,
+  History_FatalError = 3,
+} History;
+
 typedef int32_t StrNumber;
 
 typedef struct {
@@ -254,6 +261,10 @@ uint8_t interaction(void);
 
 void set_interaction(uint8_t val);
 
+History history(void);
+
+void set_history(uint8_t val);
+
 MemoryWord eqtb(uintptr_t idx);
 
 void set_eqtb(uintptr_t idx, MemoryWord val);