about summary refs log tree commit diff
path: root/tvix/eval/src/vm.rs
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-08-14T11·27+0300
committertazjin <tazjin@tvl.su>2022-08-30T17·13+0000
commit76846fe22032546661cdf8649b8f898fc36e5270 (patch)
tree2f1d71baedc21a21b350706e29a8cef0f06b4605 /tvix/eval/src/vm.rs
parent43658a5b90786eb169471f02e6738359214343d9 (diff)
fix(tvix/eval): allow use of ? operator on non-set types r/4542
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
Diffstat (limited to 'tvix/eval/src/vm.rs')
-rw-r--r--tvix/eval/src/vm.rs12
1 files changed, 9 insertions, 3 deletions
diff --git a/tvix/eval/src/vm.rs b/tvix/eval/src/vm.rs
index f96a5dcbddaf..d050fa807106 100644
--- a/tvix/eval/src/vm.rs
+++ b/tvix/eval/src/vm.rs
@@ -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) => {