Port print_file_name

Author: CraftSpider

crates/engine_xetex/src/c_api/output.rs

@@ -733,3 +733,56 @@ pub extern "C" fn print_cs(p: i32) {
 pub extern "C" fn sprint_cs(p: i32) {
     Globals::with(|globals| rs_sprint_cs(globals, p))
 }
+
+pub fn rs_print_file_name(globals: &mut Globals<'_, '_>, n: i32, a: i32, e: i32) {
+    let mut quote = None;
+
+    for s in [a, n, e] {
+        if s == 0 || quote.is_some() {
+            continue;
+        }
+        let str = globals.strings.str(s - 0x10000);
+        quote = str
+            .iter()
+            .find(|&&c| c == ' ' as u16 || c == '"' as u16 || c == '\'' as u16)
+            .copied();
+    }
+
+    if quote == Some(' ' as u16) {
+        quote = Some('"' as u16);
+    } else if let Some(q) = quote {
+        quote = Some(73 - q);
+    }
+
+    if let Some(q) = quote {
+        rs_print_char(globals, q as i32);
+    }
+
+    for s in [a, n, e] {
+        if s == 0 {
+            continue;
+        }
+        // TODO: Fix up borrowing so we can use `strings.str`
+        let str = globals.strings.str_range(s - 0x10000);
+        for idx in str {
+            let c = globals.strings.char_at(idx);
+            if let Some(qc) = quote {
+                if c == qc {
+                    rs_print(globals, qc as i32);
+                    rs_print(globals, (73 - qc) as i32);
+                    quote = Some(73 - qc);
+                }
+            }
+            rs_print(globals, c as i32);
+        }
+    }
+
+    if let Some(q) = quote {
+        rs_print_char(globals, q as i32);
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn print_file_name(n: i32, a: i32, e: i32) {
+    Globals::with(|globals| rs_print_file_name(globals, n, a, e))
+}

crates/engine_xetex/xetex/xetex-output.c

@@ -9,132 +9,6 @@
 #include "tectonic_bridge_core.h"
 #include "xetex_bindings.h"
 
-/*
-void
-sprint_cs(int32_t p)
-{
-    if (p < HASH_BASE) {
-        if (p < SINGLE_BASE)
-            print_char(p - 1);
-        else if (p < NULL_CS)
-            print_esc(p - SINGLE_BASE);
-        else {
-            print_esc_cstr("csname");
-            print_esc_cstr("endcsname");
-        }
-    } else if (p >= PRIM_EQTB_BASE && p < FROZEN_NULL_FONT) {
-        print_esc(prim(p - PRIM_EQTB_BASE).s1 - 1);
-    } else {
-        print_esc(hash(p).s1);
-    }
-}
-*/
-
-void
-print_file_name(int32_t n, int32_t a, int32_t e)
-{
-    bool must_quote = false;
-    int32_t quote_char = 0;
-    pool_pointer j;
-
-    if (a != 0) {
-        j = str_start((a) - 0x10000);
-        while (((!must_quote) || (quote_char == 0)) && (j < str_start((a + 1) - 0x10000))) {
-            if (str_pool(j) == ' ' )
-                must_quote = true;
-            else if ((str_pool(j) == '"' ) || (str_pool(j) == '\'' )) {
-                must_quote = true;
-                quote_char = 73 /*""" 39 */  - str_pool(j);
-            }
-            j++;
-        }
-    }
-
-    if (n != 0) {
-        j = str_start((n) - 0x10000);
-        while (((!must_quote) || (quote_char == 0)) && (j < str_start((n + 1) - 0x10000))) {
-            if (str_pool(j) == ' ' )
-                must_quote = true;
-            else if ((str_pool(j) == '"' ) || (str_pool(j) == '\'' )) {
-                must_quote = true;
-                quote_char = 73 /*""" 39 */  - str_pool(j);
-            }
-            j++;
-        }
-    }
-
-    if (e != 0) {
-        j = str_start((e) - 0x10000);
-        while (((!must_quote) || (quote_char == 0)) && (j < str_start((e + 1) - 0x10000))) {
-            if (str_pool(j) == ' ' )
-                must_quote = true;
-            else if ((str_pool(j) == '"' ) || (str_pool(j) == '\'' )) {
-                must_quote = true;
-                quote_char = 73 /*""" 39 */  - str_pool(j);
-            }
-            j++;
-        }
-    }
-
-    if (must_quote) {
-        if (quote_char == 0)
-            quote_char = '"' ;
-        print_char(quote_char);
-    }
-
-    if (a != 0) {
-        register int32_t for_end;
-        j = str_start((a) - 0x10000);
-        for_end = str_start((a + 1) - 0x10000) - 1;
-        if (j <= for_end)
-            do {
-                if (str_pool(j) == quote_char) {
-                    print(quote_char);
-                    quote_char = 73 /*""" 39 */  - quote_char;
-                    print(quote_char);
-                }
-                print(str_pool(j));
-            }
-            while (j++ < for_end);
-    }
-
-    if (n != 0) {
-        register int32_t for_end;
-        j = str_start((n) - 0x10000);
-        for_end = str_start((n + 1) - 0x10000) - 1;
-        if (j <= for_end)
-            do {
-                if (str_pool(j) == quote_char) {
-                    print(quote_char);
-                    quote_char = 73 /*""" 39 */  - quote_char;
-                    print(quote_char);
-                }
-                print(str_pool(j));
-            }
-            while (j++ < for_end);
-    }
-
-    if (e != 0) {
-        register int32_t for_end;
-        j = str_start((e) - 0x10000);
-        for_end = str_start((e + 1) - 0x10000) - 1;
-        if (j <= for_end)
-            do {
-                if (str_pool(j) == quote_char) {
-                    print(quote_char);
-                    quote_char = 73 /*""" 39 */  - quote_char;
-                    print(quote_char);
-                }
-                print(str_pool(j));
-            }
-            while (j++ < for_end);
-    }
-
-    if (quote_char != 0)
-        print_char(quote_char);
-}
-
-
 void
 print_size(int32_t s)
 {