diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-12-13T04·49-0800 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2023-12-29T21·34+0000 |
| commit | 2af8174e2e36d4c96f612e92b3e00c3330fb56fa (patch) | |
| tree | 7a5f708e1ef2fcbe8fc78ea09721aac44c978cb4 /tvix/eval/src | |
| parent | 11e35a77a671b3d85ea161e1799ef3f6d98201f1 (diff) | |
fix(tvix/eval): builtins.match: propagate catchables r/7273
Change-Id: I14c9e625c91369e10d0c00380dca992811ae9059 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10346 Reviewed-by: sterni <sternenseemann@systemli.org> Autosubmit: Adam Joseph <adam@westernsemico.com> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src')
3 files changed, 12 insertions, 2 deletions
diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index 6cdb434f42b4..7cc2732ecfd9 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -766,8 +766,16 @@ mod pure_builtins { #[builtin("match")] async fn builtin_match(co: GenCo, regex: Value, str: Value) -> Result<Value, ErrorKind> { - let s = str.to_str()?; - let re = regex.to_str()?; + let s = str; + if s.is_catchable() { + return Ok(s); + } + let s = s.to_str()?; + let re = regex; + if re.is_catchable() { + return Ok(re); + } + let re = re.to_str()?; let re: Regex = Regex::new(&format!("^{}$", re.as_str())).unwrap(); match re.captures(&s) { Some(caps) => Ok(Value::List( diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-match-propagate-catchables.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-match-propagate-catchables.exp new file mode 100644 index 000000000000..c508d5366f70 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-match-propagate-catchables.exp @@ -0,0 +1 @@ +false diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-match-propagate-catchables.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-match-propagate-catchables.nix new file mode 100644 index 000000000000..8d00994b60f5 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-match-propagate-catchables.nix @@ -0,0 +1 @@ +(builtins.tryEval (builtins.match (throw "foo") ".*")).success |