From 7b2465b70baf65225c39fc47dfd824a732f74d5e Mon Sep 17 00:00:00 2001
From: Ryu <114303361+ryuapp@users.noreply.github.com>
Date: Sun, 15 Mar 2026 23:47:04 +0900
Subject: [PATCH] refactor: extract std into Zig modules

---
 src/codegen/zig/mod.rs                        | 15 ++------------
 src/codegen/zig/stdlib/fs.rs                  | 14 +++++--------
 src/codegen/zig/stdlib/mod.rs                 |  4 ++--
 src/commands/mod.rs                           | 12 +++++++++--
 src/runtime/zyre_std_debug.zig                |  9 +++++++++
 src/runtime/zyre_std_fs.zig                   |  5 +++++
 src/tests/codegen.rs                          | 18 ++++++++++-------
 ..._codegen_snapshots@alloc_propagate.zy.snap | 14 ++++---------
 ...snapshots__codegen_snapshots@array.zy.snap | 12 +++--------
 ...shots__codegen_snapshots@enum_decl.zy.snap | 20 +++++++------------
 ...s__codegen_snapshots@explicit_main.zy.snap | 12 +++--------
 ...ts__codegen_snapshots@export_const.zy.snap | 12 +++--------
 ...apshots__codegen_snapshots@fn_call.zy.snap | 12 +++--------
 ...apshots__codegen_snapshots@if_stmt.zy.snap | 12 +++--------
 ...shots__codegen_snapshots@print_int.zy.snap | 12 +++--------
 ...shots__codegen_snapshots@print_str.zy.snap | 12 +++--------
 ...__codegen_snapshots@read_text_file.zy.snap | 14 ++++---------
 ...ots__codegen_snapshots@struct_decl.zy.snap | 12 +++--------
 ...ots__codegen_snapshots@switch_stmt.zy.snap | 16 +++++----------
 ...hots__codegen_snapshots@while_loop.zy.snap | 12 +++--------
 20 files changed, 91 insertions(+), 158 deletions(-)
 create mode 100644 src/runtime/zyre_std_debug.zig
 create mode 100644 src/runtime/zyre_std_fs.zig

