difftreelog
perf move std.assertEqual, std.find to native
in: master
4 files changed
crates/jrsonnet-stdlib/src/arrays.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -276,6 +276,18 @@
}
#[builtin]
+pub fn builtin_find(value: Val, arr: ArrValue) -> Result<Vec<usize>> {
+ let mut out = Vec::new();
+ for (i, ele) in arr.iter().enumerate() {
+ let ele = ele?;
+ if equals(&ele, &value)? {
+ out.push(i);
+ }
+ }
+ Ok(out)
+}
+
+#[builtin]
pub fn builtin_contains(arr: IndexableVal, elem: Val) -> Result<bool> {
builtin_member(arr, elem)
}
crates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -91,6 +91,7 @@
("any", builtin_any::INST),
("all", builtin_all::INST),
("member", builtin_member::INST),
+ ("find", builtin_find::INST),
("contains", builtin_contains::INST),
("count", builtin_count::INST),
("avg", builtin_avg::INST),
@@ -213,6 +214,7 @@
("get", builtin_get::INST),
("startsWith", builtin_starts_with::INST),
("endsWith", builtin_ends_with::INST),
+ ("assertEqual", builtin_assert_equal::INST),
// Sets
("setMember", builtin_set_member::INST),
("setInter", builtin_set_inter::INST),
crates/jrsonnet-stdlib/src/misc.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/misc.rs
+++ b/crates/jrsonnet-stdlib/src/misc.rs
@@ -7,7 +7,7 @@
manifest::JsonFormat,
typed::{Either2, Either4},
val::{equals, ArrValue},
- Context, Either, IStr, ObjValue, Thunk, Val,
+ Context, Either, IStr, ObjValue, ResultExt, Thunk, Val,
};
use crate::{extvar_source, Settings};
@@ -141,3 +141,14 @@
_ => bail!("both arguments should be of the same type"),
})
}
+
+#[builtin]
+pub fn builtin_assert_equal(a: Val, b: Val) -> Result<bool> {
+ if equals(&a, &b)? {
+ return Ok(true);
+ }
+ let format = JsonFormat::std_to_json(" ".to_owned(), "\n", ": ");
+ let a = a.manifest(&format).description("<a> manifestification")?;
+ let b = b.manifest(&format).description("<b> manifestification")?;
+ bail!("assertion failed: A != B\nA: {a}\nB: {b}")
+}
crates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth11 else11 else12 { [k]: func(k, obj[k]) for k in std.objectFields(obj) },12 { [k]: func(k, obj[k]) for k in std.objectFields(obj) },131314 assertEqual(a, b)::15 if a == b then16 true17 else18 error 'Assertion failed. ' + a + ' != ' + b,1920 mergePatch(target, patch)::14 mergePatch(target, patch)::21 if std.isObject(patch) then15 if std.isObject(patch) then22 local target_object =16 local target_object =44 resolvePath(f, r)::38 resolvePath(f, r)::45 local arr = std.split(f, '/');39 local arr = std.split(f, '/');46 std.join('/', std.makeArray(std.length(arr) - 1, function(i) arr[i]) + [r]),40 std.join('/', std.makeArray(std.length(arr) - 1, function(i) arr[i]) + [r]),4748 find(value, arr)::49 if !std.isArray(arr) then50 error 'find second parameter should be an array, got ' + std.type(arr)51 else52 std.filter(function(i) arr[i] == value, std.range(0, std.length(arr) - 1)),53}41}5442