diff options
author | Vincent Ambo <mail@tazj.in> | 2022-08-11T19·01+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2022-08-26T15·06+0000 |
commit | b8cec6d61e8cf30e12924dbbc6b24fecea310a17 (patch) | |
tree | e4ae7312632f51b852390070a29b838cb3ef6c03 /tvix/eval/src/value/mod.rs | |
parent | 999b9c7a138a5dd5277085570042fc67a893e5af (diff) |
feat(tvix/vm): add opcodes for new Value::NotFound sentinel r/4499
This sentinel value is going to be used for certain nested accesses into attribute sets. There is a new instruction similar to `OpAttrsSelect` which leaves the sentinel on the stack if a key is not found, instead of raising an error. Additionally, a new jump instruction makes its jump operation conditional on finding such a sentinel value. Change-Id: I2642f0a0bcc85bbe0ead68ea09a7dd794dbedeac Reviewed-on: https://cl.tvl.fyi/c/depot/+/6166 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'tvix/eval/src/value/mod.rs')
-rw-r--r-- | tvix/eval/src/value/mod.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tvix/eval/src/value/mod.rs b/tvix/eval/src/value/mod.rs index 355678fb7496..e9fdc40ac5c6 100644 --- a/tvix/eval/src/value/mod.rs +++ b/tvix/eval/src/value/mod.rs @@ -26,6 +26,7 @@ pub enum Value { // are never returned to or created directly by users. AttrPath(Vec<NixString>), Blackhole, + NotFound, } impl Value { @@ -48,7 +49,7 @@ impl Value { Value::List(_) => "list", // Internal types - Value::AttrPath(_) | Value::Blackhole => "internal", + Value::AttrPath(_) | Value::Blackhole | Value::NotFound => "internal", } } @@ -116,8 +117,9 @@ impl Display for Value { )), // internal types - Value::AttrPath(_) => f.write_str("internal<attrpath>"), - Value::Blackhole => f.write_str("internal<blackhole>"), + Value::AttrPath(_) => f.write_str("internal[attrpath]"), + Value::Blackhole => f.write_str("internal[blackhole]"), + Value::NotFound => f.write_str("internal[not found]"), } } } |