git.delta.rocks / jrsonnet / refs/commits / 54c4db58ad3d

--- a/crates/jrsonnet-evaluator/src/arr/mod.rs
+++ b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -32,6 +32,8 @@
 	Reverse(Box<ReverseArray>),
 	/// Returned by `std.map` call
 	Mapped(MappedArray),
+	/// Returned by `std.repeat` call
+	Repeated(RepeatedArray),
 }
 
 impl ArrValue {
@@ -51,6 +53,10 @@
 		Self::Eager(EagerArray(values))
 	}
 
+	pub fn repeated(data: ArrValue, repeats: usize) -> Option<Self> {
+		Some(Self::Repeated(RepeatedArray::new(data, repeats)?))
+	}
+
 	pub fn bytes(bytes: IBytes) -> Self {
 		Self::Bytes(BytesArray(bytes))
 	}
@@ -76,7 +82,11 @@
 		// TODO: benchmark for an optimal value, currently just a arbitrary choice
 		const ARR_EXTEND_THRESHOLD: usize = 100;
 
-		if a.len() + b.len() > ARR_EXTEND_THRESHOLD {
+		if a.is_empty() {
+			b
+		} else if b.is_empty() {
+			a
+		} else if a.len() + b.len() > ARR_EXTEND_THRESHOLD {
 			Self::Extended(Cc::new(ExtendedArray::new(a, b)))
 		} else if let (Some(a), Some(b)) = (a.iter_cheap(), b.iter_cheap()) {
 			let mut out = Vec::with_capacity(a.len() + b.len());
@@ -189,10 +199,8 @@
 			(ArrValue::Lazy(a), ArrValue::Lazy(b)) => Cc::ptr_eq(&a.0, &b.0),
 			(ArrValue::Expr(a), ArrValue::Expr(b)) => Cc::ptr_eq(&a.0, &b.0),
 			(ArrValue::Eager(a), ArrValue::Eager(b)) => Cc::ptr_eq(&a.0, &b.0),
-			(ArrValue::Extended(a), ArrValue::Extended(b)) => Cc::ptr_eq(&a, &b),
+			(ArrValue::Extended(a), ArrValue::Extended(b)) => Cc::ptr_eq(a, b),
 			(ArrValue::Range(a), ArrValue::Range(b)) => a == b,
-			(ArrValue::Slice(_), ArrValue::Slice(_)) => false,
-			(ArrValue::Reverse(_), ArrValue::Reverse(_)) => false,
 			_ => false,
 		}
 	}
@@ -203,6 +211,7 @@
 			ArrValue::Extended(v) => v.a.is_cheap() && v.b.is_cheap(),
 			ArrValue::Slice(r) => r.inner.is_cheap(),
 			ArrValue::Reverse(i) => i.0.is_cheap(),
+			ArrValue::Repeated(v) => v.is_cheap(),
 			ArrValue::Expr(_) | ArrValue::Lazy(_) | ArrValue::Mapped(_) => false,
 		}
 	}

