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

fix(tvix/eval): propagate catchables in string interpolations

Browse source 
Change-Id: I13d7ce0c7328a8e6fbc6d2c4ff5c4fe6095b96ea
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10357
Autosubmit: Adam Joseph <adam@westernsemico.com>
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
This commit is contained in:
Adam Joseph 2023-12-13 04:17:25 -08:00 committed by tazjin
parent 7ddea7340f
commit 2883b2d4bd
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-string-interpolation.exp Normal file
View file

@ -0,0 +1 @@
false

1
tvix/eval/src/tests/tvix_tests/eval-okay-catchable-in-string-interpolation.nix Normal file
View file

@ -0,0 +1 @@
(builtins.tryEval ("${toString 3} ${throw "bob"}")).success

12
tvix/eval/src/vm/mod.rs
View file

@ -983,8 +983,16 @@ impl<'o> VM<'o> {
fn run_interpolate(&mut self, frame: &CallFrame, count: usize) -> EvalResult<()> {
let mut out = String::new();
for _ in 0..count {
out.push_str(self.stack_pop().to_str().with_span(frame, self)?.as_str());
for i in 0..count {
let val = self.stack_pop();
if val.is_catchable() {
for _ in (i + 1)..count {
self.stack.pop();
}
self.stack.push(val);
return Ok(());
}
out.push_str(val.to_str().with_span(frame, self)?.as_str());
}
self.stack.push(Value::String(out.into()));