refactor: abstract VM

2026-05-16 19:51:38 +08:00
parent 21899f7380
commit 29fab93cd1
42 changed files with 1823 additions and 1410 deletions
@@ -1,53 +0,0 @@
-use fix_common::StringId;
-use fix_error::Error;
-use gc_arena::Mutation;
-
-use crate::bytecode_reader::BytecodeReader;
-use crate::value::*;
-use crate::{Step, Vm, VmRuntimeCtx};
-
-impl<'gc> Vm<'gc> {
-    pub(crate) fn primop_to_string(
-        &mut self,
-        _ctx: &mut impl VmRuntimeCtx,
-        reader: &mut BytecodeReader<'_>,
-        mc: &Mutation<'gc>,
-    ) -> Step {
-        let val = self.force_and_retry::<StrictValue>(reader, mc)?;
-        if val.is::<StringId>() || val.is::<NixString>() {
-            return self.return_from_primop(val.relax(), reader);
-        }
-        if let Some(p) = val.as_inline::<Path>() {
-            return self.return_from_primop(Value::new_inline(p.0), reader);
-        }
-        //  TODO: derivations / `__toString` / `outPath`,
-        //        numbers, lists.
-        self.finish_err(Error::eval_error(format!(
-            "cannot coerce {} to a string",
-            val.ty()
-        )))
-    }
-
-    pub(crate) fn primop_type_of(
-        &mut self,
-        ctx: &mut impl VmRuntimeCtx,
-        reader: &mut BytecodeReader<'_>,
-        mc: &Mutation<'gc>,
-    ) -> Step {
-        let val = self.force_and_retry::<StrictValue>(reader, mc)?;
-        let name: &str = match val.ty() {
-            NixType::Int => "int",
-            NixType::Float => "float",
-            NixType::Bool => "bool",
-            NixType::Null => "null",
-            NixType::String => "string",
-            NixType::Path => "path",
-            NixType::AttrSet => "set",
-            NixType::List => "list",
-            NixType::Closure | NixType::PrimOp | NixType::PrimOpApp => "lambda",
-            NixType::Thunk => unreachable!("forced"),
-        };
-        let sid = ctx.intern_string(name);
-        self.return_from_primop(Value::new_inline(sid), reader)
-    }
-}