difftreelog
feat std.member and std.count builtin
in: master
3 files changed
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth128 ("parseJson".into(), builtin_parse_json),128 ("parseJson".into(), builtin_parse_json),129 ("asciiUpper".into(), builtin_ascii_upper),129 ("asciiUpper".into(), builtin_ascii_upper),130 ("asciiLower".into(), builtin_ascii_lower),130 ("asciiLower".into(), builtin_ascii_lower),131 ("member".into(), builtin_member),132 ("count".into(), builtin_count),131 ].iter().cloned().collect()133 ].iter().cloned().collect()132 };134 };133}135}854 })856 })855}857}858859fn builtin_member(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {860 parse_args!(context, "member", args, 2, [861 0, arr: ty!((array | string));862 1, x: ty!(any);863 ], {864 match arr {865 Val::Str(s) => {866 let x = x.try_cast_str("x should be string")?;867 Ok(Val::Bool(!x.is_empty() && s.contains(&*x)))868 }869 Val::Arr(a) => {870 for item in a.iter() {871 let item = item?;872 if equals(&item, &x)? {873 return Ok(Val::Bool(true));874 }875 }876 Ok(Val::Bool(false))877 }878 _ => unreachable!(),879 }880 })881}882883fn builtin_count(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {884 parse_args!(context, "count", args, 2, [885 0, arr: ty!(array) => Val::Arr;886 1, x: ty!(any);887 ], {888 let mut count = 0;889 for item in arr.iter() {890 let item = item?;891 if equals(&item, &x)? {892 count += 1;893 }894 }895 Ok(Val::Num(count as f64))896 })897}856898857pub fn call_builtin(899pub fn call_builtin(858 context: Context,900 context: Context,crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth1052 assert_eval!(r#"std.assertEqual(std.asciiLower("aBc😀"), "abc😀")"#);1052 assert_eval!(r#"std.assertEqual(std.asciiLower("aBc😀"), "abc😀")"#);1053 }1053 }10541055 #[test]1056 fn test_member() {1057 assert_eval!(r#"!std.member("", "")"#);1058 assert_eval!(r#"std.member("abc", "a")"#);1059 assert_eval!(r#"!std.member("abc", "d")"#);1060 assert_eval!(r#"!std.member([], "")"#);1061 assert_eval!(r#"std.member(["a", "b", "c"], "a")"#);1062 assert_eval!(r#"!std.member(["a", "b", "c"], "d")"#);1063 }10641065 #[test]1066 fn test_count() {1067 assert_eval!(r#"std.assertEqual(std.count([], ""), 0)"#);1068 assert_eval!(r#"std.assertEqual(std.count(["a", "b", "a"], "d"), 0)"#);1069 assert_eval!(r#"std.assertEqual(std.count(["a", "b", "a"], "a"), 2)"#);1070 }1054}1071}10551072crates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth143143144 slice:: $intrinsic(slice),144 slice:: $intrinsic(slice),145145146 member(arr, x)::146 member:: $intrinsic(member),147 if std.isArray(arr) then148 std.count(arr, x) > 0149 else if std.isString(arr) then150 std.length(std.findSubstr(x, arr)) > 0151 else error 'std.member first argument must be an array or a string',152147153 count(arr, x):: std.length(std.filter(function(v) v == x, arr)),148 count:: $intrinsic(count),154149155 mod:: $intrinsic(mod),150 mod:: $intrinsic(mod),156151