Port begin_name and end_name

Author: CraftSpider

crates/engine_xetex/src/c_api/engine.rs

@@ -6,7 +6,9 @@ use std::{ptr, slice};
 
 mod memory;
 
-use crate::c_api::pool::{rs_make_string, StringPool, EMPTY_STRING};
+use crate::c_api::pool::{
+    rs_make_string, rs_search_string, rs_slow_make_string, StringPool, EMPTY_STRING, TOO_BIG_CHAR,
+};
 pub use memory::*;
 
 pub const NULL_CS: usize = 0x220001;
@@ -547,6 +549,90 @@ pub fn rs_make_utf16_name(engine: &mut EngineCtx) {
         .map(|s| s.encode_utf16().collect());
 }
 
+pub fn rs_begin_name(globals: &mut Globals<'_, '_>) {
+    globals.engine.area_delimiter = 0;
+    globals.engine.ext_delimiter = 0;
+    globals.engine.quoted_filename = false;
+    globals.engine.file_name_quote_char = 0;
+}
+
+pub fn rs_end_name(globals: &mut Globals<'_, '_>) {
+    if globals.strings.str_ptr + 3 > globals.strings.max_strings {
+        todo!("overflow(\"number of strings\", max_strings() - init_str_ptr)");
+    }
+
+    /* area_delimiter is the length from the start of the filename to the
+     * directory seperator "/", which we use to construct the stringpool
+     * string `cur_area`. If there was already a string in the stringpool for
+     * the area, reuse it. */
+
+    if globals.engine.area_delimiter == 0 {
+        globals.engine.cur_area = EMPTY_STRING;
+    } else {
+        globals.engine.cur_area = globals.strings.str_ptr as StrNumber;
+        globals.strings.str_start[globals.strings.str_ptr + 1 - 0x10000] =
+            globals.strings.str_start[globals.strings.str_ptr - TOO_BIG_CHAR]
+                + globals.engine.area_delimiter as u32;
+        globals.strings.str_ptr += 1;
+
+        let temp_str = rs_search_string(globals.strings, globals.engine.cur_area);
+
+        if temp_str > 0 {
+            globals.engine.cur_area = temp_str;
+            globals.strings.str_ptr -= 1;
+
+            for j in (globals.strings.str_start[globals.strings.str_ptr + 1 - 0x10000] as usize)
+                ..globals.strings.pool_ptr
+            {
+                globals.strings.str_pool[j - globals.engine.area_delimiter] =
+                    globals.strings.str_pool[j];
+            }
+
+            globals.strings.pool_ptr -= globals.engine.area_delimiter;
+        }
+    }
+
+    /* ext_delimiter is the length from the start of the filename to the
+     * extension '.' delimiter, which we use to construct the stringpool
+     * strings `cur_ext` and `cur_name`. */
+
+    if globals.engine.ext_delimiter == 0 {
+        globals.engine.cur_ext = EMPTY_STRING;
+        globals.engine.cur_name = rs_slow_make_string(globals.strings);
+    } else {
+        globals.engine.cur_name = globals.strings.str_ptr as StrNumber;
+        globals.strings.str_start[globals.strings.str_ptr + 1 - 0x10000] =
+            globals.strings.str_start[globals.strings.str_ptr - TOO_BIG_CHAR]
+                + globals.engine.ext_delimiter as u32
+                - globals.engine.area_delimiter as u32
+                - 1;
+        globals.strings.str_ptr += 1;
+
+        globals.engine.cur_ext = rs_make_string(globals.strings);
+        globals.strings.str_ptr -= 1;
+
+        let temp_str = rs_search_string(globals.strings, globals.engine.cur_name);
+
+        if temp_str > 0 {
+            globals.engine.cur_name = temp_str;
+            globals.strings.str_ptr -= 1;
+
+            for j in (globals.strings.str_start[globals.strings.str_ptr + 1 - 0x10000] as usize)
+                ..globals.strings.pool_ptr
+            {
+                globals.strings.str_pool
+                    [j - globals.engine.ext_delimiter + globals.engine.area_delimiter + 1] =
+                    globals.strings.str_pool[j];
+            }
+
+            globals.strings.pool_ptr -=
+                globals.engine.ext_delimiter - globals.engine.area_delimiter - 1;
+        }
+    }
+
+    globals.engine.cur_ext = rs_slow_make_string(globals.strings);
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn maketexstring(str: *const libc::c_char) -> StrNumber {
     if str.is_null() {
@@ -580,3 +666,13 @@ pub extern "C" fn pack_job_name(s: *const libc::c_char) {
 pub extern "C" fn make_utf16_name() {
     ENGINE_CTX.with_borrow_mut(|engine| rs_make_utf16_name(engine))
 }
+
+#[no_mangle]
+pub extern "C" fn begin_name() {
+    Globals::with(|globals| rs_begin_name(globals))
+}
+
+#[no_mangle]
+pub extern "C" fn end_name() {
+    Globals::with(|globals| rs_end_name(globals))
+}

crates/engine_xetex/xetex/xetex-xetex0.c

@@ -10601,17 +10601,6 @@ conditional(void)
     }
 }
 
-
-void
-begin_name(void)
-{
-    set_area_delimiter(0);
-    set_ext_delimiter(0);
-    set_quoted_filename(false);
-    set_file_name_quote_char(0);
-}
-
-
 bool
 more_name(UTF16_code c)
 {
@@ -10645,71 +10634,6 @@ more_name(UTF16_code c)
     return true;
 }
 
-
-void
-end_name(void)
-{
-    str_number temp_str;
-    pool_pointer j;
-
-    if (str_ptr() + 3 > max_strings())
-        overflow("number of strings", max_strings() - init_str_ptr);
-
-    /* area_delimiter is the length from the start of the filename to the
-     * directory seperator "/", which we use to construct the stringpool
-     * string `cur_area`. If there was already a string in the stringpool for
-     * the area, reuse it. */
-
-    if (area_delimiter() == 0) {
-        set_cur_area(EMPTY_STRING);
-    } else {
-        set_cur_area(str_ptr());
-        set_str_start((str_ptr() + 1) - 65536L, str_start(str_ptr() - TOO_BIG_CHAR) + area_delimiter());
-        set_str_ptr(str_ptr()+1);
-        temp_str = search_string(cur_area());
-
-        if (temp_str > 0) {
-            set_cur_area(temp_str);
-            set_str_ptr(str_ptr()-1);
-
-            for (j = str_start((str_ptr() + 1) - 65536L); j <= pool_ptr() - 1; j++)
-                set_str_pool(j - area_delimiter(), str_pool(j));
-
-            set_pool_ptr(pool_ptr() - area_delimiter());
-        }
-    }
-
-    /* ext_delimiter is the length from the start of the filename to the
-     * extension '.' delimiter, which we use to construct the stringpool
-     * strings `cur_ext` and `cur_name`. */
-
-    if (ext_delimiter() == 0) {
-        set_cur_ext(EMPTY_STRING);
-        set_cur_name(slow_make_string());
-    } else {
-        set_cur_name(str_ptr());
-        set_str_start((str_ptr() + 1) - 65536L, str_start(str_ptr() - TOO_BIG_CHAR) + ext_delimiter() - area_delimiter() - 1);
-        set_str_ptr(str_ptr()+1);
-
-        set_cur_ext(make_string());
-        set_str_ptr(str_ptr()-1);
-        temp_str = search_string(cur_name());
-
-        if (temp_str > 0) {
-            set_cur_name(temp_str);
-            set_str_ptr(str_ptr()-1);
-
-            for (j = str_start((str_ptr() + 1) - 65536L); j <= pool_ptr() - 1; j++)
-                set_str_pool(j - ext_delimiter() + area_delimiter() + 1, str_pool(j));
-
-            set_pool_ptr(pool_ptr() - ext_delimiter() + area_delimiter() + 1);
-        }
-
-        set_cur_ext(slow_make_string());
-    }
-}
-
-
 str_number
 make_name_string(void)
 {

crates/engine_xetex/xetex/xetex_bindings.h

@@ -232,6 +232,10 @@ void pack_job_name(const char *s);
 
 void make_utf16_name(void);
 
+void begin_name(void);
+
+void end_name(void);
+
 void resize_hash(uintptr_t len);
 
 B32x2 hash(uintptr_t idx);