740}740}
741// impl MappedArray741// impl MappedArray
742
743#[derive(Trace, Debug)]
744pub struct RepeatedArrayInner {
745	data: ArrValue,
746	repeats: usize,
747	total_len: usize,
748}
749#[derive(Trace, Debug, Clone)]
750pub struct RepeatedArray(Cc<RepeatedArrayInner>);
751impl RepeatedArray {
752	pub fn new(data: ArrValue, repeats: usize) -> Option<Self> {
753		let total_len = data.len().checked_mul(repeats)?;
754		Some(Self(Cc::new(RepeatedArrayInner {
755			data,
756			repeats,
757			total_len,
758		})))
759	}
760	pub fn is_cheap(&self) -> bool {
761		self.0.data.is_cheap()
762	}
763}
764
765type RepeatedArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;
766type RepeatedArrayLazyIter<'t> =
767	impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;
768type RepeatedArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;
769impl ArrayLike for RepeatedArray {
770	type Iter<'t> = RepeatedArrayIter<'t>;
771	type IterLazy<'t> = RepeatedArrayLazyIter<'t>;
772	type IterCheap<'t> = RepeatedArrayCheapIter<'t>;
773
774	fn len(&self) -> usize {
775		self.0.total_len
776	}
777
778	fn get(&self, index: usize) -> Result<Option<Val>> {
779		if index > self.0.total_len {
780			return Ok(None);
781		}
782		self.0.data.get(index % self.0.data.len())
783	}
784
785	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
786		if index > self.0.total_len {
787			return None;
788		}
789		self.0.data.get_lazy(index % self.0.data.len())
790	}
791
792	fn get_cheap(&self, index: usize) -> Option<Val> {
793		if index > self.0.total_len {
794			return None;
795		}
796		self.0.data.get_cheap(index % self.0.data.len())
797	}
798
799	fn evaluated(&self) -> Result<Vec<Val>> {
800		let mut data = self.0.data.evaluated()?;
801		let data_range = 0..data.len();
802		for _ in 1..self.0.repeats {
803			data.extend_from_within(data_range.clone());
804		}
805		Ok(data)
806	}
807
808	fn iter(&self) -> RepeatedArrayIter<'_> {
809		(0..self.0.total_len)
810			.map(|i| self.get(i))
811			.map(Result::transpose)
812			.map(Option::unwrap)
813	}
814
815	fn iter_lazy(&self) -> RepeatedArrayLazyIter<'_> {
816		(0..self.0.total_len)
817			.map(|i| self.get_lazy(i))
818			.map(Option::unwrap)
819	}
820
821	fn iter_cheap(&self) -> Option<RepeatedArrayCheapIter<'_>> {
822		if !self.0.data.is_cheap() {
823			return None;
824		}
825		Some(
826			(0..self.0.total_len)
827				.map(|i| self.get_cheap(i))
828				.map(Option::unwrap),
829		)
830	}
831}
742832
743macro_rules! impl_iter_enum {833macro_rules! impl_iter_enum {
744	($n:ident => $v:ident) => {834	($n:ident => $v:ident) => {
752			Extended(Box<<ExtendedArray as ArrayLike>::$v<'t>>),842			Extended(Box<<ExtendedArray as ArrayLike>::$v<'t>>),
753			Reverse(Box<<ReverseArray as ArrayLike>::$v<'t>>),843			Reverse(Box<<ReverseArray as ArrayLike>::$v<'t>>),
754			Mapped(Box<<MappedArray as ArrayLike>::$v<'t>>),844			Mapped(Box<<MappedArray as ArrayLike>::$v<'t>>),
845			Repeated(Box<<RepeatedArray as ArrayLike>::$v<'t>>),
755		}846		}
756	};847	};
757}848}
768			Self::Extended(e) => e.$m($($ident)*),859			Self::Extended(e) => e.$m($($ident)*),
769			Self::Reverse(e) => e.$m($($ident)*),860			Self::Reverse(e) => e.$m($($ident)*),
770			Self::Mapped(e) => e.$m($($ident)*),861			Self::Mapped(e) => e.$m($($ident)*),
862			Self::Repeated(e) => e.$m($($ident)*),
771		}863		}
772	};864	};
773}865}
785			ArrValue::Extended(e) => $e::Extended(Box::new($($wrap!)?(e.$c()))),877			ArrValue::Extended(e) => $e::Extended(Box::new($($wrap!)?(e.$c()))),
786			ArrValue::Reverse(e) => $e::Reverse(Box::new($($wrap!)?(e.$c()))),878			ArrValue::Reverse(e) => $e::Reverse(Box::new($($wrap!)?(e.$c()))),
787			ArrValue::Mapped(e) => $e::Mapped(Box::new($($wrap!)?(e.$c()))),879			ArrValue::Mapped(e) => $e::Mapped(Box::new($($wrap!)?(e.$c()))),
880			ArrValue::Repeated(e) => $e::Repeated(Box::new($($wrap!)?(e.$c()))),
788		}881		}
789	};882	};
790}883}
827					}920					}
828					Self::Reverse(e) => e.len(),921					Self::Reverse(e) => e.len(),
829					Self::Mapped(e) => e.len(),922					Self::Mapped(e) => e.len(),
923					Self::Repeated(e) => e.len(),
830				}924				}
831			}925			}
832		}926		}

