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

fix(tvix/eval): make sure to deref thunk in type predicate builtins

Browse source 
Previously we only matched the outer constructor after forcing which
would mean that we would always return `false` if the inspected value
was a thunk, regardless what value would be present inside.

Change-Id: I361ea6e855e23ef8e5b59098a50b9cd59253803f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6692
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
This commit is contained in:
sterni 2022-09-19 11:47:34 +02:00
parent fe3c4720a6
commit e04ccc9354
3 changed files with 63 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

46
tvix/eval/src/builtins/mod.rs
View file

@ -154,35 +154,45 @@ fn pure_builtins() -> Vec<Builtin> {
Some(x) => Ok(x.clone()),
None => Err(ErrorKind::IndexOutOfBounds { index: 0 }),
}),
Builtin::new("isAttrs", &[true], |args, _| {
Ok(Value::Bool(matches!(args[0], Value::Attrs(_))))
// For `is*` predicates we force manually, as Value::force also unwraps any Thunks
Builtin::new("isAttrs", &[false], |args, vm| {
let value = args[0].force(vm)?;
Ok(Value::Bool(matches!(*value, Value::Attrs(_))))
}),
Builtin::new("isBool", &[true], |args, _| {
Ok(Value::Bool(matches!(args[0], Value::Bool(_))))
Builtin::new("isBool", &[false], |args, vm| {
let value = args[0].force(vm)?;
Ok(Value::Bool(matches!(*value, Value::Bool(_))))
}),
Builtin::new("isFloat", &[true], |args, _| {
Ok(Value::Bool(matches!(args[0], Value::Float(_))))
Builtin::new("isFloat", &[false], |args, vm| {
let value = args[0].force(vm)?;
Ok(Value::Bool(matches!(*value, Value::Float(_))))
}),
Builtin::new("isFunction", &[true], |args, _| {
Builtin::new("isFunction", &[false], |args, vm| {
let value = args[0].force(vm)?;
Ok(Value::Bool(matches!(
args[0],
*value,
Value::Closure(_) | Value::Builtin(_)
)))
}),
Builtin::new("isInt", &[true], |args, _| {
Ok(Value::Bool(matches!(args[0], Value::Integer(_))))
Builtin::new("isInt", &[false], |args, vm| {
let value = args[0].force(vm)?;
Ok(Value::Bool(matches!(*value, Value::Integer(_))))
}),
Builtin::new("isList", &[true], |args, _| {
Ok(Value::Bool(matches!(args[0], Value::List(_))))
Builtin::new("isList", &[false], |args, vm| {
let value = args[0].force(vm)?;
Ok(Value::Bool(matches!(*value, Value::List(_))))
}),
Builtin::new("isNull", &[true], |args, _| {
Ok(Value::Bool(matches!(args[0], Value::Null)))
Builtin::new("isNull", &[false], |args, vm| {
let value = args[0].force(vm)?;
Ok(Value::Bool(matches!(*value, Value::Null)))
}),
Builtin::new("isPath", &[true], |args, _| {
Ok(Value::Bool(matches!(args[0], Value::Path(_))))
Builtin::new("isPath", &[false], |args, vm| {
let value = args[0].force(vm)?;
Ok(Value::Bool(matches!(*value, Value::Path(_))))
}),
Builtin::new("isString", &[true], |args, _| {
Ok(Value::Bool(matches!(args[0], Value::String(_))))
Builtin::new("isString", &[false], |args, vm| {
let value = args[0].force(vm)?;
Ok(Value::Bool(matches!(*value, Value::String(_))))
}),
Builtin::new("mul", &[true, true], |mut args, _| {
let b = args.pop().unwrap();