remove lazy mode

cspell.json

@@ -31,7 +31,6 @@
     "monomorphized",
     "newtype",
     "nilary",
-    "nohash",
     "nomicon",
     "oper",
     "outdir",

host/src/encode.rs

@@ -2,7 +2,7 @@ use crate::prelude::*;
 
 use crate::Host;
 use hvm64_ast::{Lab, Net as AstNet, Tree};
-use hvm64_runtime::{Instruction, InterpretedDef, Mode, Net, Port, Trg, TrgId};
+use hvm64_runtime::{Instruction, InterpretedDef, Net, Port, Trg, TrgId};
 use hvm64_util::{maybe_grow, ops::TypedOp as Op};
 
 impl Host {
@@ -19,15 +19,15 @@ impl Host {
 
   /// Encode `tree` directly into `trg`, skipping the intermediate `Def`
   /// representation.
-  pub fn encode_tree<M: Mode>(&self, net: &mut Net<M>, trg: Trg, tree: &Tree) {
+  pub fn encode_tree(&self, net: &mut Net, trg: Trg, tree: &Tree) {
     let mut state = State { host: self, encoder: net, scope: Default::default() };
     state.visit_tree(tree, trg);
     state.finish();
   }
 
   /// Encode the root of `ast_net` directly into `trg` and encode its redexes
   /// into `net` redex list.
-  pub fn encode_net<M: Mode>(&self, net: &mut Net<M>, trg: Trg, ast_net: &AstNet) {
+  pub fn encode_net(&self, net: &mut Net, trg: Trg, ast_net: &AstNet) {
     let mut state = State { host: self, encoder: net, scope: Default::default() };
     state.visit_net(ast_net, trg);
     state.finish();
@@ -193,7 +193,7 @@ impl Encoder for InterpretedDef {
   }
 }
 
-impl<'a, M: Mode> Encoder for Net<'a, M> {
+impl<'a> Encoder for Net<'a> {
   type Trg = Trg;
 
   fn link_const(&mut self, trg: Self::Trg, port: Port) {

host/src/host.rs

@@ -7,7 +7,7 @@ include!("../../prelude.rs");
 
 use crate::prelude::*;
 use hvm64_ast::{Book, Tree};
-use hvm64_runtime::{Addr, Def, InterpretedDef, LabSet, Mode, Port, Tag, Wire};
+use hvm64_runtime::{Addr, Def, InterpretedDef, LabSet, Port, Tag, Wire};
 
 use core::ops::{Deref, DerefMut};
 

host/src/readback.rs

@@ -1,6 +1,6 @@
 use crate::prelude::*;
 
-use super::{Addr, Host, Mode, Port, Tag, Wire};
+use super::{Addr, Host, Port, Tag, Wire};
 
 use core::ops::RangeFrom;
 
@@ -19,7 +19,7 @@ impl Host {
   /// resulting ast net, as it is impossible to read these back from the runtime
   /// net representation. In the case of vicious circles, this may result in
   /// unbound variables.
-  pub fn readback<M: Mode>(&self, rt_net: &hvm64_runtime::Net<M>) -> Net {
+  pub fn readback(&self, rt_net: &hvm64_runtime::Net) -> Net {
     let mut state = ReadbackState { host: self, vars: Default::default(), var_id: 0 .. };
     let mut net = Net::default();
 

host/src/stdlib.rs

@@ -10,13 +10,13 @@ use parking_lot::Mutex;
 
 use crate::{DefRef, Host};
 use hvm64_ast::Tree;
-use hvm64_runtime::{dispatch_dyn_net, AsDef, Def, DynNetMut, LabSet, Mode, Net, Port, Tag, Trg};
+use hvm64_runtime::{AsDef, Def, LabSet, Net, Port, Tag, Trg};
 use hvm64_util::create_var;
 
 /// `@IDENTITY = (x x)`
-pub const IDENTITY: *const Def = const { &Def::new(LabSet::from_bits(&[1]), (call_identity, call_identity)) }.upcast();
+pub const IDENTITY: *const Def = const { &Def::new(LabSet::from_bits(&[1]), call_identity) }.upcast();
 
-fn call_identity<M: Mode>(net: &mut Net<M>, port: Port) {
+fn call_identity(net: &mut Net, port: Port) {
   let (a, b) = net.do_ctr(0, Trg::port(port));
   net.link_trg(a, b);
 }
@@ -41,7 +41,7 @@ impl<F: Fn(Tree) + Clone + Send + Sync + 'static> LogDef<F> {
 pub struct LogDef<F>(Arc<Mutex<Host>>, F);
 
 impl<F: Fn(Tree) + Clone + Send + Sync + 'static> AsHostedDef for LogDef<F> {
-  fn call<M: Mode>(def: &Def<Self>, net: &mut Net<M>, port: Port) {
+  fn call(def: &Def<Self>, net: &mut Net, port: Port) {
     let (arg, seq) = net.do_ctr(0, Trg::port(port));
     let seq = net.wire_to_trg(seq);
     // SAFETY: the function inside `readback` won't live longer than
@@ -50,9 +50,7 @@ impl<F: Fn(Tree) + Clone + Send + Sync + 'static> AsHostedDef for LogDef<F> {
     let def: &'static Def<Self> = unsafe { mem::transmute(def) };
     readback(net, def.data.0.clone(), arg, |net, tree| {
       (def.data.1)(tree);
-      dispatch_dyn_net!(net => {
-        net.link_wire_port(seq, Port::new_ref(unsafe { &*IDENTITY }));
-      });
+      net.link_wire_port(seq, Port::new_ref(unsafe { &*IDENTITY }));
     });
   }
 }
@@ -102,11 +100,11 @@ impl<T: AsBoxDef> BoxDef<T> {
 }
 
 pub trait AsBoxDef: Send + Sync + 'static {
-  fn call<M: Mode>(slf: Box<Def<Self>>, net: &mut Net<M>, port: Port);
+  fn call(slf: Box<Def<Self>>, net: &mut Net, port: Port);
 }
 
 impl<T: AsBoxDef> AsDef for BoxDef<T> {
-  unsafe fn call<M: Mode>(slf: *const Def<Self>, net: &mut Net<M>, port: Port) {
+  unsafe fn call(slf: *const Def<Self>, net: &mut Net, port: Port) {
     T::call(Box::from_raw(slf as *mut _), net, port)
   }
 }
@@ -136,11 +134,11 @@ impl<T: AsArcDef> ArcDef<T> {
 }
 
 pub trait AsArcDef: Send + Sync + 'static {
-  fn call<M: Mode>(slf: Arc<Def<Self>>, net: &mut Net<M>, port: Port);
+  fn call(slf: Arc<Def<Self>>, net: &mut Net, port: Port);
 }
 
 impl<T: AsArcDef> AsDef for ArcDef<T> {
-  unsafe fn call<M: Mode>(slf: *const Def<Self>, net: &mut Net<M>, port: Port) {
+  unsafe fn call(slf: *const Def<Self>, net: &mut Net, port: Port) {
     T::call(Arc::from_raw(slf as *mut _), net, port);
   }
 }
@@ -162,11 +160,11 @@ impl<T: AsHostedDef> HostedDef<T> {
 }
 
 pub trait AsHostedDef: Send + Sync + 'static {
-  fn call<M: Mode>(slf: &Def<Self>, net: &mut Net<M>, port: Port);
+  fn call(slf: &Def<Self>, net: &mut Net, port: Port);
 }
 
 impl<T: AsHostedDef> AsDef for HostedDef<T> {
-  unsafe fn call<M: Mode>(slf: *const Def<Self>, net: &mut Net<M>, port: Port) {
+  unsafe fn call(slf: *const Def<Self>, net: &mut Net, port: Port) {
     T::call((slf as *const Def<T>).as_ref().unwrap(), net, port)
   }
 }
@@ -182,15 +180,15 @@ impl UniqueTreePtr {
   }
 }
 
-pub struct ReadbackDef<F: FnOnce(DynNetMut) + Send + Sync + 'static> {
+pub struct ReadbackDef<F: FnOnce(&mut Net) + Send + Sync + 'static> {
   root: Arc<F>,
   host: Arc<Mutex<Host>>,
   var_idx: Arc<AtomicUsize>,
   tree: UniqueTreePtr,
 }
 
-impl<F: FnOnce(DynNetMut) + Send + Sync + 'static> ReadbackDef<F> {
-  fn maybe_finish(net: DynNetMut<'_, '_>, root: Arc<F>) {
+impl<F: FnOnce(&mut Net) + Send + Sync + 'static> ReadbackDef<F> {
+  fn maybe_finish(net: &mut Net, root: Arc<F>) {
     let Some(root) = Arc::into_inner(root) else { return };
     (root)(net)
   }
@@ -204,8 +202,8 @@ impl<F: FnOnce(DynNetMut) + Send + Sync + 'static> ReadbackDef<F> {
   }
 }
 
-impl<F: FnOnce(DynNetMut) + Send + Sync + 'static> AsBoxDef for ReadbackDef<F> {
-  fn call<M: Mode>(def: Box<Def<Self>>, net: &mut Net<M>, port: Port) {
+impl<F: FnOnce(&mut Net) + Send + Sync + 'static> AsBoxDef for ReadbackDef<F> {
+  fn call(def: Box<Def<Self>>, net: &mut Net, port: Port) {
     match port.tag() {
       Tag::Var | Tag::Red => {
         unreachable!()
@@ -218,7 +216,7 @@ impl<F: FnOnce(DynNetMut) + Send + Sync + 'static> AsBoxDef for ReadbackDef<F> {
             (*def.data.tree.0) = var.clone();
             (*other.data.0.tree.0) = var;
           }
-          Self::maybe_finish(DynNetMut::from(&mut *net), other.data.0.root);
+          Self::maybe_finish(net, other.data.0.root);
         } else if let Some(back) = def.data.host.lock().back.get(&port.addr()) {
           unsafe { *(def.data.tree.0) = Tree::Ref { nam: back.clone() } };
         } else {
@@ -267,38 +265,30 @@ impl<F: FnOnce(DynNetMut) + Send + Sync + 'static> AsBoxDef for ReadbackDef<F> {
         net.link_wire_port(old.p2, def.data.with(rhs));
       }
     }
-    Self::maybe_finish(DynNetMut::from(net), def.data.root);
+    Self::maybe_finish(net, def.data.root);
   }
 }
 
-pub fn readback<M: Mode>(
-  net: &mut Net<M>,
+pub fn readback(
+  net: &mut Net,
   host: Arc<Mutex<Host>>,
   from: Trg,
-  f: impl FnOnce(DynNetMut, Tree) + Send + Sync + 'static,
+  f: impl FnOnce(&mut Net, Tree) + Send + Sync + 'static,
 ) {
   let root = UniqueTreePtr(Box::leak(Box::default()));
 
-  if M::LAZY {
-    let from = net.wire_to_trg(from);
-    net.normal_from(from.clone());
-    let tree = host.lock().readback_tree(&from);
-    net.link_wire_port(from, Port::ERA);
-    f(DynNetMut::from(net), tree);
-  } else {
-    let closure: Box<dyn FnOnce(DynNetMut) + Send + Sync + 'static> = Box::new(move |net| {
-      let root = unsafe { root.to_box() };
-      f(net, *root);
-    });
+  let closure: Box<dyn FnOnce(&mut Net) + Send + Sync + 'static> = Box::new(move |net| {
+    let root = unsafe { root.to_box() };
+    f(net, *root);
+  });
 
-    net.link_trg_port(
-      from,
-      Port::new_ref(Box::leak(BoxDef::new_boxed(LabSet::ALL, ReadbackDef {
-        root: Arc::new(closure),
-        host,
-        tree: root,
-        var_idx: Arc::new(AtomicUsize::from(0)),
-      }))),
-    );
-  }
+  net.link_trg_port(
+    from,
+    Port::new_ref(Box::leak(BoxDef::new_boxed(LabSet::ALL, ReadbackDef {
+      root: Arc::new(closure),
+      host,
+      tree: root,
+      var_idx: Arc::new(AtomicUsize::from(0)),
+    }))),
+  );
 }

runtime/Cargo.toml

@@ -8,12 +8,11 @@ path = "src/runtime.rs"
 
 [dependencies]
 parking_lot = "0.12.2"
-nohash-hasher = { version = "0.2.0", optional = true }
 
 hvm64-util = { path = "../util", default-features = false }
 
 [features]
-std = ["hvm64-util/std", "dep:nohash-hasher"]
+std = ["hvm64-util/std"]
 trace = []
 
 [lints]

runtime/src/addr.rs

@@ -12,9 +12,6 @@ use super::*;
 #[must_use]
 pub struct Addr(pub usize);
 
-#[cfg(feature = "std")]
-impl nohash_hasher::IsEnabled for Addr {}
-
 impl fmt::Debug for Addr {
   fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
     write!(f, "{:012x?}", self.0)

runtime/src/def.rs

@@ -88,8 +88,7 @@ pub struct Def<T: ?Sized + Send + Sync = Dynamic> {
   /// interaction combinator whose label is not in this set.
   pub labs: LabSet,
   ty: TypeId,
-  call_strict: unsafe fn(*const Def<T>, &mut Net<Strict>, port: Port),
-  call_lazy: unsafe fn(*const Def<T>, &mut Net<Lazy>, port: Port),
+  call: unsafe fn(*const Def<T>, &mut Net, port: Port),
   pub data: T,
 }
 
@@ -106,15 +105,15 @@ unsafe impl Send for Dynamic {}
 unsafe impl Sync for Dynamic {}
 
 pub trait AsDef: Any + Send + Sync {
-  unsafe fn call<M: Mode>(slf: *const Def<Self>, net: &mut Net<M>, port: Port);
+  unsafe fn call(slf: *const Def<Self>, net: &mut Net, port: Port);
 }
 
 impl<T: Send + Sync> Def<T> {
   pub const fn new(labs: LabSet, data: T) -> Self
   where
     T: AsDef,
   {
-    Def { labs, ty: TypeId::of::<T>(), call_strict: T::call::<Strict>, call_lazy: T::call::<Lazy>, data }
+    Def { labs, ty: TypeId::of::<T>(), call: T::call, data }
   }
 
   #[inline(always)]
@@ -146,11 +145,8 @@ impl Def {
     unsafe { Def::downcast_mut_ptr(self).map(|x| &mut *x) }
   }
   #[inline(always)]
-  pub unsafe fn call<M: Mode>(slf: *const Def, net: &mut Net<M>, port: Port) {
-    match net.as_dyn_mut() {
-      DynNetMut::Strict(net) => ((*slf).call_strict)(slf as *const _, net, port),
-      DynNetMut::Lazy(net) => ((*slf).call_lazy)(slf as *const _, net, port),
-    }
+  pub unsafe fn call(slf: *const Def, net: &mut Net, port: Port) {
+    ((*slf).call)(slf as *const _, net, port)
   }
 }
 
@@ -169,18 +165,13 @@ impl<T: Send + Sync> DerefMut for Def<T> {
   }
 }
 
-impl<F: Fn(&mut Net<Strict>, Port) + Send + Sync + 'static, G: Fn(&mut Net<Lazy>, Port) + Send + Sync + 'static> AsDef
-  for (F, G)
-{
-  unsafe fn call<M: Mode>(slf: *const Def<Self>, net: &mut Net<M>, port: Port) {
-    match net.as_dyn_mut() {
-      DynNetMut::Strict(net) => ((*slf).data.0)(net, port),
-      DynNetMut::Lazy(net) => ((*slf).data.1)(net, port),
-    }
+impl<F: Fn(&mut Net, Port) + Send + Sync + 'static> AsDef for F {
+  unsafe fn call(slf: *const Def<Self>, net: &mut Net, port: Port) {
+    ((*slf).data)(net, port)
   }
 }
 
-impl<'a, M: Mode> Net<'a, M> {
+impl<'a> Net<'a> {
   /// Expands a [`Ref`] node connected to `trg`.
   #[inline(never)]
   pub fn call(&mut self, port: Port, trg: Port) {
@@ -223,7 +214,7 @@ impl InterpretedDef {
 }
 
 impl AsDef for InterpretedDef {
-  unsafe fn call<M: Mode>(def: *const Def<InterpretedDef>, net: &mut Net<M>, trg: Port) {
+  unsafe fn call(def: *const Def<InterpretedDef>, net: &mut Net, trg: Port) {
     let def = unsafe { &*def };
     let def = &def.data;
     let instructions = &def.instr;