git.delta.rocks / jrsonnet / refs/commits / 371439fb5fc5

1#![allow(non_snake_case)]
2
1use jrsonnet_evaluator::{3use jrsonnet_evaluator::{
2	error::{ErrorKind::RuntimeError, Result},4	error::{ErrorKind::RuntimeError, Result},
3	function::{builtin, FuncVal},5	function::{builtin, FuncVal},
4	throw,6	throw,
5	typed::{BoundedI32, BoundedUsize, Either2, NativeFn, Typed},7	typed::{BoundedI32, BoundedUsize, Either2, NativeFn, Typed},
6	val::{equals, ArrValue, IndexableVal, StrValue},8	val::{equals, ArrValue, IndexableVal, StrValue},
7	Either, IStr, Val,9	Either, IStr, Thunk, Val,
8};10};
11
12pub(crate) fn eval_on_empty(on_empty: Option<Thunk<Val>>) -> Result<Val> {
13	if let Some(on_empty) = on_empty {
14		on_empty.evaluate()
15	} else {
16		throw!("expected non-empty array")
17	}
18}
919
10#[builtin]20#[builtin]
11pub fn builtin_make_array(sz: BoundedI32<0, { i32::MAX }>, func: FuncVal) -> Result<ArrValue> {21pub fn builtin_make_array(sz: BoundedI32<0, { i32::MAX }>, func: FuncVal) -> Result<ArrValue> {
231	Ok(count)241	Ok(count)
232}242}
243
244#[builtin]
245pub fn builtin_avg(arr: Vec<f64>, onEmpty: Option<Thunk<Val>>) -> Result<Val> {
246	if arr.is_empty() {
247		return eval_on_empty(onEmpty);
248	}
249	Ok(Val::Num(arr.iter().sum::<f64>() / (arr.len() as f64)))
250}
233251

--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -81,6 +81,7 @@
 		("all", builtin_all::INST),
 		("member", builtin_member::INST),
 		("count", builtin_count::INST),
+		("avg", builtin_avg::INST),
 		// Math
 		("abs", builtin_abs::INST),
 		("sign", builtin_sign::INST),

--- a/crates/jrsonnet-stdlib/src/sort.rs
+++ b/crates/jrsonnet-stdlib/src/sort.rs
@@ -13,6 +13,8 @@
 use jrsonnet_gcmodule::Cc;
 use jrsonnet_parser::BinaryOpType;
 
+use crate::eval_on_empty;
+
 #[derive(Copy, Clone)]
 enum SortKeyType {
 	Number,
@@ -207,13 +209,6 @@
 	}
 }
 
-fn eval_on_empty(on_empty: Option<Thunk<Val>>) -> Result<Val> {
-	if let Some(on_empty) = on_empty {
-		on_empty.evaluate()
-	} else {
-		throw!("expected non-empty array")
-	}
-}
 
 fn eval_keyf(val: Val, key_f: &Option<FuncVal>) -> Result<Val> {
 	if let Some(key_f) = key_f {