Port more_name and make_name_string

Author: CraftSpider

crates/engine_xetex/src/c_api/engine.rs

@@ -6,6 +6,7 @@ use std::{ptr, slice};
 
 mod memory;
 
+use crate::c_api::is_dir_sep;
 use crate::c_api::pool::{
     rs_make_string, rs_search_string, rs_slow_make_string, StringPool, EMPTY_STRING, TOO_BIG_CHAR,
 };
@@ -633,6 +634,96 @@ pub fn rs_end_name(globals: &mut Globals<'_, '_>) {
     globals.engine.cur_ext = rs_slow_make_string(globals.strings);
 }
 
+pub fn rs_more_name(globals: &mut Globals<'_, '_>, c: u16) -> bool {
+    if globals.engine.stop_at_space && globals.engine.file_name_quote_char == 0 && c == ' ' as u16 {
+        return false;
+    }
+
+    if globals.engine.stop_at_space
+        && globals.engine.file_name_quote_char != 0
+        && c == globals.engine.file_name_quote_char
+    {
+        globals.engine.file_name_quote_char = 0;
+        return true;
+    }
+
+    if globals.engine.stop_at_space
+        && globals.engine.file_name_quote_char == 0
+        && (c == '"' as u16 || c == '\'' as u16)
+    {
+        globals.engine.file_name_quote_char = c;
+        globals.engine.quoted_filename = true;
+        return true;
+    }
+
+    if globals.strings.pool_ptr + 1 > globals.strings.pool_size {
+        todo!("overflow(\"pool size\", pool_size() - init_pool_ptr)");
+    }
+
+    globals.strings.str_pool[globals.strings.pool_ptr as usize] = c;
+    globals.strings.pool_ptr += 1;
+
+    if is_dir_sep(char::from_u32(c as u32).unwrap_or(char::REPLACEMENT_CHARACTER)) {
+        globals.engine.area_delimiter = globals.strings.cur_length();
+        globals.engine.ext_delimiter = 0;
+    } else if c == '.' as u16 {
+        globals.engine.ext_delimiter = globals.strings.cur_length();
+    }
+
+    true
+}
+
+pub fn rs_make_name_string(globals: &mut Globals<'_, '_>) -> StrNumber {
+    if globals.strings.pool_ptr
+        + globals
+            .engine
+            .name_of_file
+            .as_ref()
+            .map(|n| n.count_bytes())
+            .unwrap_or(0)
+        > globals.strings.pool_size
+        || globals.strings.str_ptr == globals.strings.max_strings
+    {
+        return '?' as StrNumber;
+    }
+
+    rs_make_utf16_name(globals.engine);
+
+    // TODO: Don't allocate and set name_of_file, just use encode_utf16
+    if let Some(s) = globals.engine.name_of_file_utf16.as_deref() {
+        for &c in s {
+            globals.strings.str_pool[globals.strings.pool_ptr] = c;
+            globals.strings.pool_ptr += 1;
+        }
+    }
+
+    let res = rs_make_string(globals.strings);
+
+    let save = (
+        globals.engine.area_delimiter,
+        globals.engine.ext_delimiter,
+        globals.engine.name_in_progress,
+        globals.engine.stop_at_space,
+    );
+    globals.engine.name_in_progress = true;
+    rs_begin_name(globals);
+    globals.engine.stop_at_space = false;
+
+    let name = globals.engine.name_of_file_utf16.take();
+    // Needed for side-effects
+    name.as_deref()
+        .and_then(|s| s.iter().find(|&c| !rs_more_name(globals, *c)));
+    globals.engine.name_of_file_utf16 = name;
+
+    globals.engine.stop_at_space = save.3;
+    rs_end_name(globals);
+    globals.engine.name_in_progress = save.2;
+    globals.engine.ext_delimiter = save.1;
+    globals.engine.area_delimiter = save.0;
+
+    res
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn maketexstring(str: *const libc::c_char) -> StrNumber {
     if str.is_null() {
@@ -676,3 +767,13 @@ pub extern "C" fn begin_name() {
 pub extern "C" fn end_name() {
     Globals::with(|globals| rs_end_name(globals))
 }
+
+#[no_mangle]
+pub extern "C" fn more_name(c: u16) -> bool {
+    Globals::with(|globals| rs_more_name(globals, c))
+}
+
+#[no_mangle]
+pub extern "C" fn make_name_string() -> StrNumber {
+    Globals::with(|globals| rs_make_name_string(globals))
+}

crates/engine_xetex/src/c_api/pool.rs

@@ -52,6 +52,11 @@ impl StringPool {
         let str = str as usize;
         self.str_start[str] as usize..self.str_start[str + 1] as usize
     }
+
+    /// The length of the current string in the pool
+    pub fn cur_length(&self) -> usize {
+        self.pool_ptr - self.str_start[self.str_ptr - TOO_BIG_CHAR] as usize
+    }
 }
 
 #[no_mangle]

crates/engine_xetex/src/lib.rs

@@ -244,6 +244,11 @@ pub mod c_api {
     mod pool;
     mod scaled_math;
 
+    /// Copy of `IS_DIR_SEP` from bridge_core
+    fn is_dir_sep(c: char) -> bool {
+        c == '/'
+    }
+
     #[allow(improper_ctypes)] // for CoreBridgeState
     extern "C" {
         pub fn tt_xetex_set_int_variable(

crates/engine_xetex/xetex/xetex-xetex0.c

@@ -10601,81 +10601,6 @@ conditional(void)
     }
 }
 
-bool
-more_name(UTF16_code c)
-{
-    if (stop_at_space() && file_name_quote_char() == 0 && c == ' ' )
-        return false;
-
-    if (stop_at_space() && file_name_quote_char() != 0 && c == file_name_quote_char()) {
-        set_file_name_quote_char(0);
-        return true;
-    }
-
-    if (stop_at_space() && file_name_quote_char() == 0 && (c == '"'  || c == '\'' )) {
-        set_file_name_quote_char(c);
-        set_quoted_filename(true);
-        return true;
-    }
-
-    if (pool_ptr() + 1 > pool_size())
-        overflow("pool size", pool_size() - init_pool_ptr);
-
-    set_str_pool(pool_ptr(), c);
-    set_pool_ptr(pool_ptr()+1);
-
-    if (IS_DIR_SEP(c)) {
-        set_area_delimiter(cur_length());
-        set_ext_delimiter(0);
-    } else if (c == '.' ) {
-        set_ext_delimiter(cur_length());
-    }
-
-    return true;
-}
-
-str_number
-make_name_string(void)
-{
-    int32_t k;
-    pool_pointer save_area_delimiter, save_ext_delimiter;
-    bool save_name_in_progress, save_stop_at_space;
-
-    if (pool_ptr() + name_length() > pool_size() || str_ptr() == max_strings() || cur_length() > 0)
-        return '?';
-
-    make_utf16_name();
-
-    for (k = 0; k < name_length16(); k++) {
-        set_str_pool(pool_ptr(), name_of_file16()[k]);
-        set_pool_ptr(pool_ptr()+1);
-    }
-
-
-    str_number Result = make_string();
-
-    save_area_delimiter = area_delimiter();
-    save_ext_delimiter = ext_delimiter();
-    save_name_in_progress = name_in_progress();
-    save_stop_at_space = stop_at_space();
-    set_name_in_progress(true);
-    begin_name();
-    set_stop_at_space(false);
-    k = 0;
-
-    while (k < name_length16() && more_name(name_of_file16()[k]))
-        k++;
-
-    set_stop_at_space(save_stop_at_space);
-    end_name();
-    set_name_in_progress(save_name_in_progress);
-    set_area_delimiter(save_area_delimiter);
-    set_ext_delimiter(save_ext_delimiter);
-
-    return Result;
-}
-
-
 static void
 scan_file_name_braced(void)
 {