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

feat(tvix/eval): OpAttrsSelect should propagate catchables

Browse source 
Previously, using a catchable as either argument of OpAttrsSelect
would result in an unrecoverable error.  This commit matches cppnix
behavior by propagating the catchable.

Change-Id: I4877f4068ec2b823225f185290693c101d0b9c9e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10303
Tested-by: BuildkiteCI
Autosubmit: Adam Joseph <adam@westernsemico.com>
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Adam Joseph 2023-12-12 02:59:19 -08:00 committed by clbot
parent 2949ee08f1
commit 990c4e727f
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -538,19 +538,27 @@ impl<'o> VM<'o> {
}
OpCode::OpAttrsSelect => {
let key = self.stack_pop().to_str().with_span(&frame, self)?;
let attrs = self.stack_pop().to_attrs().with_span(&frame, self)?;
let key = self.stack_pop();
let attrs = self.stack_pop();
if key.is_catchable() {
self.stack.push(key);
} else if attrs.is_catchable() {
self.stack.push(attrs);
} else {
let key = key.to_str().with_span(&frame, self)?;
let attrs = attrs.to_attrs().with_span(&frame, self)?;
match attrs.select(key.as_str()) {
Some(value) => self.stack.push(value.clone()),
match attrs.select(key.as_str()) {
Some(value) => self.stack.push(value.clone()),
None => {
return frame.error(
self,
ErrorKind::AttributeNotFound {
name: key.as_str().to_string(),
},
);
None => {
return frame.error(
self,
ErrorKind::AttributeNotFound {
name: key.as_str().to_string(),
},
);
}
}
}
}