diff options
author | Vincent Ambo <mail@tazj.in> | 2022-08-11T12·29+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2022-08-26T09·02+0000 |
commit | 20f5ccefeb88ce4b79369085977b674c612e8fed (patch) | |
tree | b76f0bea439f792bc0f092f81e8871354c31b75b /tvix/eval/src/compiler.rs | |
parent | 671915837aee2908431b1d1908352fc0ab9cd628 (diff) |
feat(tvix/eval): implement attribute set access operator r/4492
Fairly straightforward, handling the optimised representations manually and otherwise delegating to BTreeMap. Note that parsing of raw identifiers is not yet implemented. Encountering an identifier node usually means that there is locals access going on, so we need a special case for compiling a node in such a way that an identifier's literal value ends up on the stack. Change-Id: I13fbab7ac657b17ef3f4c5859fe737c321890c8a Reviewed-on: https://cl.tvl.fyi/c/depot/+/6158 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'tvix/eval/src/compiler.rs')
-rw-r--r-- | tvix/eval/src/compiler.rs | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/tvix/eval/src/compiler.rs b/tvix/eval/src/compiler.rs index 1bfd765a07cd..3a6c685c7d29 100644 --- a/tvix/eval/src/compiler.rs +++ b/tvix/eval/src/compiler.rs @@ -75,6 +75,11 @@ impl Compiler { self.compile_attr_set(node) } + rnix::SyntaxKind::NODE_SELECT => { + let node = rnix::types::Select::cast(node).unwrap(); + self.compile_select(node) + } + rnix::SyntaxKind::NODE_LIST => { let node = rnix::types::List::cast(node).unwrap(); self.compile_list(node) @@ -85,10 +90,7 @@ impl Compiler { self.compile_if_else(node) } - kind => { - println!("visiting unsupported node: {:?}", kind); - Ok(()) - } + kind => panic!("visiting unsupported node: {:?}", kind), } } @@ -282,6 +284,20 @@ impl Compiler { Ok(()) } + fn compile_select(&mut self, node: rnix::types::Select) -> EvalResult<()> { + // Push the set onto the stack + self.compile(node.set().unwrap())?; + + // Push the key and emit the access instruction. + // + // This order matters because the key needs to be evaluated + // first to fail in the correct order on type errors. + self.compile(node.index().unwrap())?; + self.chunk.add_op(OpCode::OpAttrsSelect); + + Ok(()) + } + // Compile list literals into equivalent bytecode. List // construction is fairly simple, composing of pushing code for // each literal element and an instruction with the element count. |