diff --git a/src/codegen/zig/mod.rs b/src/codegen/zig/mod.rs
index 2b3eab7..3986dce 100644
--- a/src/codegen/zig/mod.rs
+++ b/src/codegen/zig/mod.rs
@@ -208,6 +208,8 @@ impl ZigBackend {
         if needs_std {
             out.push_str("const std = @import(\"std\");\n");
             out.push_str("const __zyre_runtime = @import(\"zyre_runtime.zig\");\n");
+            out.push_str("const __zyre_std_debug = @import(\"zyre_std_debug.zig\");\n");
+            out.push_str("const __zyre_std_fs = @import(\"zyre_std_fs.zig\");\n");
         }
         for (name, path) in &user_imports {
             out.push_str(&format!("const {} = @import(\"{}\");\n", name, path));
@@ -216,19 +218,6 @@ impl ZigBackend {
             out.push('\n');
         }
 
-        // __zyre_print helper (selects {s} or {} based on the value type)
-        if needs_std {
-            out.push_str(concat!(
-                "fn __zyre_print(val: anytype) void {\n",
-                "    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {\n",
-                "        std.debug.print(\"{s}\\n\", .{val});\n",
-                "    } else {\n",
-                "        std.debug.print(\"{}\\n\", .{val});\n",
-                "    }\n",
-                "}\n\n",
-            ));
-        }
-
         // Emit hoisted export consts at the top level (preserving declaration order)
         for item in program {
             if let TopLevel::ConstDecl {
diff --git a/src/codegen/zig/stdlib/fs.rs b/src/codegen/zig/stdlib/fs.rs
index a947e31..5dbab73 100644
--- a/src/codegen/zig/stdlib/fs.rs
+++ b/src/codegen/zig/stdlib/fs.rs
@@ -5,15 +5,11 @@ impl ZigBackend {
     pub(super) fn gen_fs_call(&mut self, fn_name: &str, args: &[Expr]) -> String {
         match fn_name {
             "readTextFile" => {
-                if let Some(arg) = args.first() {
-                    format!(
-                        "std.fs.cwd().readFileAlloc(__zyre_allocator, {}, std.math.maxInt(usize))",
-                        self.gen_expr(arg)
-                    )
-                } else {
-                    "std.fs.cwd().readFileAlloc(__zyre_allocator, \"\", std.math.maxInt(usize))"
-                        .to_string()
-                }
+                let arg = args
+                    .first()
+                    .map(|a| self.gen_expr(a))
+                    .unwrap_or_else(|| "\"\"".to_string());
+                format!("__zyre_std_fs.readTextFile(__zyre_allocator, {})", arg)
             }
             _ => {
                 let args_str = self.gen_args(args);
diff --git a/src/codegen/zig/stdlib/mod.rs b/src/codegen/zig/stdlib/mod.rs
index c277e52..58d8430 100644
--- a/src/codegen/zig/stdlib/mod.rs
+++ b/src/codegen/zig/stdlib/mod.rs
@@ -16,9 +16,9 @@ impl ZigBackend {
             } else {
                 self.gen_expr(arg)
             };
-            format!("__zyre_print({})", arg_s)
+            format!("__zyre_std_debug.print({})", arg_s)
         } else {
-            "__zyre_print(\"\")".to_string()
+            "__zyre_std_debug.print(\"\")".to_string()
         }
     }
 
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index 39ec509..4ce86ed 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -77,12 +77,20 @@ pub fn collect_zy_imports(
 }
 
 const ZYRE_RUNTIME: &str = include_str!("../runtime/zyre_runtime.zig");
+const ZYRE_STD_DEBUG: &str = include_str!("../runtime/zyre_std_debug.zig");
+const ZYRE_STD_FS: &str = include_str!("../runtime/zyre_std_fs.zig");
 
 /// Generates a .zig file in the cache from a pre-parsed AST. Returns (stem, zig_path).
 pub fn emit_zig(input_path: &str, ast: &crate::parser::Program) -> (String, String) {
     std::fs::create_dir_all("zyre-cache").unwrap();
-    std::fs::write("zyre-cache/zyre_runtime.zig", ZYRE_RUNTIME)
-        .unwrap_or_else(|e| panic!("Failed to write zyre_runtime.zig: {}", e));
+    for (name, content) in [
+        ("zyre_runtime.zig", ZYRE_RUNTIME),
+        ("zyre_std_debug.zig", ZYRE_STD_DEBUG),
+        ("zyre_std_fs.zig", ZYRE_STD_FS),
+    ] {
+        std::fs::write(format!("zyre-cache/{}", name), content)
+            .unwrap_or_else(|e| panic!("Failed to write {}: {}", name, e));
+    }
 
     let mut visited = std::collections::HashSet::new();
     let source_dir = Path::new(input_path).parent().unwrap_or(Path::new("."));
diff --git a/src/runtime/zyre_std_debug.zig b/src/runtime/zyre_std_debug.zig
new file mode 100644
index 0000000..5b0918d
--- /dev/null
+++ b/src/runtime/zyre_std_debug.zig
@@ -0,0 +1,9 @@
+const std = @import("std");
+
+pub fn print(val: anytype) void {
+    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {
+        std.debug.print("{s}\n", .{val});
+    } else {
+        std.debug.print("{any}\n", .{val});
+    }
+}
diff --git a/src/runtime/zyre_std_fs.zig b/src/runtime/zyre_std_fs.zig
new file mode 100644
index 0000000..8711912
--- /dev/null
+++ b/src/runtime/zyre_std_fs.zig
@@ -0,0 +1,5 @@
+const std = @import("std");
+
+pub fn readTextFile(allocator: std.mem.Allocator, path: []const u8) ![]u8 {
+    return std.fs.cwd().readFileAlloc(allocator, path, std.math.maxInt(usize));
+}
diff --git a/src/tests/codegen.rs b/src/tests/codegen.rs
index ee6c2e0..5b2977c 100644
--- a/src/tests/codegen.rs
+++ b/src/tests/codegen.rs
@@ -50,13 +50,13 @@ fn test_codegen_print_generic_format() {
     "#,
     );
     assert!(
-        out.contains("__zyre_print("),
-        "expected __zyre_print call, got:\n{}",
+        out.contains("__zyre_std_debug.print("),
+        "expected __zyre_std_debug.print call, got:\n{}",
         out
     );
     assert!(
-        out.contains("fn __zyre_print("),
-        "expected __zyre_print definition, got:\n{}",
+        out.contains("@import(\"zyre_std_debug.zig\")"),
+        "expected zyre_std_debug import, got:\n{}",
         out
     );
 }
@@ -78,10 +78,10 @@ fn test_codegen_import_alias() {
     let out = compile(
         r#"
         const s = import("std");
-        s.print("hello");
+        s.debug.print("hello");
     "#,
     );
-    assert!(out.contains("std.debug.print"), "got:\n{}", out);
+    assert!(out.contains("__zyre_std_debug.print"), "got:\n{}", out);
     assert!(!out.contains("const s = @import"), "got:\n{}", out);
 }
 
@@ -243,7 +243,11 @@ fn test_codegen_if_expr_as_arg() {
         }
     "#,
     );
-    assert!(out.contains("__zyre_print(if (flag)"), "got:\n{}", out);
+    assert!(
+        out.contains("__zyre_std_debug.print(if (flag)"),
+        "got:\n{}",
+        out
+    );
 }
 
 #[test]
diff --git a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@alloc_propagate.zy.snap b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@alloc_propagate.zy.snap
index be0fb1b..2723f96 100644
--- a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@alloc_propagate.zy.snap
+++ b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@alloc_propagate.zy.snap
@@ -6,17 +6,11 @@ input_file: src/tests/fixtures/alloc_propagate.zy
 ---
 const std = @import("std");
 const __zyre_runtime = @import("zyre_runtime.zig");
-
-fn __zyre_print(val: anytype) void {
-    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {
-        std.debug.print("{s}\n", .{val});
-    } else {
-        std.debug.print("{}\n", .{val});
-    }
-}
+const __zyre_std_debug = @import("zyre_std_debug.zig");
+const __zyre_std_fs = @import("zyre_std_fs.zig");
 
 fn readIt(__zyre_allocator: std.mem.Allocator) ![]const u8 {
-    return (try std.fs.cwd().readFileAlloc(__zyre_allocator, "x.txt", std.math.maxInt(usize)));
+    return (try __zyre_std_fs.readTextFile(__zyre_allocator, "x.txt"));
 }
 
 pub fn main() !void {
@@ -29,5 +23,5 @@ pub fn main() !void {
     const data = readIt(__zyre_allocator) catch {
     return;
 };
-    __zyre_print(data);
+    __zyre_std_debug.print(data);
 }
diff --git a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@array.zy.snap b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@array.zy.snap
index b2ae629..eeb98ba 100644
--- a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@array.zy.snap
+++ b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@array.zy.snap
@@ -6,14 +6,8 @@ input_file: src/tests/fixtures/array.zy
 ---
 const std = @import("std");
 const __zyre_runtime = @import("zyre_runtime.zig");
-
-fn __zyre_print(val: anytype) void {
-    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {
-        std.debug.print("{s}\n", .{val});
-    } else {
-        std.debug.print("{}\n", .{val});
-    }
-}
+const __zyre_std_debug = @import("zyre_std_debug.zig");
+const __zyre_std_fs = @import("zyre_std_fs.zig");
 
 pub fn main() !void {
     try __zyre_runtime.Output.init();
@@ -24,5 +18,5 @@ pub fn main() !void {
     _ = __zyre_allocator;
 
     const arr: [3]i32 = .{1, 2, 3};
-    __zyre_print(arr[0]);
+    __zyre_std_debug.print(arr[0]);
 }
diff --git a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@enum_decl.zy.snap b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@enum_decl.zy.snap
index f561f84..4a40cea 100644
--- a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@enum_decl.zy.snap
+++ b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@enum_decl.zy.snap
@@ -6,14 +6,8 @@ input_file: src/tests/fixtures/enum_decl.zy
 ---
 const std = @import("std");
 const __zyre_runtime = @import("zyre_runtime.zig");
-
-fn __zyre_print(val: anytype) void {
-    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {
-        std.debug.print("{s}\n", .{val});
-    } else {
-        std.debug.print("{}\n", .{val});
-    }
-}
+const __zyre_std_debug = @import("zyre_std_debug.zig");
+const __zyre_std_fs = @import("zyre_std_fs.zig");
 
 const Direction = enum {
     North,
@@ -24,10 +18,10 @@ const Direction = enum {
 
 fn describe(d: Direction) void {
     switch (d) {
-    .North => __zyre_print("north"),
-    .South => __zyre_print("south"),
-    .East => __zyre_print("east"),
-    .West => __zyre_print("west"),
+    .North => __zyre_std_debug.print("north"),
+    .South => __zyre_std_debug.print("south"),
+    .East => __zyre_std_debug.print("east"),
+    .West => __zyre_std_debug.print("west"),
 }
 }
 
@@ -39,5 +33,5 @@ pub fn main() !void {
     const __zyre_allocator = __zyre_arena.allocator();
     _ = __zyre_allocator;
 
-    __zyre_print("ok");
+    __zyre_std_debug.print("ok");
 }
diff --git a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@explicit_main.zy.snap b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@explicit_main.zy.snap
index d1e1fd2..fd4d32e 100644
--- a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@explicit_main.zy.snap
+++ b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@explicit_main.zy.snap
@@ -6,17 +6,11 @@ input_file: src/tests/fixtures/explicit_main.zy
 ---
 const std = @import("std");
 const __zyre_runtime = @import("zyre_runtime.zig");
-
-fn __zyre_print(val: anytype) void {
-    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {
-        std.debug.print("{s}\n", .{val});
-    } else {
-        std.debug.print("{}\n", .{val});
-    }
-}
+const __zyre_std_debug = @import("zyre_std_debug.zig");
+const __zyre_std_fs = @import("zyre_std_fs.zig");
 
 fn __zyre_fn_main() void {
-    __zyre_print("hello from main");
+    __zyre_std_debug.print("hello from main");
 }
 
 pub fn main() !void {
diff --git a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@export_const.zy.snap b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@export_const.zy.snap
index 10ff8f7..39e1f6a 100644
--- a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@export_const.zy.snap
+++ b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@export_const.zy.snap
@@ -6,14 +6,8 @@ input_file: src/tests/fixtures/export_const.zy
 ---
 const std = @import("std");
 const __zyre_runtime = @import("zyre_runtime.zig");
-
-fn __zyre_print(val: anytype) void {
-    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {
-        std.debug.print("{s}\n", .{val});
-    } else {
-        std.debug.print("{}\n", .{val});
-    }
-}
+const __zyre_std_debug = @import("zyre_std_debug.zig");
+const __zyre_std_fs = @import("zyre_std_fs.zig");
 
 const a = 2;
 const b = 3;
@@ -27,5 +21,5 @@ pub fn main() !void {
     const __zyre_allocator = __zyre_arena.allocator();
     _ = __zyre_allocator;
 
-    __zyre_print(c);
+    __zyre_std_debug.print(c);
 }
diff --git a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@fn_call.zy.snap b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@fn_call.zy.snap
index ccc1612..1bc5d0e 100644
--- a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@fn_call.zy.snap
+++ b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@fn_call.zy.snap
@@ -6,14 +6,8 @@ input_file: src/tests/fixtures/fn_call.zy
 ---
 const std = @import("std");
 const __zyre_runtime = @import("zyre_runtime.zig");
-
-fn __zyre_print(val: anytype) void {
-    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {
-        std.debug.print("{s}\n", .{val});
-    } else {
-        std.debug.print("{}\n", .{val});
-    }
-}
+const __zyre_std_debug = @import("zyre_std_debug.zig");
+const __zyre_std_fs = @import("zyre_std_fs.zig");
 
 fn add(a: i32, b: i32) i32 {
     return (a + b);
@@ -27,5 +21,5 @@ pub fn main() !void {
     const __zyre_allocator = __zyre_arena.allocator();
     _ = __zyre_allocator;
 
-    __zyre_print(add(1, 2));
+    __zyre_std_debug.print(add(1, 2));
 }
diff --git a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@if_stmt.zy.snap b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@if_stmt.zy.snap
index 17492d4..9ba19c1 100644
--- a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@if_stmt.zy.snap
+++ b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@if_stmt.zy.snap
@@ -6,14 +6,8 @@ input_file: src/tests/fixtures/if_stmt.zy
 ---
 const std = @import("std");
 const __zyre_runtime = @import("zyre_runtime.zig");
-
-fn __zyre_print(val: anytype) void {
-    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {
-        std.debug.print("{s}\n", .{val});
-    } else {
-        std.debug.print("{}\n", .{val});
-    }
-}
+const __zyre_std_debug = @import("zyre_std_debug.zig");
+const __zyre_std_fs = @import("zyre_std_fs.zig");
 
 pub fn main() !void {
     try __zyre_runtime.Output.init();
@@ -25,6 +19,6 @@ pub fn main() !void {
 
     const x = true;
     if (x) {
-        __zyre_print("yes");
+        __zyre_std_debug.print("yes");
     }
 }
diff --git a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@print_int.zy.snap b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@print_int.zy.snap
index f90aac3..2878dcc 100644
--- a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@print_int.zy.snap
+++ b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@print_int.zy.snap
@@ -6,14 +6,8 @@ input_file: src/tests/fixtures/print_int.zy
 ---
 const std = @import("std");
 const __zyre_runtime = @import("zyre_runtime.zig");
-
-fn __zyre_print(val: anytype) void {
-    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {
-        std.debug.print("{s}\n", .{val});
-    } else {
-        std.debug.print("{}\n", .{val});
-    }
-}
+const __zyre_std_debug = @import("zyre_std_debug.zig");
+const __zyre_std_fs = @import("zyre_std_fs.zig");
 
 pub fn main() !void {
     try __zyre_runtime.Output.init();
@@ -24,5 +18,5 @@ pub fn main() !void {
     _ = __zyre_allocator;
 
     const x: i32 = 42;
-    __zyre_print(x);
+    __zyre_std_debug.print(x);
 }
diff --git a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@print_str.zy.snap b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@print_str.zy.snap
index f6044e2..6ae1d99 100644
--- a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@print_str.zy.snap
+++ b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@print_str.zy.snap
@@ -6,14 +6,8 @@ input_file: src/tests/fixtures/print_str.zy
 ---
 const std = @import("std");
 const __zyre_runtime = @import("zyre_runtime.zig");
-
-fn __zyre_print(val: anytype) void {
-    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {
-        std.debug.print("{s}\n", .{val});
-    } else {
-        std.debug.print("{}\n", .{val});
-    }
-}
+const __zyre_std_debug = @import("zyre_std_debug.zig");
+const __zyre_std_fs = @import("zyre_std_fs.zig");
 
 pub fn main() !void {
     try __zyre_runtime.Output.init();
@@ -23,5 +17,5 @@ pub fn main() !void {
     const __zyre_allocator = __zyre_arena.allocator();
     _ = __zyre_allocator;
 
-    __zyre_print("hello");
+    __zyre_std_debug.print("hello");
 }
diff --git a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@read_text_file.zy.snap b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@read_text_file.zy.snap
index 229dd12..3c8a454 100644
--- a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@read_text_file.zy.snap
+++ b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@read_text_file.zy.snap
@@ -6,14 +6,8 @@ input_file: src/tests/fixtures/read_text_file.zy
 ---
 const std = @import("std");
 const __zyre_runtime = @import("zyre_runtime.zig");
-
-fn __zyre_print(val: anytype) void {
-    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {
-        std.debug.print("{s}\n", .{val});
-    } else {
-        std.debug.print("{}\n", .{val});
-    }
-}
+const __zyre_std_debug = @import("zyre_std_debug.zig");
+const __zyre_std_fs = @import("zyre_std_fs.zig");
 
 pub fn main() !void {
     try __zyre_runtime.Output.init();
@@ -22,8 +16,8 @@ pub fn main() !void {
     defer __zyre_arena.deinit();
     const __zyre_allocator = __zyre_arena.allocator();
 
-    const data = std.fs.cwd().readFileAlloc(__zyre_allocator, "file.txt", std.math.maxInt(usize)) catch {
+    const data = __zyre_std_fs.readTextFile(__zyre_allocator, "file.txt") catch {
     return;
 };
-    __zyre_print(data);
+    __zyre_std_debug.print(data);
 }
diff --git a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@struct_decl.zy.snap b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@struct_decl.zy.snap
index 594b6ad..ae98630 100644
--- a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@struct_decl.zy.snap
+++ b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@struct_decl.zy.snap
@@ -6,14 +6,8 @@ input_file: src/tests/fixtures/struct_decl.zy
 ---
 const std = @import("std");
 const __zyre_runtime = @import("zyre_runtime.zig");
-
-fn __zyre_print(val: anytype) void {
-    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {
-        std.debug.print("{s}\n", .{val});
-    } else {
-        std.debug.print("{}\n", .{val});
-    }
-}
+const __zyre_std_debug = @import("zyre_std_debug.zig");
+const __zyre_std_fs = @import("zyre_std_fs.zig");
 
 const Point = struct {
     x: i32,
@@ -32,5 +26,5 @@ pub fn main() !void {
     const __zyre_allocator = __zyre_arena.allocator();
     _ = __zyre_allocator;
 
-    __zyre_print("ok");
+    __zyre_std_debug.print("ok");
 }
diff --git a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@switch_stmt.zy.snap b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@switch_stmt.zy.snap
index dd21503..be35824 100644
--- a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@switch_stmt.zy.snap
+++ b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@switch_stmt.zy.snap
@@ -6,20 +6,14 @@ input_file: src/tests/fixtures/switch_stmt.zy
 ---
 const std = @import("std");
 const __zyre_runtime = @import("zyre_runtime.zig");
-
-fn __zyre_print(val: anytype) void {
-    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {
-        std.debug.print("{s}\n", .{val});
-    } else {
-        std.debug.print("{}\n", .{val});
-    }
-}
+const __zyre_std_debug = @import("zyre_std_debug.zig");
+const __zyre_std_fs = @import("zyre_std_fs.zig");
 
 fn check(n: i32) void {
     switch (n) {
-    1 => __zyre_print("one"),
-    2 => __zyre_print("two"),
-    else => __zyre_print("other"),
+    1 => __zyre_std_debug.print("one"),
+    2 => __zyre_std_debug.print("two"),
+    else => __zyre_std_debug.print("other"),
 }
 }
 
diff --git a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@while_loop.zy.snap b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@while_loop.zy.snap
index af8cf4a..e426fb0 100644
--- a/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@while_loop.zy.snap
+++ b/src/tests/snapshots/zyre__tests__snapshots__codegen_snapshots@while_loop.zy.snap
@@ -6,14 +6,8 @@ input_file: src/tests/fixtures/while_loop.zy
 ---
 const std = @import("std");
 const __zyre_runtime = @import("zyre_runtime.zig");
-
-fn __zyre_print(val: anytype) void {
-    if (comptime @typeInfo(@TypeOf(val)) == .pointer) {
-        std.debug.print("{s}\n", .{val});
-    } else {
-        std.debug.print("{}\n", .{val});
-    }
-}
+const __zyre_std_debug = @import("zyre_std_debug.zig");
+const __zyre_std_fs = @import("zyre_std_fs.zig");
 
 pub fn main() !void {
     try __zyre_runtime.Output.init();
@@ -25,7 +19,7 @@ pub fn main() !void {
 
     const x = true;
     while (x) {
-        __zyre_print("loop");
+        __zyre_std_debug.print("loop");
         break;
     }
 }