mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/eval): track source spans for attrsets

Browse source 
Change-Id: I0fcb07146b5a38c67bc46ed3f67533b056858390
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6388
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2022-09-01 17:20:34 +03:00 committed by tazjin
parent eb169c51a7
commit d1e0c6f680
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tvix/eval/src/compiler/mod.rs
View file

@ -469,7 +469,7 @@ impl Compiler<'_> {
self.compile(slot, from.expr().unwrap());
self.emit_force();
self.emit_literal_ident(&ident);
self.push_op_old(OpCode::OpAttrsSelect);
self.push_op(OpCode::OpAttrsSelect, &ident);
}
}
@ -505,7 +505,10 @@ impl Compiler<'_> {
// otherwise we need to emit an instruction to construct
// the attribute path.
if key_count > 1 {
self.push_op_old(OpCode::OpAttrPath(Count(key_count)));
self.push_op(
OpCode::OpAttrPath(Count(key_count)),
&kv.attrpath().unwrap(),
);
}
// The value is just compiled as normal so that its
@ -514,7 +517,7 @@ impl Compiler<'_> {
self.compile(slot, kv.value().unwrap());
}
self.push_op_old(OpCode::OpAttrs(Count(count)));
self.push_op(OpCode::OpAttrs(Count(count)), &node);
}
fn compile_select(&mut self, slot: Option<LocalIdx>, node: ast::Select) {