From e0f1356ae31783664f597b33f8b69b060a9e3033 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 24 Aug 2022 11:00:30 +0300 Subject: feat(tvix/eval): add initial representation of builtins Builtins are represented as a Rust function pointer that accepts a vector of arguments, which represents variable arity builtins. Change-Id: Ibab7e662a646caf1172695d876d2f55e187c03dd Reviewed-on: https://cl.tvl.fyi/c/depot/+/6251 Tested-by: BuildkiteCI Reviewed-by: grfn --- tvix/eval/src/value/mod.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tvix/eval/src/value/mod.rs') diff --git a/tvix/eval/src/value/mod.rs b/tvix/eval/src/value/mod.rs index 2177ca26d904..bf07c5d326d0 100644 --- a/tvix/eval/src/value/mod.rs +++ b/tvix/eval/src/value/mod.rs @@ -4,12 +4,14 @@ use std::rc::Rc; use std::{fmt::Display, path::PathBuf}; mod attrs; +mod builtin; mod lambda; mod list; mod string; use crate::errors::{ErrorKind, EvalResult}; pub use attrs::NixAttrs; +pub use builtin::Builtin; pub use lambda::Lambda; pub use list::NixList; pub use string::NixString; @@ -26,6 +28,7 @@ pub enum Value { Attrs(Rc), List(NixList), Lambda(Lambda), + Builtin(Builtin), // Internal values that, while they technically exist at runtime, // are never returned to or created directly by users. @@ -49,7 +52,7 @@ impl Value { Value::Path(_) => "path", Value::Attrs(_) => "set", Value::List(_) => "list", - Value::Lambda(_) => "lambda", + Value::Lambda(_) | Value::Builtin(_) => "lambda", // Internal types Value::AttrPath(_) | Value::Blackhole | Value::NotFound => "internal", @@ -128,6 +131,7 @@ impl Display for Value { Value::Attrs(attrs) => attrs.fmt(f), Value::List(list) => list.fmt(f), Value::Lambda(_) => f.write_str("lambda"), // TODO: print position + Value::Builtin(builtin) => builtin.fmt(f), // Nix prints floats with a maximum precision of 5 digits // only. -- cgit 1.4.1