--- a/crates/jrsonnet-evaluator/src/function/mod.rs
+++ b/crates/jrsonnet-evaluator/src/function/mod.rs
@@ -12,7 +12,9 @@
 	native::NativeDesc,
 	parse::{parse_default_function_call, parse_function_call},
 };
-use crate::{evaluate, gc::TraceBox, typed::Any, Context, ContextBuilder, Result, Val};
+use crate::{
+	evaluate, evaluate_trivial, gc::TraceBox, typed::Any, Context, ContextBuilder, Result, Val,
+};
 
 pub mod arglike;
 pub mod builtin;
@@ -80,6 +82,10 @@
 	) -> Result<Context> {
 		parse_function_call(call_ctx, self.ctx.clone(), &self.params, args, tailstrict)
 	}
+
+	pub fn evaluate_trivial(&self) -> Option<Val> {
+		evaluate_trivial(&self.body)
+	}
 }
 
 /// Represents a Jsonnet function value, including plain functions and user-provided builtins.
@@ -201,4 +207,11 @@
 	pub const fn identity() -> Self {
 		Self::Id
 	}
+
+	pub fn evaluate_trivial(&self) -> Option<Val> {
+		match self {
+			FuncVal::Normal(n) => n.evaluate_trivial(),
+			_ => None,
+		}
+	}
 }

--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -1,23 +1,41 @@
 use jrsonnet_evaluator::{
-	error::Result,
+	error::{ErrorKind::RuntimeError, Result},
 	function::{builtin, FuncVal},
 	throw,
-	typed::{Any, BoundedUsize, Either2, NativeFn, Typed, VecVal},
-	val::{equals, ArrValue, IndexableVal},
+	typed::{Any, BoundedI32, BoundedUsize, Either2, NativeFn, Typed},
+	val::{equals, ArrValue, IndexableVal, StrValue},
 	Either, IStr, Val,
 };
 use jrsonnet_gcmodule::Cc;
 
 #[builtin]
-pub fn builtin_make_array(sz: usize, func: NativeFn<((f64,), Any)>) -> Result<VecVal> {
-	let mut out = Vec::with_capacity(sz);
-	for i in 0..sz {
-		out.push(func(i as f64)?.0);
+pub fn builtin_make_array(sz: BoundedI32<0, { i32::MAX }>, func: FuncVal) -> Result<ArrValue> {
+	if *sz == 0 {
+		return Ok(ArrValue::empty());
+	}
+	if let Some(trivial) = func.evaluate_trivial() {
+		let mut out = Vec::with_capacity(*sz as usize);
+		for _ in 0..*sz {
+			out.push(trivial.clone())
+		}
+		Ok(ArrValue::eager(Cc::new(out)))
+	} else {
+		Ok(ArrValue::range_exclusive(0, *sz).map(func))
 	}
-	Ok(VecVal(Cc::new(out)))
 }
 
 #[builtin]
+pub fn builtin_repeat(what: Either![IStr, ArrValue], count: usize) -> Result<Any> {
+	Ok(Any(match what {
+		Either2::A(s) => Val::Str(StrValue::Flat(s.repeat(count).into())),
+		Either2::B(arr) => Val::Arr(
+			ArrValue::repeated(arr, count)
+				.ok_or_else(|| RuntimeError("repeated length overflow".into()))?,
+		),
+	}))
+}
+
+#[builtin]
 pub fn builtin_slice(
 	indexable: IndexableVal,
 	index: Option<BoundedUsize<0, { i32::MAX as usize }>>,

--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -63,6 +63,7 @@
 		("isFunction", builtin_is_function::INST),
 		// Arrays
 		("makeArray", builtin_make_array::INST),
+		("repeat", builtin_repeat::INST),
 		("slice", builtin_slice::INST),
 		("map", builtin_map::INST),
 		("flatMap", builtin_flatmap::INST),

--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -27,13 +27,6 @@
 
   split(str, c):: std.splitLimit(str, c, -1),
 
-  repeat(what, count)::
-    local joiner =
-      if std.isString(what) then ''
-      else if std.isArray(what) then []
-      else error 'std.repeat first argument must be an array or a string';
-    std.join(joiner, std.makeArray(count, function(i) what)),
-
   mapWithIndex(func, arr)::
     if !std.isFunction(func) then
       error ('std.mapWithIndex first param must be function, got ' + std.type(func))