maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/eval): allow use of ? operator on non-set types

Browse source 
Nix allows this, but always returns false. Tvix needs to do the same.

Change-Id: Ic9eec90834a0d0969eea5316d5c25032d3691d94
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6209
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2022-08-14 14:27:02 +03:00 • committed by tazjin
parent 43658a5b90
commit 76846fe220
4 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -192,9 +192,15 @@ impl VM {
OpCode::OpAttrsIsSet => {
let key = self.pop().to_string()?;
let attrs = self.pop().to_attrs()?;
let result = Value::Bool(attrs.select(key.as_str()).is_some());
self.push(result);
let result = match self.pop() {
Value::Attrs(attrs) => attrs.select(key.as_str()).is_some(),
// Nix allows use of `?` on non-set types, but
// always returns false in those cases.
_ => false,
};
self.push(Value::Bool(result));
}
OpCode::OpList(count) => {