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

feat(tvix/eval): allow extending builtins outside of tvix_eval

Browse source 
The change allows applications that use tvix_serde for parsing
nix-based configuration to extend the language with domain-specific
set of features.

Change-Id: Ia86612308a167c456ecf03e93fe0fbae55b876a6
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8848
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
Evgeny Zemtsov 2023-06-22 17:57:50 +02:00 • committed by ezemtsov
parent 8cdad7d45c
commit c8fcdca4eb
9 changed files with 55 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tvix/eval/builtin-macros/src/lib.rs
View file

@ -116,10 +116,8 @@ fn parse_module_args(args: TokenStream) -> Option<Type> {
///
/// # Examples
/// ```ignore
/// # use tvix_eval;
/// # use tvix_eval_builtin_macros::builtins;
/// # mod value {
/// # pub use tvix_eval::Builtin;
/// # }
///
/// #[builtins]
/// mod builtins {
@ -270,7 +268,7 @@ pub fn builtins(args: TokenStream, item: TokenStream) -> TokenStream {
if arg.strict {
f.block = Box::new(parse_quote_spanned! {arg.span=> {
let #ident: #ty = generators::request_force(&co, values.pop()
let #ident: #ty = tvix_eval::generators::request_force(&co, values.pop()
.expect("Tvix bug: builtin called with incorrect number of arguments")).await;
#block
@ -295,20 +293,20 @@ pub fn builtins(args: TokenStream, item: TokenStream) -> TokenStream {
if captures_state {
builtins.push(quote_spanned! { builtin_attr.span() => {
let inner_state = state.clone();
crate::Builtin::new(
tvix_eval::Builtin::new(
#name,
#docstring,
#arg_count,
move |values| Gen::new(|co| generators::pin_generator(#fn_name(inner_state.clone(), co, values))),
move |values| Gen::new(|co| tvix_eval::generators::pin_generator(#fn_name(inner_state.clone(), co, values))),
)
}});
} else {
builtins.push(quote_spanned! { builtin_attr.span() => {
crate::Builtin::new(
tvix_eval::Builtin::new(
#name,
#docstring,
#arg_count,
|values| Gen::new(|co| generators::pin_generator(#fn_name(co, values))),
|values| Gen::new(|co| tvix_eval::generators::pin_generator(#fn_name(co, values))),
)
}});
}

1
tvix/eval/src/builtins/impure.rs
View file

@ -7,6 +7,7 @@ use std::{
};
use crate::{
self as tvix_eval,
errors::ErrorKind,
io::FileType,
value::NixAttrs,

1
tvix/eval/src/builtins/mod.rs
View file

@ -16,6 +16,7 @@ use crate::value::PointerEquality;
use crate::vm::generators::{self, GenCo};
use crate::warnings::WarningKind;
use crate::{
self as tvix_eval,
errors::ErrorKind,
value::{CoercionKind, NixAttrs, NixList, NixString, SharedThunkSet, Thunk, Value},
};

1
tvix/eval/src/tests/mod.rs
View file

@ -10,6 +10,7 @@ mod one_offs;
mod mock_builtins {
//! Builtins which are required by language tests, but should not
//! actually exist in //tvix/eval.
use crate as tvix_eval;
use crate::generators::GenCo;
use crate::*;
use genawaiter::rc::Gen;