maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/eval): introduce Closure struct in Value type

Browse source 
This struct will carry the upvalue machinery in addition to the lambda
itself. For now, all lambdas are wrapped in closures (though
technically analysis of the environment can later remove innermost
Closure wrapper, but this optimisation may not be worth it).

Change-Id: If2b68549ec1ea4ab838fdc47a2181c694ac937f2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6269
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2022-08-24 22:08:26 +03:00 • committed by tazjin
parent af9dca3663
commit 6ce2c666c3
5 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tvix/eval/src/value/mod.rs
View file

@ -5,14 +5,14 @@ use std::{fmt::Display, path::PathBuf};
mod attrs;
mod builtin;
mod lambda;
mod function;
mod list;
mod string;
use crate::errors::{ErrorKind, EvalResult};
pub use attrs::NixAttrs;
pub use builtin::Builtin;
pub use lambda::Lambda;
pub use function::{Closure, Lambda};
pub use list::NixList;
pub use string::NixString;
@ -27,7 +27,7 @@ pub enum Value {
Path(PathBuf),
Attrs(Rc<NixAttrs>),
List(NixList),
Lambda(Lambda),
Closure(Closure),
Builtin(Builtin),
// Internal values that, while they technically exist at runtime,
@ -52,7 +52,7 @@ impl Value {
Value::Path(_) => "path",
Value::Attrs(_) => "set",
Value::List(_) => "list",
Value::Lambda(_) | Value::Builtin(_) => "lambda",
Value::Closure(_) | Value::Builtin(_) => "lambda",
// Internal types
Value::AttrPath(_) | Value::Blackhole | Value::NotFound => "internal",
@ -130,7 +130,7 @@ impl Display for Value {
Value::Path(p) => p.display().fmt(f),
Value::Attrs(attrs) => attrs.fmt(f),
Value::List(list) => list.fmt(f),
Value::Lambda(_) => f.write_str("lambda"), // TODO: print position
Value::Closure(_) => f.write_str("lambda"), // TODO: print position
Value::Builtin(builtin) => builtin.fmt(f),
// Nix prints floats with a maximum precision of 5 digits