diff options
author | Vincent Ambo <mail@tazj.in> | 2022-08-24T13·03+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2022-09-02T12·59+0000 |
commit | e1147b57c74d23a3f18b1a1e7413e4d0b9d5e2ba (patch) | |
tree | 3ca30a9dc1ac2910c34569276927f0ebacf830c1 /tvix/eval/src/compiler.rs | |
parent | ca90c0f45ad9892c35a2a0402939b857a6fca08e (diff) |
feat(tvix/eval): introduce mechanism for defining builtins r/4588
Adds a new builtins module in which builtins can be constructed. The functions in this module should return a correctly structured value to be passed to the compiler's `globals`. This is wired up all the way to the compiler with an example `toString` builtin, available as a global. Note that this does not yet actually behave like the real toString, which has some differences from `Display`. Change-Id: Ibb5f6fbe6207782fdf2434435567fc1bd80039a5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6254 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'tvix/eval/src/compiler.rs')
-rw-r--r-- | tvix/eval/src/compiler.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tvix/eval/src/compiler.rs b/tvix/eval/src/compiler.rs index 1bbd791876ab..cb97b61c989e 100644 --- a/tvix/eval/src/compiler.rs +++ b/tvix/eval/src/compiler.rs @@ -1029,7 +1029,11 @@ fn prepare_globals(additional: HashMap<&'static str, Value>) -> GlobalsMap { globals } -pub fn compile(expr: ast::Expr, location: Option<PathBuf>) -> EvalResult<CompilationResult> { +pub fn compile( + expr: ast::Expr, + location: Option<PathBuf>, + globals: HashMap<&'static str, Value>, +) -> EvalResult<CompilationResult> { let mut root_dir = match location { Some(dir) => Ok(dir), None => std::env::current_dir().map_err(|e| { @@ -1044,12 +1048,9 @@ pub fn compile(expr: ast::Expr, location: Option<PathBuf>) -> EvalResult<Compila root_dir.pop(); } - // TODO: accept globals as an external parameter - let globals = prepare_globals(HashMap::new()); - let mut c = Compiler { root_dir, - globals, + globals: prepare_globals(globals), contexts: vec![LambdaCtx::new()], warnings: vec![], errors: vec![], |