2025-09-25 01:09:48 +09:00
|
|
|
|
use super::*;
|
refactor: add MIR interpreter utility helpers (Phase 1)
- Add destination write helpers (write_box_result, write_void, write_result)
- Add argument validation helpers (validate_args_exact/range/min)
- Add receiver conversion helper (convert_to_box)
- Update handlers to use new helpers
Reduces code duplication:
- Destination patterns: 37 call sites converted
- Each replacement saves 2-3 lines (74-111 lines saved)
- Helper infrastructure: 178 lines added
- Net improvement: Reduced duplication + better maintainability
Impact:
- Build: ✓ SUCCESS (0 errors, 146 warnings)
- Tests: ✓ 8/9 smoke tests PASS
- Functionality: ✓ PRESERVED (no behavior changes)
Files created:
- src/backend/mir_interpreter/utils/mod.rs
- src/backend/mir_interpreter/utils/destination_helpers.rs
- src/backend/mir_interpreter/utils/arg_validation.rs
- src/backend/mir_interpreter/utils/receiver_helpers.rs
Files modified: 15 handler files
- arithmetic.rs, boxes.rs, boxes_array.rs, boxes_instance.rs
- boxes_map.rs, boxes_object_fields.rs, boxes_plugin.rs
- boxes_string.rs, calls.rs, extern_provider.rs, externals.rs
- memory.rs, misc.rs, mod.rs
Related: Phase 21.0 refactoring
Risk: Low (pure refactoring, no behavior change)
2025-11-06 22:50:46 +09:00
|
|
|
|
use super::super::utils::*;
|
2025-11-03 23:21:48 +09:00
|
|
|
|
use serde_json::{Value as JsonValue, Map as JsonMap};
|
2025-09-25 01:09:48 +09:00
|
|
|
|
|
|
|
|
|
|
impl MirInterpreter {
|
2025-11-03 23:21:48 +09:00
|
|
|
|
#[inline]
|
|
|
|
|
|
fn ensure_mir_json_version_field(s: &str) -> String {
|
|
|
|
|
|
match serde_json::from_str::<JsonValue>(s) {
|
|
|
|
|
|
Ok(mut v) => {
|
|
|
|
|
|
if let JsonValue::Object(ref mut m) = v {
|
|
|
|
|
|
if !m.contains_key("version") {
|
|
|
|
|
|
m.insert("version".to_string(), JsonValue::from(0));
|
|
|
|
|
|
if let Ok(out) = serde_json::to_string(&v) { return out; }
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
s.to_string()
|
|
|
|
|
|
}
|
|
|
|
|
|
Err(_) => s.to_string(),
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2025-09-25 01:09:48 +09:00
|
|
|
|
pub(super) fn handle_extern_call(
|
|
|
|
|
|
&mut self,
|
|
|
|
|
|
dst: Option<ValueId>,
|
|
|
|
|
|
iface: &str,
|
|
|
|
|
|
method: &str,
|
|
|
|
|
|
args: &[ValueId],
|
|
|
|
|
|
) -> Result<(), VMError> {
|
|
|
|
|
|
match (iface, method) {
|
2025-11-03 16:09:19 +09:00
|
|
|
|
("env", "get") => {
|
|
|
|
|
|
if let Some(a0) = args.get(0) {
|
|
|
|
|
|
let key = self.reg_load(*a0)?.to_string();
|
|
|
|
|
|
let val = std::env::var(&key).ok();
|
2025-11-06 22:59:47 +09:00
|
|
|
|
let result = if let Some(s) = val {
|
|
|
|
|
|
VMValue::String(s)
|
|
|
|
|
|
} else {
|
|
|
|
|
|
// Represent missing env as null-equivalent (Void)
|
|
|
|
|
|
VMValue::Void
|
|
|
|
|
|
};
|
|
|
|
|
|
self.write_result(dst, result);
|
2025-11-03 16:09:19 +09:00
|
|
|
|
}
|
|
|
|
|
|
Ok(())
|
|
|
|
|
|
}
|
2025-09-25 01:09:48 +09:00
|
|
|
|
("env.console", "log") => {
|
|
|
|
|
|
if let Some(a0) = args.get(0) {
|
|
|
|
|
|
let v = self.reg_load(*a0)?;
|
2025-09-27 08:45:25 +09:00
|
|
|
|
// Dev-only: mirror print-trace for extern console.log
|
|
|
|
|
|
if Self::print_trace_enabled() { self.print_trace_emit(&v); }
|
|
|
|
|
|
// Treat VM Void and BoxRef(VoidBox) as JSON null for dev ergonomics
|
|
|
|
|
|
match &v {
|
refactor: add MIR interpreter utility helpers (Phase 1)
- Add destination write helpers (write_box_result, write_void, write_result)
- Add argument validation helpers (validate_args_exact/range/min)
- Add receiver conversion helper (convert_to_box)
- Update handlers to use new helpers
Reduces code duplication:
- Destination patterns: 37 call sites converted
- Each replacement saves 2-3 lines (74-111 lines saved)
- Helper infrastructure: 178 lines added
- Net improvement: Reduced duplication + better maintainability
Impact:
- Build: ✓ SUCCESS (0 errors, 146 warnings)
- Tests: ✓ 8/9 smoke tests PASS
- Functionality: ✓ PRESERVED (no behavior changes)
Files created:
- src/backend/mir_interpreter/utils/mod.rs
- src/backend/mir_interpreter/utils/destination_helpers.rs
- src/backend/mir_interpreter/utils/arg_validation.rs
- src/backend/mir_interpreter/utils/receiver_helpers.rs
Files modified: 15 handler files
- arithmetic.rs, boxes.rs, boxes_array.rs, boxes_instance.rs
- boxes_map.rs, boxes_object_fields.rs, boxes_plugin.rs
- boxes_string.rs, calls.rs, extern_provider.rs, externals.rs
- memory.rs, misc.rs, mod.rs
Related: Phase 21.0 refactoring
Risk: Low (pure refactoring, no behavior change)
2025-11-06 22:50:46 +09:00
|
|
|
|
VMValue::Void => { println!("null"); self.write_void(dst); return Ok(()); }
|
2025-09-27 08:45:25 +09:00
|
|
|
|
VMValue::BoxRef(bx) => {
|
|
|
|
|
|
if bx.as_any().downcast_ref::<crate::box_trait::VoidBox>().is_some() {
|
refactor: add MIR interpreter utility helpers (Phase 1)
- Add destination write helpers (write_box_result, write_void, write_result)
- Add argument validation helpers (validate_args_exact/range/min)
- Add receiver conversion helper (convert_to_box)
- Update handlers to use new helpers
Reduces code duplication:
- Destination patterns: 37 call sites converted
- Each replacement saves 2-3 lines (74-111 lines saved)
- Helper infrastructure: 178 lines added
- Net improvement: Reduced duplication + better maintainability
Impact:
- Build: ✓ SUCCESS (0 errors, 146 warnings)
- Tests: ✓ 8/9 smoke tests PASS
- Functionality: ✓ PRESERVED (no behavior changes)
Files created:
- src/backend/mir_interpreter/utils/mod.rs
- src/backend/mir_interpreter/utils/destination_helpers.rs
- src/backend/mir_interpreter/utils/arg_validation.rs
- src/backend/mir_interpreter/utils/receiver_helpers.rs
Files modified: 15 handler files
- arithmetic.rs, boxes.rs, boxes_array.rs, boxes_instance.rs
- boxes_map.rs, boxes_object_fields.rs, boxes_plugin.rs
- boxes_string.rs, calls.rs, extern_provider.rs, externals.rs
- memory.rs, misc.rs, mod.rs
Related: Phase 21.0 refactoring
Risk: Low (pure refactoring, no behavior change)
2025-11-06 22:50:46 +09:00
|
|
|
|
println!("null"); self.write_void(dst); return Ok(());
|
2025-09-27 08:45:25 +09:00
|
|
|
|
}
|
|
|
|
|
|
if let Some(sb) = bx.as_any().downcast_ref::<crate::box_trait::StringBox>() {
|
refactor: add MIR interpreter utility helpers (Phase 1)
- Add destination write helpers (write_box_result, write_void, write_result)
- Add argument validation helpers (validate_args_exact/range/min)
- Add receiver conversion helper (convert_to_box)
- Update handlers to use new helpers
Reduces code duplication:
- Destination patterns: 37 call sites converted
- Each replacement saves 2-3 lines (74-111 lines saved)
- Helper infrastructure: 178 lines added
- Net improvement: Reduced duplication + better maintainability
Impact:
- Build: ✓ SUCCESS (0 errors, 146 warnings)
- Tests: ✓ 8/9 smoke tests PASS
- Functionality: ✓ PRESERVED (no behavior changes)
Files created:
- src/backend/mir_interpreter/utils/mod.rs
- src/backend/mir_interpreter/utils/destination_helpers.rs
- src/backend/mir_interpreter/utils/arg_validation.rs
- src/backend/mir_interpreter/utils/receiver_helpers.rs
Files modified: 15 handler files
- arithmetic.rs, boxes.rs, boxes_array.rs, boxes_instance.rs
- boxes_map.rs, boxes_object_fields.rs, boxes_plugin.rs
- boxes_string.rs, calls.rs, extern_provider.rs, externals.rs
- memory.rs, misc.rs, mod.rs
Related: Phase 21.0 refactoring
Risk: Low (pure refactoring, no behavior change)
2025-11-06 22:50:46 +09:00
|
|
|
|
println!("{}", sb.value); self.write_void(dst); return Ok(());
|
2025-09-27 08:45:25 +09:00
|
|
|
|
}
|
|
|
|
|
|
}
|
refactor: add MIR interpreter utility helpers (Phase 1)
- Add destination write helpers (write_box_result, write_void, write_result)
- Add argument validation helpers (validate_args_exact/range/min)
- Add receiver conversion helper (convert_to_box)
- Update handlers to use new helpers
Reduces code duplication:
- Destination patterns: 37 call sites converted
- Each replacement saves 2-3 lines (74-111 lines saved)
- Helper infrastructure: 178 lines added
- Net improvement: Reduced duplication + better maintainability
Impact:
- Build: ✓ SUCCESS (0 errors, 146 warnings)
- Tests: ✓ 8/9 smoke tests PASS
- Functionality: ✓ PRESERVED (no behavior changes)
Files created:
- src/backend/mir_interpreter/utils/mod.rs
- src/backend/mir_interpreter/utils/destination_helpers.rs
- src/backend/mir_interpreter/utils/arg_validation.rs
- src/backend/mir_interpreter/utils/receiver_helpers.rs
Files modified: 15 handler files
- arithmetic.rs, boxes.rs, boxes_array.rs, boxes_instance.rs
- boxes_map.rs, boxes_object_fields.rs, boxes_plugin.rs
- boxes_string.rs, calls.rs, extern_provider.rs, externals.rs
- memory.rs, misc.rs, mod.rs
Related: Phase 21.0 refactoring
Risk: Low (pure refactoring, no behavior change)
2025-11-06 22:50:46 +09:00
|
|
|
|
VMValue::String(s) => { println!("{}", s); self.write_void(dst); return Ok(()); }
|
2025-09-27 08:45:25 +09:00
|
|
|
|
_ => {}
|
|
|
|
|
|
}
|
|
|
|
|
|
// Operator Box (Stringify) – dev flag gated
|
|
|
|
|
|
if std::env::var("NYASH_OPERATOR_BOX_STRINGIFY").ok().as_deref() == Some("1") {
|
|
|
|
|
|
if let Some(op) = self.functions.get("StringifyOperator.apply/1").cloned() {
|
|
|
|
|
|
let out = self.exec_function_inner(&op, Some(&[v.clone()]))?;
|
|
|
|
|
|
println!("{}", out.to_string());
|
|
|
|
|
|
} else {
|
|
|
|
|
|
println!("{}", v.to_string());
|
|
|
|
|
|
}
|
|
|
|
|
|
} else {
|
|
|
|
|
|
println!("{}", v.to_string());
|
|
|
|
|
|
}
|
2025-09-25 01:09:48 +09:00
|
|
|
|
}
|
refactor: add MIR interpreter utility helpers (Phase 1)
- Add destination write helpers (write_box_result, write_void, write_result)
- Add argument validation helpers (validate_args_exact/range/min)
- Add receiver conversion helper (convert_to_box)
- Update handlers to use new helpers
Reduces code duplication:
- Destination patterns: 37 call sites converted
- Each replacement saves 2-3 lines (74-111 lines saved)
- Helper infrastructure: 178 lines added
- Net improvement: Reduced duplication + better maintainability
Impact:
- Build: ✓ SUCCESS (0 errors, 146 warnings)
- Tests: ✓ 8/9 smoke tests PASS
- Functionality: ✓ PRESERVED (no behavior changes)
Files created:
- src/backend/mir_interpreter/utils/mod.rs
- src/backend/mir_interpreter/utils/destination_helpers.rs
- src/backend/mir_interpreter/utils/arg_validation.rs
- src/backend/mir_interpreter/utils/receiver_helpers.rs
Files modified: 15 handler files
- arithmetic.rs, boxes.rs, boxes_array.rs, boxes_instance.rs
- boxes_map.rs, boxes_object_fields.rs, boxes_plugin.rs
- boxes_string.rs, calls.rs, extern_provider.rs, externals.rs
- memory.rs, misc.rs, mod.rs
Related: Phase 21.0 refactoring
Risk: Low (pure refactoring, no behavior change)
2025-11-06 22:50:46 +09:00
|
|
|
|
self.write_void(dst);
|
2025-09-25 01:09:48 +09:00
|
|
|
|
Ok(())
|
|
|
|
|
|
}
|
|
|
|
|
|
("env.future", "new") => {
|
|
|
|
|
|
let fut = crate::boxes::future::NyashFutureBox::new();
|
|
|
|
|
|
if let Some(a0) = args.get(0) {
|
|
|
|
|
|
let v = self.reg_load(*a0)?;
|
|
|
|
|
|
fut.set_result(v.to_nyash_box());
|
|
|
|
|
|
}
|
2025-11-06 22:59:47 +09:00
|
|
|
|
self.write_result(dst, VMValue::Future(fut));
|
2025-09-25 01:09:48 +09:00
|
|
|
|
Ok(())
|
|
|
|
|
|
}
|
|
|
|
|
|
("env.future", "set") => {
|
|
|
|
|
|
if args.len() >= 2 {
|
|
|
|
|
|
let f = self.reg_load(args[0])?;
|
|
|
|
|
|
let v = self.reg_load(args[1])?;
|
|
|
|
|
|
if let VMValue::Future(fut) = f {
|
|
|
|
|
|
fut.set_result(v.to_nyash_box());
|
|
|
|
|
|
} else {
|
|
|
|
|
|
return Err(VMError::TypeError("env.future.set expects Future".into()));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2025-11-06 22:59:47 +09:00
|
|
|
|
self.write_void(dst);
|
2025-09-25 01:09:48 +09:00
|
|
|
|
Ok(())
|
|
|
|
|
|
}
|
|
|
|
|
|
("env.future", "await") => {
|
|
|
|
|
|
if let Some(a0) = args.get(0) {
|
|
|
|
|
|
let f = self.reg_load(*a0)?;
|
|
|
|
|
|
match f {
|
|
|
|
|
|
VMValue::Future(fut) => {
|
|
|
|
|
|
let v = fut.get();
|
2025-11-06 22:59:47 +09:00
|
|
|
|
self.write_result(dst, VMValue::from_nyash_box(v));
|
2025-09-25 01:09:48 +09:00
|
|
|
|
}
|
|
|
|
|
|
_ => {
|
|
|
|
|
|
return Err(VMError::TypeError("await expects Future".into()));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
Ok(())
|
|
|
|
|
|
}
|
|
|
|
|
|
("env.runtime", "checkpoint") => {
|
|
|
|
|
|
crate::runtime::global_hooks::safepoint_and_poll();
|
2025-11-06 22:59:47 +09:00
|
|
|
|
self.write_void(dst);
|
2025-09-25 01:09:48 +09:00
|
|
|
|
Ok(())
|
|
|
|
|
|
}
|
|
|
|
|
|
("env.modules", "set") => {
|
|
|
|
|
|
if args.len() >= 2 {
|
|
|
|
|
|
let k = self.reg_load(args[0])?.to_string();
|
|
|
|
|
|
let v = self.reg_load(args[1])?.to_nyash_box();
|
|
|
|
|
|
crate::runtime::modules_registry::set(k, v);
|
|
|
|
|
|
}
|
2025-11-06 22:59:47 +09:00
|
|
|
|
self.write_void(dst);
|
2025-09-25 01:09:48 +09:00
|
|
|
|
Ok(())
|
|
|
|
|
|
}
|
|
|
|
|
|
("env.modules", "get") => {
|
|
|
|
|
|
if let Some(a0) = args.get(0) {
|
|
|
|
|
|
let k = self.reg_load(*a0)?.to_string();
|
|
|
|
|
|
let vb = crate::runtime::modules_registry::get(&k)
|
|
|
|
|
|
.unwrap_or_else(|| Box::new(crate::box_trait::VoidBox::new()));
|
2025-11-06 22:59:47 +09:00
|
|
|
|
self.write_result(dst, VMValue::from_nyash_box(vb));
|
2025-09-25 01:09:48 +09:00
|
|
|
|
}
|
|
|
|
|
|
Ok(())
|
|
|
|
|
|
}
|
2025-11-03 16:09:19 +09:00
|
|
|
|
("env", "get") => {
|
2025-11-03 23:21:48 +09:00
|
|
|
|
// Delegate to provider
|
|
|
|
|
|
let ret = self.extern_provider_dispatch("env.get", args).unwrap_or(Ok(VMValue::Void))?;
|
2025-11-06 22:59:47 +09:00
|
|
|
|
self.write_result(dst, ret);
|
2025-11-03 16:09:19 +09:00
|
|
|
|
Ok(())
|
|
|
|
|
|
}
|
|
|
|
|
|
("env.mirbuilder", "emit") => {
|
2025-11-03 23:21:48 +09:00
|
|
|
|
let ret = self.extern_provider_dispatch("env.mirbuilder.emit", args).unwrap_or(Ok(VMValue::Void))?;
|
2025-11-06 22:59:47 +09:00
|
|
|
|
self.write_result(dst, ret);
|
2025-11-03 23:21:48 +09:00
|
|
|
|
Ok(())
|
2025-11-03 16:09:19 +09:00
|
|
|
|
}
|
|
|
|
|
|
("env.codegen", "emit_object") => {
|
2025-11-03 23:21:48 +09:00
|
|
|
|
let ret = self.extern_provider_dispatch("env.codegen.emit_object", args).unwrap_or(Ok(VMValue::Void))?;
|
2025-11-06 22:59:47 +09:00
|
|
|
|
self.write_result(dst, ret);
|
2025-11-03 23:21:48 +09:00
|
|
|
|
Ok(())
|
2025-11-03 16:09:19 +09:00
|
|
|
|
}
|
2025-11-06 22:34:18 +09:00
|
|
|
|
("env.codegen", "link_object") => {
|
|
|
|
|
|
// Args in third param (ArrayBox): [obj_path, exe_out?]
|
|
|
|
|
|
// Note: This branch is used for ExternCall form; provider toggles must be ON.
|
|
|
|
|
|
if std::env::var("NYASH_LLVM_USE_CAPI").ok().as_deref() != Some("1") ||
|
|
|
|
|
|
std::env::var("HAKO_V1_EXTERN_PROVIDER_C_ABI").ok().as_deref() != Some("1") {
|
|
|
|
|
|
return Err(VMError::InvalidInstruction("env.codegen.link_object: C-API route disabled".into()));
|
2025-11-03 16:09:19 +09:00
|
|
|
|
}
|
2025-11-06 22:34:18 +09:00
|
|
|
|
// Extract array payload
|
|
|
|
|
|
let (obj_path, exe_out) = if let Some(a2) = args.get(2) {
|
2025-11-03 16:09:19 +09:00
|
|
|
|
let v = self.reg_load(*a2)?;
|
|
|
|
|
|
match v {
|
|
|
|
|
|
VMValue::BoxRef(b) => {
|
|
|
|
|
|
if let Some(ab) = b.as_any().downcast_ref::<crate::boxes::array::ArrayBox>() {
|
2025-11-06 22:34:18 +09:00
|
|
|
|
let idx0: Box<dyn crate::box_trait::NyashBox> = Box::new(crate::box_trait::IntegerBox::new(0));
|
|
|
|
|
|
let elem0 = ab.get(idx0).to_string_box().value;
|
|
|
|
|
|
let mut exe: Option<String> = None;
|
|
|
|
|
|
let idx1: Box<dyn crate::box_trait::NyashBox> = Box::new(crate::box_trait::IntegerBox::new(1));
|
|
|
|
|
|
let e1 = ab.get(idx1).to_string_box().value;
|
|
|
|
|
|
if !e1.is_empty() { exe = Some(e1); }
|
|
|
|
|
|
(elem0, exe)
|
2025-11-03 16:09:19 +09:00
|
|
|
|
} else {
|
2025-11-06 22:34:18 +09:00
|
|
|
|
(b.to_string_box().value, None)
|
2025-11-03 16:09:19 +09:00
|
|
|
|
}
|
|
|
|
|
|
}
|
2025-11-06 22:34:18 +09:00
|
|
|
|
_ => (v.to_string(), None),
|
2025-11-03 16:09:19 +09:00
|
|
|
|
}
|
2025-11-06 22:34:18 +09:00
|
|
|
|
} else {
|
|
|
|
|
|
return Err(VMError::InvalidInstruction("extern_invoke env.codegen.link_object expects args array".into()));
|
|
|
|
|
|
};
|
|
|
|
|
|
let extra = std::env::var("HAKO_AOT_LDFLAGS").ok();
|
|
|
|
|
|
let obj = std::path::PathBuf::from(obj_path);
|
|
|
|
|
|
let exe = exe_out.map(std::path::PathBuf::from).unwrap_or_else(|| std::env::temp_dir().join("hako_link_out.exe"));
|
|
|
|
|
|
crate::host_providers::llvm_codegen::link_object_capi(&obj, &exe, extra.as_deref())
|
|
|
|
|
|
.map_err(|e| VMError::InvalidInstruction(format!("env.codegen.link_object: {}", e)))?;
|
2025-11-06 22:59:47 +09:00
|
|
|
|
self.write_result(dst, VMValue::String(exe.to_string_lossy().into_owned()));
|
2025-11-06 22:34:18 +09:00
|
|
|
|
Ok(())
|
|
|
|
|
|
}
|
|
|
|
|
|
("hostbridge", "extern_invoke") => {
|
|
|
|
|
|
if let Some(res) = self.extern_provider_dispatch("hostbridge.extern_invoke", args) {
|
|
|
|
|
|
match res {
|
2025-11-06 22:59:47 +09:00
|
|
|
|
Ok(v) => { self.write_result(dst, v); }
|
2025-11-06 22:34:18 +09:00
|
|
|
|
Err(e) => { return Err(e); }
|
2025-11-03 16:09:19 +09:00
|
|
|
|
}
|
2025-11-06 22:34:18 +09:00
|
|
|
|
return Ok(());
|
2025-11-03 16:09:19 +09:00
|
|
|
|
}
|
2025-11-06 22:34:18 +09:00
|
|
|
|
return Err(VMError::InvalidInstruction("hostbridge.extern_invoke unsupported [externals]".into()));
|
2025-11-03 16:09:19 +09:00
|
|
|
|
}
|
2025-09-25 01:09:48 +09:00
|
|
|
|
_ => Err(VMError::InvalidInstruction(format!(
|
|
|
|
|
|
"ExternCall {}.{} not supported",
|
|
|
|
|
|
iface, method
|
|
|
|
|
|
))),
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|