git.delta.rocks / jrsonnet / refs/commits / 62ffdd8c4879

difftreelog

refactor more array specializations

Yaroslav Bolyukin2022-12-03parent: #aab1050.patch.diff
in: master

16 files changed

modifiedbindings/jsonnet/src/val_make.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/val_make.rs
+++ b/bindings/jsonnet/src/val_make.rs
@@ -46,7 +46,7 @@
 /// Assign elements with [`jsonnet_json_array_append`].
 #[no_mangle]
 pub extern "C" fn jsonnet_json_make_array(_vm: &VM) -> *mut Val {
-	Box::into_raw(Box::new(Val::Arr(ArrValue::Eager(Cc::new(Vec::new())))))
+	Box::into_raw(Box::new(Val::Arr(ArrValue::eager(Cc::new(Vec::new())))))
 }
 
 /// Make a `JsonnetJsonValue` representing an object.
modifiedbindings/jsonnet/src/val_modify.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/val_modify.rs
+++ b/bindings/jsonnet/src/val_modify.rs
@@ -25,7 +25,7 @@
 			}
 
 			new.push(Thunk::evaluated(val.clone()));
-			*arr = Val::Arr(ArrValue::Lazy(Cc::new(new)));
+			*arr = Val::Arr(ArrValue::lazy(Cc::new(new)));
 		}
 		_ => panic!("should receive array"),
 	}
modifiedcrates/jrsonnet-cli/src/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/manifest.rs
+++ b/crates/jrsonnet-cli/src/manifest.rs
@@ -50,7 +50,7 @@
 	/// Preserve order in object manifestification
 	#[cfg(feature = "exp-preserve-order")]
 	#[clap(long)]
-	preserve_order: bool,
+	pub preserve_order: bool,
 }
 impl ConfigureState for ManifestOpts {
 	type Guards = Box<dyn ManifestFormat>;
addedcrates/jrsonnet-evaluator/src/arr/mod.rsdiffbeforeafterboth
--- /dev/null
+++ b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -0,0 +1,222 @@
+use jrsonnet_gcmodule::{Cc, Trace};
+use jrsonnet_interner::IBytes;
+use jrsonnet_parser::LocExpr;
+
+use crate::{function::FuncVal, Context, Result, Thunk, Val};
+
+mod spec;
+use spec::*;
+
+/// Represents a Jsonnet array value.
+#[derive(Debug, Clone, Trace)]
+// may contrain other ArrValue
+#[trace(tracking(force))]
+pub enum ArrValue {
+	/// Layout optimized byte array.
+	Bytes(BytesArray),
+	/// Every element is lazy evaluated.
+	Lazy(LazyArray),
+	/// Every element is defined somewhere in source code
+	Expr(ExprArray),
+	/// Every field is already evaluated.
+	Eager(EagerArray),
+	/// Concatenation of two arrays of any kind.
+	Extended(Cc<ExtendedArray>),
+	/// Represents a integer array in form `[start, start + 1, ... end - 1, end]`.
+	/// This kind of arrays is generated by `std.range(start, end)` call, and used for loops.
+	Range(RangeArray),
+	/// Sliced array view.
+	Slice(Box<SliceArray>),
+	/// Reversed array view.
+	/// Returned by `std.reverse(other)` call
+	Reverse(Box<ReverseArray>),
+	/// Returned by `std.map` call
+	Mapped(MappedArray),
+}
+
+impl ArrValue {
+	pub fn empty() -> Self {
+		Self::Range(RangeArray::empty())
+	}
+
+	pub fn expr(ctx: Context, exprs: impl IntoIterator<Item = LocExpr>) -> Self {
+		Self::Expr(ExprArray::new(ctx, exprs))
+	}
+
+	pub fn lazy(thunks: Cc<Vec<Thunk<Val>>>) -> Self {
+		Self::Lazy(LazyArray(thunks))
+	}
+
+	pub fn eager(values: Cc<Vec<Val>>) -> Self {
+		Self::Eager(EagerArray(values))
+	}
+
+	pub fn bytes(bytes: IBytes) -> Self {
+		Self::Bytes(BytesArray(bytes))
+	}
+
+	#[must_use]
+	pub fn map(self, mapper: FuncVal) -> Self {
+		Self::Mapped(MappedArray::new(self, mapper))
+	}
+
+	pub fn filter(self, filter: impl Fn(&Val) -> Result<bool>) -> Result<Self> {
+		// TODO: ArrValue::Picked(inner, indexes) for large arrays
+		let mut out = Vec::new();
+		for i in self.iter() {
+			let i = i?;
+			if filter(&i)? {
+				out.push(i);
+			};
+		}
+		Ok(Self::eager(Cc::new(out)))
+	}
+
+	pub fn extended(a: ArrValue, b: ArrValue) -> Self {
+		// 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 {
+			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());
+			out.extend(a);
+			out.extend(b);
+			Self::eager(Cc::new(out))
+		} else {
+			let mut out = Vec::with_capacity(a.len() + b.len());
+			out.extend(a.iter_lazy());
+			out.extend(b.iter_lazy());
+			Self::lazy(Cc::new(out))
+		}
+	}
+
+	pub fn range_exclusive(a: i32, b: i32) -> Self {
+		Self::Range(RangeArray::new_exclusive(a, b))
+	}
+	pub fn range_inclusive(a: i32, b: i32) -> Self {
+		Self::Range(RangeArray::new_inclusive(a, b))
+	}
+
+	#[must_use]
+	pub fn slice(
+		self,
+		from: Option<usize>,
+		to: Option<usize>,
+		step: Option<usize>,
+	) -> Option<Self> {
+		let len = self.len();
+		let from = from.unwrap_or(0);
+		let to = to.unwrap_or(len).min(len);
+		let step = step.unwrap_or(1);
+		if from >= to || step == 0 {
+			return None;
+		}
+
+		Some(Self::Slice(Box::new(SliceArray {
+			inner: self,
+			from: from as u32,
+			to: to as u32,
+			step: step as u32,
+		})))
+	}
+
+	/// Array length.
+	pub fn len(&self) -> usize {
+		pass!(self.len())
+	}
+
+	/// Is array contains no elements?
+	pub fn is_empty(&self) -> bool {
+		pass!(self.is_empty())
+	}
+
+	/// Get array element by index, evaluating it, if it is lazy.
+	///
+	/// Returns `None` on out-of-bounds condition.
+	pub fn get(&self, index: usize) -> Result<Option<Val>> {
+		pass!(self.get(index))
+	}
+
+	/// Returns None if get is either non cheap, or out of bounds
+	fn get_cheap(&self, index: usize) -> Option<Val> {
+		pass!(self.get_cheap(index))
+	}
+
+	/// Get array element by index, without evaluation.
+	///
+	/// Returns `None` on out-of-bounds condition.
+	pub fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
+		pass!(self.get_lazy(index))
+	}
+
+	/// Evaluate all array elements, returning new array.
+	pub fn evaluatedcc(&self) -> Result<Cc<Vec<Val>>> {
+		self.evaluated().map(Cc::new)
+	}
+	pub fn evaluated(&self) -> Result<Vec<Val>> {
+		pass!(self.evaluated())
+	}
+
+	/// Iterate over elements, evaluating them.
+	pub fn iter(&self) -> UnknownArrayIter<'_> {
+		pass_iter_call!(self.iter => UnknownArrayIter)
+	}
+
+	/// Iterate over elements, returning lazy values.
+	pub fn iter_lazy(&self) -> UnknownArrayIterLazy<'_> {
+		pass_iter_call!(self.iter_lazy => UnknownArrayIterLazy)
+	}
+
+	pub fn iter_cheap(&self) -> Option<UnknownArrayIterCheap<'_>> {
+		macro_rules! question {
+			($v:expr) => {
+				$v?
+			};
+		}
+		Some(pass_iter_call!(self.iter_cheap in question => UnknownArrayIterCheap))
+	}
+
+	/// Return a reversed view on current array.
+	#[must_use]
+	pub fn reversed(self) -> Self {
+		Self::Reverse(Box::new(ReverseArray(self)))
+	}
+
+	pub fn ptr_eq(a: &Self, b: &Self) -> bool {
+		match (a, b) {
+			(ArrValue::Bytes(a), ArrValue::Bytes(b)) => a.0 == b.0,
+			(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::Range(a), ArrValue::Range(b)) => a == b,
+			(ArrValue::Slice(_), ArrValue::Slice(_)) => false,
+			(ArrValue::Reverse(_), ArrValue::Reverse(_)) => false,
+			_ => false,
+		}
+	}
+
+	pub fn is_cheap(&self) -> bool {
+		match self {
+			ArrValue::Eager(_) | ArrValue::Range(..) | ArrValue::Bytes(_) => true,
+			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::Expr(_) | ArrValue::Lazy(_) | ArrValue::Mapped(_) => false,
+		}
+	}
+}
+impl From<Vec<Val>> for ArrValue {
+	fn from(value: Vec<Val>) -> Self {
+		Self::eager(Cc::new(value))
+	}
+}
+impl From<Vec<Thunk<Val>>> for ArrValue {
+	fn from(value: Vec<Thunk<Val>>) -> Self {
+		Self::lazy(Cc::new(value))
+	}
+}
+
+#[cfg(target_pointer_width = "64")]
+static_assertions::assert_eq_size!(ArrValue, [u8; 16]);
addedcrates/jrsonnet-evaluator/src/arr/spec.rsdiffbeforeafterboth
--- /dev/null
+++ b/crates/jrsonnet-evaluator/src/arr/spec.rs
@@ -0,0 +1,841 @@
+use std::{
+	cell::RefCell,
+	iter::{self, Rev},
+	mem::replace,
+};
+
+use jrsonnet_gcmodule::{Cc, Trace};
+use jrsonnet_interner::IBytes;
+use jrsonnet_parser::LocExpr;
+
+use super::ArrValue;
+use crate::{
+	error::ErrorKind::InfiniteRecursionDetected, evaluate, function::FuncVal, tb, typed::Any,
+	val::ThunkValue, Context, Error, Result, Thunk, Val,
+};
+
+pub trait ArrayLike {
+	type Iter<'t>
+	where
+		Self: 't;
+	type IterLazy<'t>
+	where
+		Self: 't;
+	type IterCheap<'t>
+	where
+		Self: 't;
+
+	fn len(&self) -> usize;
+	fn is_empty(&self) -> bool {
+		self.len() == 0
+	}
+	fn get(&self, index: usize) -> Result<Option<Val>>;
+	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>>;
+	fn get_cheap(&self, index: usize) -> Option<Val>;
+	fn evaluated(&self) -> Result<Vec<Val>>;
+	#[allow(clippy::iter_not_returning_iterator)]
+	fn iter(&self) -> Self::Iter<'_>;
+	fn iter_lazy(&self) -> Self::IterLazy<'_>;
+	fn iter_cheap(&self) -> Option<Self::IterCheap<'_>>;
+}
+
+#[derive(Debug, Clone, Trace)]
+pub struct SliceArray {
+	pub(crate) inner: ArrValue,
+	pub(crate) from: u32,
+	pub(crate) to: u32,
+	pub(crate) step: u32,
+}
+type SliceArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;
+type SliceArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;
+type SliceArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;
+impl ArrayLike for SliceArray {
+	type Iter<'t> = SliceArrayIter<'t>;
+
+	type IterLazy<'t> = SliceArrayLazyIter<'t>;
+
+	type IterCheap<'t> = SliceArrayCheapIter<'t>;
+
+	fn len(&self) -> usize {
+		iter::repeat(())
+			.take((self.to - self.from) as usize)
+			.step_by(self.step as usize)
+			.count()
+	}
+
+	fn get(&self, index: usize) -> Result<Option<Val>> {
+		self.iter().nth(index).transpose()
+	}
+
+	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
+		self.iter_lazy().nth(index)
+	}
+
+	fn get_cheap(&self, index: usize) -> Option<Val> {
+		self.iter_cheap()?.nth(index)
+	}
+
+	fn evaluated(&self) -> Result<Vec<Val>> {
+		self.iter().collect()
+	}
+
+	fn iter(&self) -> SliceArrayIter<'_> {
+		self.inner
+			.iter()
+			.skip(self.from as usize)
+			.take((self.to - self.from) as usize)
+			.step_by(self.step as usize)
+	}
+
+	fn iter_lazy(&self) -> SliceArrayLazyIter<'_> {
+		self.inner
+			.iter_lazy()
+			.skip(self.from as usize)
+			.take((self.to - self.from) as usize)
+			.step_by(self.step as usize)
+	}
+
+	fn iter_cheap(&self) -> Option<SliceArrayCheapIter<'_>> {
+		Some(
+			self.inner
+				.iter_cheap()?
+				.skip(self.from as usize)
+				.take((self.to - self.from) as usize)
+				.step_by(self.step as usize),
+		)
+	}
+}
+
+#[derive(Trace, Debug, Clone)]
+pub struct BytesArray(pub IBytes);
+type BytesArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;
+type BytesArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;
+type BytesArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;
+impl ArrayLike for BytesArray {
+	type Iter<'t> = BytesArrayIter<'t>;
+
+	type IterLazy<'t> = BytesArrayLazyIter<'t>;
+
+	type IterCheap<'t> = BytesArrayCheapIter<'t>;
+
+	fn len(&self) -> usize {
+		self.0.len()
+	}
+
+	fn get(&self, index: usize) -> Result<Option<Val>> {
+		Ok(self.get_cheap(index))
+	}
+
+	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
+		self.get_cheap(index).map(Thunk::evaluated)
+	}
+
+	fn get_cheap(&self, index: usize) -> Option<Val> {
+		self.0.get(index).map(|v| Val::Num(f64::from(*v)))
+	}
+
+	fn evaluated(&self) -> Result<Vec<Val>> {
+		self.iter().collect()
+	}
+
+	fn iter(&self) -> BytesArrayIter<'_> {
+		self.0.iter().map(|v| Ok(Val::Num(f64::from(*v))))
+	}
+
+	fn iter_lazy(&self) -> BytesArrayLazyIter<'_> {
+		self.0
+			.iter()
+			.map(|v| Thunk::evaluated(Val::Num(f64::from(*v))))
+	}
+
+	fn iter_cheap(&self) -> Option<BytesArrayCheapIter<'_>> {
+		Some(self.0.iter().map(|v| Val::Num(f64::from(*v))))
+	}
+}
+
+#[derive(Debug, Trace, Clone)]
+enum ArrayThunk<T: 'static + Trace> {
+	Computed(Val),
+	Errored(Error),
+	Waiting(T),
+	Pending,
+}
+
+#[derive(Debug, Trace)]
+pub struct ExprArrayInner {
+	ctx: Context,
+	cached: RefCell<Vec<ArrayThunk<LocExpr>>>,
+}
+#[derive(Debug, Trace, Clone)]
+pub struct ExprArray(pub Cc<ExprArrayInner>);
+type ExprArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;
+type ExprArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;
+type ExprArrayCheapIter<'t> = iter::Empty<Val>;
+impl ExprArray {
+	pub fn new(ctx: Context, items: impl IntoIterator<Item = LocExpr>) -> Self {
+		Self(Cc::new(ExprArrayInner {
+			ctx,
+			cached: RefCell::new(items.into_iter().map(ArrayThunk::Waiting).collect()),
+		}))
+	}
+}
+impl ArrayLike for ExprArray {
+	type Iter<'t> = ExprArrayIter<'t>;
+
+	type IterLazy<'t> = ExprArrayLazyIter<'t>;
+
+	type IterCheap<'t> = ExprArrayCheapIter<'t>;
+
+	fn len(&self) -> usize {
+		self.0.cached.borrow().len()
+	}
+	fn get(&self, index: usize) -> Result<Option<Val>> {
+		if index >= self.len() {
+			return Ok(None);
+		}
+		match &self.0.cached.borrow()[index] {
+			ArrayThunk::Computed(c) => return Ok(Some(c.clone())),
+			ArrayThunk::Errored(e) => return Err(e.clone()),
+			ArrayThunk::Pending => return Err(InfiniteRecursionDetected.into()),
+			ArrayThunk::Waiting(..) => {}
+		};
+
+		let ArrayThunk::Waiting(expr) = replace(&mut self.0.cached.borrow_mut()[index], ArrayThunk::Pending) else {
+			unreachable!()
+		};
+
+		let new_value = match evaluate(self.0.ctx.clone(), &expr) {
+			Ok(v) => v,
+			Err(e) => {
+				self.0.cached.borrow_mut()[index] = ArrayThunk::Errored(e.clone());
+				return Err(e);
+			}
+		};
+		self.0.cached.borrow_mut()[index] = ArrayThunk::Computed(new_value.clone());
+		Ok(Some(new_value))
+	}
+	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
+		#[derive(Trace)]
+		struct ArrayElement {
+			arr_thunk: ExprArray,
+			index: usize,
+		}
+
+		impl ThunkValue for ArrayElement {
+			type Output = Val;
+
+			fn get(self: Box<Self>) -> Result<Self::Output> {
+				self.arr_thunk
+					.get(self.index)
+					.transpose()
+					.expect("index checked")
+			}
+		}
+
+		if index >= self.len() {
+			return None;
+		}
+		match &self.0.cached.borrow()[index] {
+			ArrayThunk::Computed(c) => return Some(Thunk::evaluated(c.clone())),
+			ArrayThunk::Errored(e) => return Some(Thunk::errored(e.clone())),
+			ArrayThunk::Waiting(_) | ArrayThunk::Pending => {}
+		};
+
+		Some(Thunk::new(tb!(ArrayElement {
+			arr_thunk: self.clone(),
+			index,
+		})))
+	}
+	fn get_cheap(&self, _index: usize) -> Option<Val> {
+		None
+	}
+
+	fn iter(&self) -> ExprArrayIter<'_> {
+		(0..self.len()).map(|i| self.get(i).transpose().expect("index checked"))
+	}
+	fn iter_lazy(&self) -> ExprArrayLazyIter<'_> {
+		(0..self.len()).map(|i| self.get_lazy(i).expect("index checked"))
+	}
+	fn iter_cheap(&self) -> Option<ExprArrayCheapIter<'_>> {
+		None
+	}
+
+	fn evaluated(&self) -> Result<Vec<Val>> {
+		self.iter().collect()
+	}
+}
+
+#[derive(Trace, Debug, Clone)]
+pub struct ExtendedArray {
+	pub a: ArrValue,
+	pub b: ArrValue,
+	split: usize,
+	len: usize,
+}
+type ExtendedArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + 't;
+type ExtendedArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + 't;
+type ExtendedArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + 't;
+impl ExtendedArray {
+	pub fn new(a: ArrValue, b: ArrValue) -> Self {
+		let a_len = a.len();
+		let b_len = b.len();
+		Self {
+			a,
+			b,
+			split: a_len,
+			len: a_len.checked_add(b_len).expect("too large array value"),
+		}
+	}
+}
+impl ArrayLike for ExtendedArray {
+	type Iter<'t> = ExtendedArrayIter<'t>;
+
+	type IterLazy<'t> = ExtendedArrayLazyIter<'t>;
+
+	type IterCheap<'t> = ExtendedArrayCheapIter<'t>;
+
+	fn get(&self, index: usize) -> Result<Option<Val>> {
+		if self.split > index {
+			self.a.get(index)
+		} else {
+			self.b.get(index - self.split)
+		}
+	}
+	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
+		if self.split > index {
+			self.a.get_lazy(index)
+		} else {
+			self.b.get_lazy(index - self.split)
+		}
+	}
+
+	fn len(&self) -> usize {
+		self.len
+	}
+
+	fn get_cheap(&self, index: usize) -> Option<Val> {
+		if self.split > index {
+			self.a.get_cheap(index)
+		} else {
+			self.b.get_cheap(index - self.split)
+		}
+	}
+
+	fn evaluated(&self) -> Result<Vec<Val>> {
+		let mut out = self.a.evaluated()?;
+		out.extend(self.b.evaluated()?.into_iter());
+		Ok(out)
+	}
+
+	fn iter(&self) -> ExtendedArrayIter<'_> {
+		self.a.iter().chain(self.b.iter())
+	}
+	fn iter_lazy(&self) -> ExtendedArrayLazyIter<'_> {
+		self.a.iter_lazy().chain(self.b.iter_lazy())
+	}
+	fn iter_cheap(&self) -> Option<ExtendedArrayCheapIter<'_>> {
+		let a = self.a.iter_cheap()?;
+		let b = self.b.iter_cheap()?;
+		Some(a.chain(b))
+	}
+}
+
+#[derive(Trace, Debug, Clone)]
+pub struct LazyArray(pub Cc<Vec<Thunk<Val>>>);
+type LazyArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;
+type LazyArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;
+type LazyArrayCheapIter<'t> = iter::Empty<Val>;
+impl ArrayLike for LazyArray {
+	type Iter<'t> = LazyArrayIter<'t>;
+
+	type IterLazy<'t> = LazyArrayLazyIter<'t>;
+
+	type IterCheap<'t> = LazyArrayCheapIter<'t>;
+
+	fn len(&self) -> usize {
+		self.0.len()
+	}
+	fn get(&self, index: usize) -> Result<Option<Val>> {
+		let Some(v) = self.0.get(index) else {
+			return Ok(None);
+		};
+		v.evaluate().map(Some)
+	}
+	fn get_cheap(&self, _index: usize) -> Option<Val> {
+		None
+	}
+	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
+		self.0.get(index).cloned()
+	}
+	fn evaluated(&self) -> Result<Vec<Val>> {
+		let mut out = Vec::with_capacity(self.len());
+		for i in self.0.iter() {
+			out.push(i.evaluate()?);
+		}
+		Ok(out)
+	}
+	fn iter(&self) -> LazyArrayIter<'_> {
+		self.0.iter().map(Thunk::evaluate)
+	}
+	fn iter_lazy(&self) -> LazyArrayLazyIter<'_> {
+		self.0.iter().cloned()
+	}
+	fn iter_cheap(&self) -> Option<LazyArrayCheapIter<'_>> {
+		None
+	}
+}
+
+#[derive(Trace, Debug, Clone)]
+pub struct EagerArray(pub Cc<Vec<Val>>);
+type EagerArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;
+type EagerArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;
+type EagerArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;
+impl ArrayLike for EagerArray {
+	type Iter<'t> = EagerArrayIter<'t>;
+
+	type IterLazy<'t> = EagerArrayLazyIter<'t>;
+
+	type IterCheap<'t> = EagerArrayCheapIter<'t>;
+
+	fn len(&self) -> usize {
+		self.0.len()
+	}
+
+	fn get(&self, index: usize) -> Result<Option<Val>> {
+		Ok(self.0.get(index).cloned())
+	}
+
+	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
+		self.0.get(index).cloned().map(Thunk::evaluated)
+	}
+
+	fn get_cheap(&self, index: usize) -> Option<Val> {
+		self.0.get(index).cloned()
+	}
+
+	fn evaluated(&self) -> Result<Vec<Val>> {
+		Ok((*self.0).clone())
+	}
+
+	fn iter(&self) -> EagerArrayIter<'_> {
+		self.0.iter().cloned().map(Ok)
+	}
+
+	fn iter_lazy(&self) -> EagerArrayLazyIter<'_> {
+		self.0.iter().cloned().map(Thunk::evaluated)
+	}
+
+	fn iter_cheap(&self) -> Option<EagerArrayCheapIter<'_>> {
+		Some(self.0.iter().cloned())
+	}
+}
+
+/// Inclusive range type
+#[derive(Debug, Trace, Clone, PartialEq, Eq)]
+pub struct RangeArray {
+	start: i32,
+	end: i32,
+}
+struct RangeIter {
+	start: i32,
+	end: i32,
+}
+impl RangeIter {
+	fn finished(&self) -> bool {
+		self.end < self.start
+	}
+	fn finish(&mut self) {
+		self.start = 0;
+		self.end = -1;
+	}
+}
+impl Iterator for RangeIter {
+	type Item = i32;
+
+	fn next(&mut self) -> Option<Self::Item> {
+		if self.finished() {
+			return None;
+		}
+		let v = self.start;
+		if v == self.end {
+			self.finish();
+		} else {
+			self.start = v + 1;
+		}
+		Some(v)
+	}
+	fn nth(&mut self, n: usize) -> Option<Self::Item> {
+		let v = (self.start as usize) + n;
+		if v > self.end as usize {
+			self.finish();
+			None
+		} else {
+			self.start = v as i32;
+			self.next()
+		}
+	}
+	fn size_hint(&self) -> (usize, Option<usize>) {
+		let len = self.len();
+		(len, Some(len))
+	}
+}
+impl DoubleEndedIterator for RangeIter {
+	fn next_back(&mut self) -> Option<Self::Item> {
+		if self.finished() {
+			return None;
+		}
+		let v = self.end;
+		if v == self.start {
+			self.finish();
+		} else {
+			self.end = v - 1;
+		}
+		Some(v)
+	}
+	fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
+		let v = (self.end as usize) - n;
+		if v < self.start as usize {
+			self.finish();
+			None
+		} else {
+			self.end = v as i32;
+			self.next_back()
+		}
+	}
+}
+impl ExactSizeIterator for RangeIter {
+	fn len(&self) -> usize {
+		if self.finished() {
+			0
+		} else {
+			(self.end as isize - self.start as isize + 1) as usize
+		}
+	}
+}
+impl RangeArray {
+	pub fn empty() -> Self {
+		Self::new_exclusive(0, 0)
+	}
+	pub fn new_exclusive(start: i32, end: i32) -> Self {
+		end.checked_sub(1)
+			.map_or_else(Self::empty, |end| Self { start, end })
+	}
+	pub fn new_inclusive(start: i32, end: i32) -> Self {
+		Self { start, end }
+	}
+	fn range(&self) -> RangeIter {
+		RangeIter {
+			start: self.start,
+			end: self.end,
+		}
+	}
+}
+
+type RangeArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;
+type RangeArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;
+type RangeArrayCheapIter<'t> = impl DoubleEndedIterator<Item = Val> + ExactSizeIterator + 't;
+impl ArrayLike for RangeArray {
+	type Iter<'t> = RangeArrayIter<'t>;
+
+	type IterLazy<'t> = RangeArrayLazyIter<'t>;
+
+	type IterCheap<'t> = RangeArrayCheapIter<'t>;
+
+	fn len(&self) -> usize {
+		self.range().len()
+	}
+	fn is_empty(&self) -> bool {
+		self.range().finished()
+	}
+
+	fn get(&self, index: usize) -> Result<Option<Val>> {
+		Ok(self.get_cheap(index))
+	}
+
+	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
+		self.get_cheap(index).map(Thunk::evaluated)
+	}
+
+	fn get_cheap(&self, index: usize) -> Option<Val> {
+		self.range().nth(index).map(|i| Val::Num(f64::from(i)))
+	}
+
+	fn evaluated(&self) -> Result<Vec<Val>> {
+		Ok(self.range().map(|i| Val::Num(f64::from(i))).collect())
+	}
+
+	fn iter(&self) -> RangeArrayIter<'_> {
+		self.range().map(|i| Ok(Val::Num(f64::from(i))))
+	}
+
+	fn iter_lazy(&self) -> RangeArrayLazyIter<'_> {
+		self.range()
+			.map(|i| Thunk::evaluated(Val::Num(f64::from(i))))
+	}
+
+	fn iter_cheap(&self) -> Option<RangeArrayCheapIter<'_>> {
+		Some(self.range().map(|i| Val::Num(f64::from(i))))
+	}
+}
+
+#[derive(Debug, Trace, Clone)]
+pub struct ReverseArray(pub ArrValue);
+impl ArrayLike for ReverseArray {
+	type Iter<'t> = Rev<UnknownArrayIter<'t>>;
+
+	type IterLazy<'t> = Rev<UnknownArrayIterLazy<'t>>;
+
+	type IterCheap<'t> = Rev<UnknownArrayIterCheap<'t>>;
+
+	fn len(&self) -> usize {
+		self.0.len()
+	}
+
+	fn get(&self, index: usize) -> Result<Option<Val>> {
+		self.0.get(self.0.len() - index - 1)
+	}
+
+	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
+		self.0.get_lazy(self.0.len() - index - 1)
+	}
+
+	fn get_cheap(&self, index: usize) -> Option<Val> {
+		self.0.get_cheap(self.0.len() - index - 1)
+	}
+
+	fn evaluated(&self) -> Result<Vec<Val>> {
+		let mut v = self.0.evaluated()?;
+		v.reverse();
+		Ok(v)
+	}
+
+	fn iter(&self) -> Rev<UnknownArrayIter<'_>> {
+		self.0.iter().rev()
+	}
+
+	fn iter_lazy(&self) -> Rev<UnknownArrayIterLazy<'_>> {
+		self.0.iter_lazy().rev()
+	}
+
+	fn iter_cheap(&self) -> Option<Rev<UnknownArrayIterCheap<'_>>> {
+		Some(self.0.iter_cheap()?.rev())
+	}
+}
+
+#[derive(Trace, Debug)]
+pub struct MappedArrayInner {
+	inner: ArrValue,
+	cached: RefCell<Vec<ArrayThunk<()>>>,
+	mapper: FuncVal,
+}
+#[derive(Trace, Debug, Clone)]
+pub struct MappedArray(Cc<MappedArrayInner>);
+impl MappedArray {
+	pub fn new(inner: ArrValue, mapper: FuncVal) -> Self {
+		let len = inner.len();
+		Self(Cc::new(MappedArrayInner {
+			inner,
+			cached: RefCell::new(vec![ArrayThunk::Waiting(()); len]),
+			mapper,
+		}))
+	}
+}
+type MappedArrayIter<'t> = impl DoubleEndedIterator<Item = Result<Val>> + ExactSizeIterator + 't;
+type MappedArrayLazyIter<'t> = impl DoubleEndedIterator<Item = Thunk<Val>> + ExactSizeIterator + 't;
+type MappedArrayCheapIter<'t> = iter::Empty<Val>;
+impl ArrayLike for MappedArray {
+	type Iter<'t> = MappedArrayIter<'t>;
+	type IterLazy<'t> = MappedArrayLazyIter<'t>;
+	type IterCheap<'t> = MappedArrayCheapIter<'t>;
+
+	fn len(&self) -> usize {
+		self.0.cached.borrow().len()
+	}
+
+	fn get(&self, index: usize) -> Result<Option<Val>> {
+		if index >= self.len() {
+			return Ok(None);
+		}
+		match &self.0.cached.borrow()[index] {
+			ArrayThunk::Computed(c) => return Ok(Some(c.clone())),
+			ArrayThunk::Errored(e) => return Err(e.clone()),
+			ArrayThunk::Pending => return Err(InfiniteRecursionDetected.into()),
+			ArrayThunk::Waiting(..) => {}
+		};
+
+		let ArrayThunk::Waiting(_) = replace(&mut self.0.cached.borrow_mut()[index], ArrayThunk::Pending) else {
+			unreachable!()
+		};
+
+		let val = self
+			.0
+			.inner
+			.get(index)
+			.transpose()
+			.expect("index checked")
+			.and_then(|r| self.0.mapper.evaluate_simple(&(Any(r),)));
+
+		let new_value = match val {
+			Ok(v) => v,
+			Err(e) => {
+				self.0.cached.borrow_mut()[index] = ArrayThunk::Errored(e.clone());
+				return Err(e);
+			}
+		};
+		self.0.cached.borrow_mut()[index] = ArrayThunk::Computed(new_value.clone());
+		Ok(Some(new_value))
+	}
+	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
+		#[derive(Trace)]
+		struct ArrayElement {
+			arr_thunk: MappedArray,
+			index: usize,
+		}
+
+		impl ThunkValue for ArrayElement {
+			type Output = Val;
+
+			fn get(self: Box<Self>) -> Result<Self::Output> {
+				self.arr_thunk
+					.get(self.index)
+					.transpose()
+					.expect("index checked")
+			}
+		}
+
+		if index >= self.len() {
+			return None;
+		}
+		match &self.0.cached.borrow()[index] {
+			ArrayThunk::Computed(c) => return Some(Thunk::evaluated(c.clone())),
+			ArrayThunk::Errored(e) => return Some(Thunk::errored(e.clone())),
+			ArrayThunk::Waiting(_) | ArrayThunk::Pending => {}
+		};
+
+		Some(Thunk::new(tb!(ArrayElement {
+			arr_thunk: self.clone(),
+			index,
+		})))
+	}
+
+	fn get_cheap(&self, _index: usize) -> Option<Val> {
+		None
+	}
+
+	fn evaluated(&self) -> Result<Vec<Val>> {
+		self.iter().collect()
+	}
+
+	fn iter(&self) -> MappedArrayIter<'_> {
+		(0..self.len()).map(|i| self.get(i).transpose().expect("length checked"))
+	}
+
+	fn iter_lazy(&self) -> MappedArrayLazyIter<'_> {
+		(0..self.len()).map(|i| self.get_lazy(i).expect("length checked"))
+	}
+
+	fn iter_cheap(&self) -> Option<Self::IterCheap<'_>> {
+		None
+	}
+}
+// impl MappedArray
+
+macro_rules! impl_iter_enum {
+	($n:ident => $v:ident) => {
+		pub enum $n<'t> {
+			Bytes(<BytesArray as ArrayLike>::$v<'t>),
+			Expr(<ExprArray as ArrayLike>::$v<'t>),
+			Lazy(<LazyArray as ArrayLike>::$v<'t>),
+			Eager(<EagerArray as ArrayLike>::$v<'t>),
+			Range(<RangeArray as ArrayLike>::$v<'t>),
+			Slice(Box<<SliceArray as ArrayLike>::$v<'t>>),
+			Extended(Box<<ExtendedArray as ArrayLike>::$v<'t>>),
+			Reverse(Box<<ReverseArray as ArrayLike>::$v<'t>>),
+			Mapped(Box<<MappedArray as ArrayLike>::$v<'t>>),
+		}
+	};
+}
+
+macro_rules! pass {
+	($t:ident.$m:ident($($ident:ident),*)) => {
+		match $t {
+			Self::Bytes(e) => e.$m($($ident)*),
+			Self::Expr(e) => e.$m($($ident)*),
+			Self::Lazy(e) => e.$m($($ident)*),
+			Self::Eager(e) => e.$m($($ident)*),
+			Self::Range(e) => e.$m($($ident)*),
+			Self::Slice(e) => e.$m($($ident)*),
+			Self::Extended(e) => e.$m($($ident)*),
+			Self::Reverse(e) => e.$m($($ident)*),
+			Self::Mapped(e) => e.$m($($ident)*),
+		}
+	};
+}
+pub(super) use pass;
+
+macro_rules! pass_iter_call {
+	($t:ident.$c:ident $(in $wrap:ident)? => $e:ident) => {
+		match $t {
+			ArrValue::Bytes(e) => $e::Bytes($($wrap!)?(e.$c())),
+			ArrValue::Lazy(e) => $e::Lazy($($wrap!)?(e.$c())),
+			ArrValue::Expr(e) => $e::Expr($($wrap!)?(e.$c())),
+			ArrValue::Eager(e) => $e::Eager($($wrap!)?(e.$c())),
+			ArrValue::Range(e) => $e::Range($($wrap!)?(e.$c())),
+			ArrValue::Slice(e) => $e::Slice(Box::new($($wrap!)?(e.$c()))),
+			ArrValue::Extended(e) => $e::Extended(Box::new($($wrap!)?(e.$c()))),
+			ArrValue::Reverse(e) => $e::Reverse(Box::new($($wrap!)?(e.$c()))),
+			ArrValue::Mapped(e) => $e::Mapped(Box::new($($wrap!)?(e.$c()))),
+		}
+	};
+}
+pub(super) use pass_iter_call;
+
+macro_rules! impl_iter {
+	($t:ident => $out:ty) => {
+		impl Iterator for $t<'_> {
+			type Item = $out;
+
+			fn next(&mut self) -> Option<Self::Item> {
+				pass!(self.next())
+			}
+			fn nth(&mut self, count: usize) -> Option<Self::Item> {
+				pass!(self.nth(count))
+			}
+			fn size_hint(&self) -> (usize, Option<usize>) {
+				pass!(self.size_hint())
+			}
+		}
+		impl DoubleEndedIterator for $t<'_> {
+			fn next_back(&mut self) -> Option<Self::Item> {
+				pass!(self.next_back())
+			}
+			fn nth_back(&mut self, count: usize) -> Option<Self::Item> {
+				pass!(self.nth_back(count))
+			}
+		}
+		impl ExactSizeIterator for $t<'_> {
+			fn len(&self) -> usize {
+				match self {
+					Self::Bytes(e) => e.len(),
+					Self::Expr(e) => e.len(),
+					Self::Lazy(e) => e.len(),
+					Self::Eager(e) => e.len(),
+					Self::Range(e) => e.len(),
+					Self::Slice(e) => e.len(),
+					Self::Extended(e) => {
+						e.size_hint().1.expect("overflow is checked in constructor")
+					}
+					Self::Reverse(e) => e.len(),
+					Self::Mapped(e) => e.len(),
+				}
+			}
+		}
+	};
+}
+
+impl_iter_enum!(UnknownArrayIter => Iter);
+impl_iter_enum!(UnknownArrayIterLazy => IterLazy);
+impl_iter_enum!(UnknownArrayIterCheap => IterCheap);
+impl_iter!(UnknownArrayIter => Result<Val>);
+impl_iter!(UnknownArrayIterLazy => Thunk<Val>);
+impl_iter!(UnknownArrayIterCheap => Val);
modifiedcrates/jrsonnet-evaluator/src/evaluate/destructure.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
@@ -32,7 +32,7 @@
 		Destruct::Array { start, rest, end } => {
 			use jrsonnet_parser::DestructRest;
 
-			use crate::val::ArrValue;
+			use crate::arr::ArrValue;
 
 			#[derive(Trace)]
 			struct DataThunk {
@@ -110,7 +110,10 @@
 						fn get(self: Box<Self>) -> Result<Self::Output> {
 							let full = self.full.evaluate()?;
 							let to = full.len() - self.end;
-							Ok(Val::Arr(full.slice(Some(self.start), Some(to), None)))
+							Ok(Val::Arr(
+								full.slice(Some(self.start), Some(to), None)
+									.expect("arguments checked"),
+							))
 						}
 					}
 
modifiedcrates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -10,19 +10,53 @@
 
 use self::destructure::destruct;
 use crate::{
+	arr::ArrValue,
 	destructure::evaluate_dest,
 	error::ErrorKind::*,
 	evaluate::operator::{evaluate_add_op, evaluate_binary_op_special, evaluate_unary_op},
 	function::{CallLocation, FuncDesc, FuncVal},
 	tb, throw,
 	typed::Typed,
-	val::{ArrValue, CachedUnbound, IndexableVal, Thunk, ThunkValue},
+	val::{CachedUnbound, IndexableVal, Thunk, ThunkValue},
 	Context, GcHashMap, ObjValue, ObjValueBuilder, ObjectAssertion, Pending, Result, State,
 	Unbound, Val,
 };
 pub mod destructure;
 pub mod operator;
 
+pub fn evaluate_trivial(expr: &LocExpr) -> Option<Val> {
+	fn is_trivial(expr: &LocExpr) -> bool {
+		match &*expr.0 {
+			Expr::Str(_)
+			| Expr::Num(_)
+			| Expr::Literal(LiteralType::False | LiteralType::True | LiteralType::Null) => true,
+			Expr::Arr(a) => a.iter().all(is_trivial),
+			Expr::Parened(e) => is_trivial(e),
+			_ => false,
+		}
+	}
+	Some(match &*expr.0 {
+		Expr::Str(s) => Val::Str(s.clone()),
+		Expr::Num(n) => Val::Num(*n),
+		Expr::Literal(LiteralType::False) => Val::Bool(false),
+		Expr::Literal(LiteralType::True) => Val::Bool(true),
+		Expr::Literal(LiteralType::Null) => Val::Null,
+		Expr::Arr(n) => {
+			if n.iter().any(|e| !is_trivial(e)) {
+				return None;
+			}
+			Val::Arr(ArrValue::eager(Cc::new(
+				n.iter()
+					.map(evaluate_trivial)
+					.map(|e| e.expect("checked trivial"))
+					.collect(),
+			)))
+		}
+		Expr::Parened(e) => evaluate_trivial(e)?,
+		_ => return None,
+	})
+}
+
 pub fn evaluate_method(ctx: Context, name: IStr, params: ParamsDesc, body: LocExpr) -> Val {
 	Val::Func(FuncVal::Normal(Cc::new(FuncDesc {
 		name,
@@ -100,7 +134,7 @@
 
 					let fctx = Pending::new();
 					let mut new_bindings = GcHashMap::with_capacity(var.capacity_hint());
-					let value = Thunk::evaluated(Val::Arr(ArrValue::Lazy(Cc::new(vec![
+					let value = Thunk::evaluated(Val::Arr(ArrValue::lazy(Cc::new(vec![
 						Thunk::evaluated(Val::Str(field.clone())),
 						Thunk::new(tb!(ObjectFieldThunk {
 							field: field.clone(),
@@ -380,6 +414,9 @@
 #[allow(clippy::too_many_lines)]
 pub fn evaluate(ctx: Context, expr: &LocExpr) -> Result<Val> {
 	use Expr::*;
+	if let Some(trivial) = evaluate_trivial(&expr) {
+		return Ok(trivial);
+	}
 	let LocExpr(expr, loc) = expr;
 	Ok(match &**expr {
 		Literal(LiteralType::This) => {
@@ -507,9 +544,9 @@
 			evaluate(ctx, &returned.clone())?
 		}
 		Arr(items) => {
-			let mut out = Vec::with_capacity(items.len());
-			for item in items {
-				// TODO: Implement ArrValue::Lazy with same context for every element?
+			if items.is_empty() {
+				Val::Arr(ArrValue::empty())
+			} else if items.len() == 1 {
 				#[derive(Trace)]
 				struct ArrayElement {
 					ctx: Context,
@@ -521,12 +558,15 @@
 						evaluate(self.ctx, &self.item)
 					}
 				}
-				out.push(Thunk::new(tb!(ArrayElement {
-					ctx: ctx.clone(),
-					item: item.clone(),
-				})));
+				Val::Arr(ArrValue::lazy(Cc::new(vec![Thunk::new(tb!(
+					ArrayElement {
+						ctx,
+						item: items[0].clone(),
+					}
+				))])))
+			} else {
+				Val::Arr(ArrValue::expr(ctx, items.iter().cloned()))
 			}
-			Val::Arr(out.into())
 		}
 		ArrComp(expr, comp_specs) => {
 			let mut out = Vec::new();
@@ -534,7 +574,7 @@
 				out.push(evaluate(ctx, expr)?);
 				Ok(())
 			})?;
-			Val::Arr(ArrValue::Eager(Cc::new(out)))
+			Val::Arr(ArrValue::eager(Cc::new(out)))
 		}
 		Obj(body) => Val::Obj(evaluate_object(ctx, body)?),
 		ObjExtend(a, b) => evaluate_add_op(
@@ -615,7 +655,7 @@
 					|| s.import_resolved(resolved_path),
 				)?,
 				ImportStr(_) => Val::Str(s.import_resolved_str(resolved_path)?),
-				ImportBin(_) => Val::Arr(ArrValue::Bytes(s.import_resolved_bin(resolved_path)?)),
+				ImportBin(_) => Val::Arr(ArrValue::bytes(s.import_resolved_bin(resolved_path)?)),
 				_ => unreachable!(),
 			}
 		}
modifiedcrates/jrsonnet-evaluator/src/evaluate/operator.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/operator.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/operator.rs
@@ -3,8 +3,8 @@
 use jrsonnet_parser::{BinaryOpType, LocExpr, UnaryOpType};
 
 use crate::{
-	error::ErrorKind::*, evaluate, stdlib::std_format, throw, typed::Typed, val::equals, Context,
-	Result, Val,
+	arr::ArrValue, error::ErrorKind::*, evaluate, stdlib::std_format, throw, typed::Typed,
+	val::equals, Context, Result, Val,
 };
 
 pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Result<Val> {
@@ -18,6 +18,8 @@
 	})
 }
 
+/// Arbitrary threshold
+
 pub fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {
 	use Val::*;
 	Ok(match (a, b) {
@@ -34,12 +36,8 @@
 		(o, Str(a)) => Str(format!("{}{a}", o.clone().to_string()?).into()),
 
 		(Obj(v1), Obj(v2)) => Obj(v2.extend_from(v1.clone())),
-		(Arr(a), Arr(b)) => {
-			let mut out = Vec::with_capacity(a.len() + b.len());
-			out.extend(a.iter_lazy());
-			out.extend(b.iter_lazy());
-			Arr(out.into())
-		}
+		(Arr(a), Arr(b)) => Val::Arr(ArrValue::extended(a.clone(), b.clone())),
+
 		(Num(v1), Num(v2)) => Val::new_checked_num(v1 + v2)?,
 		_ => throw!(BinaryOperatorDoesNotOperateOnValues(
 			BinaryOpType::Add,
@@ -82,7 +80,7 @@
 	})
 }
 
-pub fn evaluate_compare_op(a: &Val, op: BinaryOpType, b: &Val) -> Result<Ordering> {
+pub fn evaluate_compare_op(a: &Val, b: &Val, op: BinaryOpType) -> Result<Ordering> {
 	use Val::*;
 	Ok(match (a, b) {
 		(Str(a), Str(b)) => a.cmp(b),
@@ -92,7 +90,7 @@
 			let bi = b.iter();
 
 			for (a, b) in ai.zip(bi) {
-				let ord = evaluate_compare_op(&a?, op, &b?)?;
+				let ord = evaluate_compare_op(&a?, &b?, op)?;
 				if !ord.is_eq() {
 					return Ok(ord);
 				}
@@ -117,10 +115,10 @@
 		(a, Eq, b) => Bool(equals(a, b)?),
 		(a, Neq, b) => Bool(!equals(a, b)?),
 
-		(a, Lt, b) => Bool(evaluate_compare_op(a, Lt, b)?.is_lt()),
-		(a, Gt, b) => Bool(evaluate_compare_op(a, Gt, b)?.is_gt()),
-		(a, Lte, b) => Bool(evaluate_compare_op(a, Lte, b)?.is_le()),
-		(a, Gte, b) => Bool(evaluate_compare_op(a, Gte, b)?.is_ge()),
+		(a, Lt, b) => Bool(evaluate_compare_op(a, b, Lt)?.is_lt()),
+		(a, Gt, b) => Bool(evaluate_compare_op(a, b, Gt)?.is_gt()),
+		(a, Lte, b) => Bool(evaluate_compare_op(a, b, Lte)?.is_le()),
+		(a, Gte, b) => Bool(evaluate_compare_op(a, b, Gte)?.is_ge()),
 
 		(Str(a), In, Obj(obj)) => Bool(obj.has_field_ex(a.clone(), true)),
 		(a, Mod, b) => evaluate_mod_op(a, b)?,
modifiedcrates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -7,7 +7,7 @@
 	Deserialize, Serialize,
 };
 
-use crate::{error::Result, val::ArrValue, ObjValueBuilder, State, Val};
+use crate::{arr::ArrValue, error::Result, ObjValueBuilder, State, Val};
 
 impl<'de> Deserialize<'de> for Val {
 	fn deserialize<D>(deserializer: D) -> Result<Val, D::Error>
@@ -77,7 +77,7 @@
 			where
 				E: serde::de::Error,
 			{
-				Ok(Val::Arr(ArrValue::Bytes(v.into())))
+				Ok(Val::Arr(ArrValue::bytes(v.into())))
 			}
 
 			fn visit_none<E>(self) -> Result<Self::Value, E>
@@ -117,7 +117,7 @@
 					out.push(val);
 				}
 
-				Ok(Val::Arr(ArrValue::Eager(Cc::new(out))))
+				Ok(Val::Arr(ArrValue::eager(Cc::new(out))))
 			}
 
 			fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
modifiedcrates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -1,5 +1,6 @@
 //! jsonnet interpreter implementation
 #![cfg_attr(feature = "nightly", feature(thread_local))]
+#![feature(type_alias_impl_trait)]
 #![deny(unsafe_op_in_unsafe_fn)]
 #![warn(
 	clippy::all,
@@ -43,6 +44,7 @@
 // For jrsonnet-macros
 extern crate self as jrsonnet_evaluator;
 
+mod arr;
 mod ctx;
 mod dynamic;
 pub mod error;
modifiedcrates/jrsonnet-evaluator/src/stdlib/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/stdlib/mod.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/mod.rs
@@ -14,7 +14,7 @@
 		|| format!("std.format of {str}"),
 		|| {
 			Ok(match vals {
-				Val::Arr(vals) => format_arr(&str, &vals.evaluated()?)?,
+				Val::Arr(vals) => format_arr(&str, &vals.evaluatedcc()?)?,
 				Val::Obj(obj) => format_obj(&str, &obj)?,
 				o => format_arr(&str, &[o])?,
 			})
modifiedcrates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -6,11 +6,12 @@
 use jrsonnet_types::{ComplexValType, ValType};
 
 use crate::{
+	arr::ArrValue,
 	error::Result,
 	function::{native::NativeDesc, FuncDesc, FuncVal},
 	throw,
 	typed::CheckType,
-	val::{ArrValue, IndexableVal},
+	val::IndexableVal,
 	ObjValue, ObjValueBuilder, Val,
 };
 
@@ -30,6 +31,8 @@
 	fn from_untyped(untyped: Val) -> Result<Self>;
 }
 
+const MAX_SAFE_INTEGER: f64 = ((1u64 << (f64::MANTISSA_DIGITS + 1)) - 1) as f64;
+
 macro_rules! impl_int {
 	($($ty:ty)*) => {$(
 		impl Typed for $ty {
@@ -155,12 +158,11 @@
 	}
 }
 impl Typed for usize {
-	// It is possible to store 54 bits of precision in f64, but leaving u32::MAX here for compatibility
 	const TYPE: &'static ComplexValType =
-		&ComplexValType::BoundedNumber(Some(0.0), Some(u32::MAX as f64));
+		&ComplexValType::BoundedNumber(Some(0.0), Some(MAX_SAFE_INTEGER));
 
 	fn into_untyped(value: Self) -> Result<Val> {
-		if value > u32::MAX as Self {
+		if value > MAX_SAFE_INTEGER as Self {
 			throw!("number is too large")
 		}
 		Ok(Val::Num(value as f64))
@@ -282,13 +284,13 @@
 	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Arr);
 
 	fn into_untyped(value: Self) -> Result<Val> {
-		Ok(Val::Arr(ArrValue::Eager(value.0)))
+		Ok(Val::Arr(ArrValue::eager(value.0)))
 	}
 
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		match value {
-			Val::Arr(a) => Ok(Self(a.evaluated()?)),
+			Val::Arr(a) => Ok(Self(a.evaluatedcc()?)),
 			_ => unreachable!(),
 		}
 	}
@@ -300,12 +302,12 @@
 		&ComplexValType::ArrayRef(&ComplexValType::BoundedNumber(Some(0.0), Some(255.0)));
 
 	fn into_untyped(value: Self) -> Result<Val> {
-		Ok(Val::Arr(ArrValue::Bytes(value)))
+		Ok(Val::Arr(ArrValue::bytes(value)))
 	}
 
 	fn from_untyped(value: Val) -> Result<Self> {
 		if let Val::Arr(ArrValue::Bytes(bytes)) = value {
-			return Ok(bytes);
+			return Ok(bytes.0);
 		}
 		<Self as Typed>::TYPE.check(&value)?;
 		match value {
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/val.rs
1use std::{cell::RefCell, fmt::Debug};23use jrsonnet_gcmodule::{Cc, Trace};4use jrsonnet_interner::{IBytes, IStr};5use jrsonnet_types::ValType;67use crate::{8	error::{Error, ErrorKind::*},9	function::FuncVal,10	gc::{GcHashMap, TraceBox},11	manifest::{ManifestFormat, ToStringFormat},12	throw,13	typed::BoundedUsize,14	ObjValue, Result, Unbound, WeakObjValue,15};1617pub trait ThunkValue: Trace {18	type Output;19	fn get(self: Box<Self>) -> Result<Self::Output>;20}2122#[derive(Trace)]23enum ThunkInner<T: Trace> {24	Computed(T),25	Errored(Error),26	Waiting(TraceBox<dyn ThunkValue<Output = T>>),27	Pending,28}2930#[allow(clippy::module_name_repetitions)]31#[derive(Clone, Trace)]32pub struct Thunk<T: Trace>(Cc<RefCell<ThunkInner<T>>>);3334impl<T> Thunk<T>35where36	T: Clone + Trace,37{38	pub fn new(f: TraceBox<dyn ThunkValue<Output = T>>) -> Self {39		Self(Cc::new(RefCell::new(ThunkInner::Waiting(f))))40	}41	pub fn evaluated(val: T) -> Self {42		Self(Cc::new(RefCell::new(ThunkInner::Computed(val))))43	}44	pub fn force(&self) -> Result<()> {45		self.evaluate()?;46		Ok(())47	}48	pub fn evaluate(&self) -> Result<T> {49		match &*self.0.borrow() {50			ThunkInner::Computed(v) => return Ok(v.clone()),51			ThunkInner::Errored(e) => return Err(e.clone()),52			ThunkInner::Pending => return Err(InfiniteRecursionDetected.into()),53			ThunkInner::Waiting(..) => (),54		};55		let ThunkInner::Waiting(value) = std::mem::replace(&mut *self.0.borrow_mut(), ThunkInner::Pending) else {56			unreachable!();57		};58		let new_value = match value.0.get() {59			Ok(v) => v,60			Err(e) => {61				*self.0.borrow_mut() = ThunkInner::Errored(e.clone());62				return Err(e);63			}64		};65		*self.0.borrow_mut() = ThunkInner::Computed(new_value.clone());66		Ok(new_value)67	}68}6970type CacheKey = (Option<WeakObjValue>, Option<WeakObjValue>);7172#[derive(Trace, Clone)]73pub struct CachedUnbound<I, T>74where75	I: Unbound<Bound = T>,76	T: Trace,77{78	cache: Cc<RefCell<GcHashMap<CacheKey, T>>>,79	value: I,80}81impl<I: Unbound<Bound = T>, T: Trace> CachedUnbound<I, T> {82	pub fn new(value: I) -> Self {83		Self {84			cache: Cc::new(RefCell::new(GcHashMap::new())),85			value,86		}87	}88}89impl<I: Unbound<Bound = T>, T: Clone + Trace> Unbound for CachedUnbound<I, T> {90	type Bound = T;91	fn bind(&self, sup: Option<ObjValue>, this: Option<ObjValue>) -> Result<T> {92		let cache_key = (93			sup.as_ref().map(|s| s.clone().downgrade()),94			this.as_ref().map(|t| t.clone().downgrade()),95		);96		{97			if let Some(t) = self.cache.borrow().get(&cache_key) {98				return Ok(t.clone());99			}100		}101		let bound = self.value.bind(sup, this)?;102103		{104			let mut cache = self.cache.borrow_mut();105			cache.insert(cache_key, bound.clone());106		}107108		Ok(bound)109	}110}111112impl<T: Debug + Trace> Debug for Thunk<T> {113	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {114		write!(f, "Lazy")115	}116}117impl<T: Trace> PartialEq for Thunk<T> {118	fn eq(&self, other: &Self) -> bool {119		Cc::ptr_eq(&self.0, &other.0)120	}121}122123#[derive(Debug, Clone, Trace)]124pub struct Slice {125	pub(crate) inner: ArrValue,126	pub(crate) from: u32,127	pub(crate) to: u32,128	pub(crate) step: u32,129}130impl Slice {131	const fn from(&self) -> usize {132		self.from as usize133	}134	const fn to(&self) -> usize {135		self.to as usize136	}137	const fn step(&self) -> usize {138		self.step as usize139	}140	const fn len(&self) -> usize {141		// TODO: use div_ceil142		let diff = self.to() - self.from();143		let rem = diff % self.step();144		let div = diff / self.step();145146		if rem == 0 {147			div148		} else {149			div + 1150		}151	}152}153154/// Represents a Jsonnet array value.155#[derive(Debug, Clone, Trace)]156// may contrain other ArrValue157#[trace(tracking(force))]158pub enum ArrValue {159	/// Layout optimized byte array.160	Bytes(#[trace(skip)] IBytes),161	/// Every element is lazy evaluated.162	Lazy(Cc<Vec<Thunk<Val>>>),163	/// Every field is already evaluated.164	Eager(Cc<Vec<Val>>),165	/// Concatenation of two arrays of any kind.166	Extended(Box<(Self, Self)>),167	/// Represents a integer array in form `[start, start + 1, ... end - 1, end]`.168	/// This kind of arrays is generated by `std.range(start, end)` call, and used for loops.169	Range(i32, i32),170	/// Sliced array view.171	Slice(Box<Slice>),172	/// Reversed array view.173	/// Returned by `std.reverse(other)` call174	Reversed(Box<Self>),175}176177#[cfg(target_pointer_width = "64")]178static_assertions::assert_eq_size!(ArrValue, [u8; 16]);179180impl ArrValue {181	pub fn new_eager() -> Self {182		Self::Eager(Cc::new(Vec::new()))183	}184	pub fn empty() -> Self {185		Self::new_range(0, 0)186	}187188	/// # Panics189	/// If a > b190	#[inline]191	pub fn new_range(a: i32, b: i32) -> Self {192		assert!(a <= b);193		Self::Range(a, b)194	}195196	/// # Panics197	/// If passed numbers are incorrect198	#[must_use]199	pub fn slice(self, from: Option<usize>, to: Option<usize>, step: Option<usize>) -> Self {200		let len = self.len();201		let from = from.unwrap_or(0);202		let to = to.unwrap_or(len).min(len);203		let step = step.unwrap_or(1);204		assert!(from < to);205		assert!(step > 0);206207		Self::Slice(Box::new(Slice {208			inner: self,209			from: from as u32,210			to: to as u32,211			step: step as u32,212		}))213	}214215	/// Array length.216	pub fn len(&self) -> usize {217		match self {218			Self::Bytes(i) => i.len(),219			Self::Lazy(l) => l.len(),220			Self::Eager(e) => e.len(),221			Self::Extended(v) => v.0.len() + v.1.len(),222			Self::Range(a, b) => a.abs_diff(*b) as usize + 1,223			Self::Reversed(i) => i.len(),224			Self::Slice(s) => s.len(),225		}226	}227228	/// Is array contains no elements?229	pub fn is_empty(&self) -> bool {230		self.len() == 0231	}232233	/// Get array element by index, evaluating it, if it is lazy.234	///235	/// Returns `None` on out-of-bounds condition.236	pub fn get(&self, index: usize) -> Result<Option<Val>> {237		match self {238			Self::Bytes(i) => i239				.get(index)240				.map_or(Ok(None), |v| Ok(Some(Val::Num(f64::from(*v))))),241			Self::Lazy(vec) => {242				if let Some(v) = vec.get(index) {243					Ok(Some(v.evaluate()?))244				} else {245					Ok(None)246				}247			}248			Self::Eager(vec) => Ok(vec.get(index).cloned()),249			Self::Extended(v) => {250				let a_len = v.0.len();251				if a_len > index {252					v.0.get(index)253				} else {254					v.1.get(index - a_len)255				}256			}257			Self::Range(a, _) => {258				if index >= self.len() {259					return Ok(None);260				}261				Ok(Some(Val::Num(((*a as isize) + index as isize) as f64)))262			}263			Self::Reversed(v) => {264				let len = v.len();265				if index >= len {266					return Ok(None);267				}268				v.get(len - index - 1)269			}270			Self::Slice(v) => {271				let index = v.from() + index * v.step();272				if index >= v.to() {273					return Ok(None);274				}275				v.inner.get(index)276			}277		}278	}279280	/// Get array element by index, without evaluation.281	///282	/// Returns `None` on out-of-bounds condition.283	pub fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {284		match self {285			Self::Bytes(i) => i286				.get(index)287				.map(|b| Thunk::evaluated(Val::Num(f64::from(*b)))),288			Self::Lazy(vec) => vec.get(index).cloned(),289			Self::Eager(vec) => vec.get(index).cloned().map(Thunk::evaluated),290			Self::Extended(v) => {291				let a_len = v.0.len();292				if a_len > index {293					v.0.get_lazy(index)294				} else {295					v.1.get_lazy(index - a_len)296				}297			}298			Self::Range(a, _) => {299				if index >= self.len() {300					return None;301				}302				Some(Thunk::evaluated(Val::Num(303					((*a as isize) + index as isize) as f64,304				)))305			}306			Self::Reversed(v) => {307				let len = v.len();308				if index >= len {309					return None;310				}311				v.get_lazy(len - index - 1)312			}313			Self::Slice(s) => {314				let index = s.from() + index * s.step();315				if index >= s.to() {316					return None;317				}318				s.inner.get_lazy(index)319			}320		}321	}322323	/// Evaluate all array elements, returning new array.324	pub fn evaluated(&self) -> Result<Cc<Vec<Val>>> {325		Ok(match self {326			Self::Bytes(i) => {327				let mut out = Vec::with_capacity(i.len());328				for v in i.iter() {329					out.push(Val::Num(f64::from(*v)));330				}331				Cc::new(out)332			}333			Self::Lazy(vec) => {334				let mut out = Vec::with_capacity(vec.len());335				for item in vec.iter() {336					out.push(item.evaluate()?);337				}338				Cc::new(out)339			}340			Self::Eager(vec) => vec.clone(),341			Self::Extended(_v) => {342				let mut out = Vec::with_capacity(self.len());343				for item in self.iter() {344					out.push(item?);345				}346				Cc::new(out)347			}348			Self::Range(a, b) => {349				let mut out = Vec::with_capacity(self.len());350				for i in *a..=*b {351					out.push(Val::Num(f64::from(i)));352				}353				Cc::new(out)354			}355			Self::Reversed(r) => {356				let mut r = r.evaluated()?;357				Cc::update_with(&mut r, |v| v.reverse());358				r359			}360			Self::Slice(v) => {361				let mut out = Vec::with_capacity(v.inner.len());362				for v in v363					.inner364					.iter_lazy()365					.skip(v.from())366					.take(v.to() - v.from())367					.step_by(v.step())368				{369					out.push(v.evaluate()?);370				}371				Cc::new(out)372			}373		})374	}375376	/// Iterate over elements, evaluating them.377	pub fn iter(&self) -> impl DoubleEndedIterator<Item = Result<Val>> + '_ {378		(0..self.len()).map(move |idx| match self {379			Self::Bytes(b) => Ok(Val::Num(f64::from(b[idx]))),380			Self::Lazy(l) => l[idx].evaluate(),381			Self::Eager(e) => Ok(e[idx].clone()),382			Self::Extended(..) | Self::Range(..) | Self::Reversed(..) | Self::Slice(..) => {383				self.get(idx).map(|e| e.expect("idx < len"))384			}385		})386	}387388	/// Iterate over elements, returning lazy values.389	pub fn iter_lazy(&self) -> impl DoubleEndedIterator<Item = Thunk<Val>> + '_ {390		(0..self.len()).map(move |idx| match self {391			Self::Bytes(b) => Thunk::evaluated(Val::Num(f64::from(b[idx]))),392			Self::Lazy(l) => l[idx].clone(),393			Self::Eager(e) => Thunk::evaluated(e[idx].clone()),394			Self::Slice(..) | Self::Extended(..) | Self::Range(..) | Self::Reversed(..) => {395				self.get_lazy(idx).expect("idx < len")396			}397		})398	}399400	/// Return a reversed view on current array.401	#[must_use]402	pub fn reversed(self) -> Self {403		Self::Reversed(Box::new(self))404	}405406	/// Return a new array, produced by passing every element of current array to specified callback function.407	pub fn map(self, mapper: impl Fn(Val) -> Result<Val>) -> Result<Self> {408		let mut out = Vec::with_capacity(self.len());409410		for value in self.iter() {411			out.push(mapper(value?)?);412		}413414		Ok(Self::Eager(Cc::new(out)))415	}416417	/// Return a new array, produced from current array by removing every value, for which specified callback function returns false.418	pub fn filter(self, filter: impl Fn(&Val) -> Result<bool>) -> Result<Self> {419		let mut out = Vec::with_capacity(self.len());420421		for value in self.iter() {422			let value = value?;423			if filter(&value)? {424				out.push(value);425			}426		}427428		Ok(Self::Eager(Cc::new(out)))429	}430431	pub fn ptr_eq(a: &Self, b: &Self) -> bool {432		match (a, b) {433			(Self::Lazy(a), Self::Lazy(b)) => Cc::ptr_eq(a, b),434			(Self::Eager(a), Self::Eager(b)) => Cc::ptr_eq(a, b),435			_ => false,436		}437	}438}439440impl From<Vec<Thunk<Val>>> for ArrValue {441	fn from(v: Vec<Thunk<Val>>) -> Self {442		Self::Lazy(Cc::new(v))443	}444}445446impl From<Vec<Val>> for ArrValue {447	fn from(v: Vec<Val>) -> Self {448		Self::Eager(Cc::new(v))449	}450}451452/// Represents a Jsonnet value, which can be spliced or indexed (string or array).453#[allow(clippy::module_name_repetitions)]454pub enum IndexableVal {455	/// String.456	Str(IStr),457	/// Array.458	Arr(ArrValue),459}460impl IndexableVal {461	/// Slice the value.462	///463	/// # Implementation464	///465	/// For strings, will create a copy of specified interval.466	///467	/// For arrays, nothing will be copied on this call, instead [`ArrValue::Slice`] view will be returned.468	pub fn slice(469		self,470		index: Option<BoundedUsize<0, { i32::MAX as usize }>>,471		end: Option<BoundedUsize<0, { i32::MAX as usize }>>,472		step: Option<BoundedUsize<1, { i32::MAX as usize }>>,473	) -> Result<Self> {474		match &self {475			IndexableVal::Str(s) => {476				let index = index.as_deref().copied().unwrap_or(0);477				let end = end.as_deref().copied().unwrap_or(usize::MAX);478				let step = step.as_deref().copied().unwrap_or(1);479480				if index >= end {481					return Ok(Self::Str("".into()));482				}483484				Ok(Self::Str(485					(s.chars()486						.skip(index)487						.take(end - index)488						.step_by(step)489						.collect::<String>())490					.into(),491				))492			}493			IndexableVal::Arr(arr) => {494				let index = index.as_deref().copied().unwrap_or(0);495				let end = end.as_deref().copied().unwrap_or(usize::MAX).min(arr.len());496				let step = step.as_deref().copied().unwrap_or(1);497498				if index >= end {499					return Ok(Self::Arr(ArrValue::new_eager()));500				}501502				Ok(Self::Arr(ArrValue::Slice(Box::new(Slice {503					inner: arr.clone(),504					from: index as u32,505					to: end as u32,506					step: step as u32,507				}))))508			}509		}510	}511}512513/// Represents any valid Jsonnet value.514#[derive(Debug, Clone, Trace)]515pub enum Val {516	/// Represents a Jsonnet boolean.517	Bool(bool),518	/// Represents a Jsonnet null value.519	Null,520	/// Represents a Jsonnet string.521	Str(IStr),522	/// Represents a Jsonnet number.523	/// Should be finite, and not NaN524	/// This restriction isn't enforced by enum, as enum field can't be marked as private525	Num(f64),526	/// Represents a Jsonnet array.527	Arr(ArrValue),528	/// Represents a Jsonnet object.529	Obj(ObjValue),530	/// Represents a Jsonnet function.531	Func(FuncVal),532}533534impl From<IndexableVal> for Val {535	fn from(v: IndexableVal) -> Self {536		match v {537			IndexableVal::Str(s) => Self::Str(s),538			IndexableVal::Arr(a) => Self::Arr(a),539		}540	}541}542543// Broken between stable and nightly, as there is new layout size optimization544// #[cfg(target_pointer_width = "64")]545// static_assertions::assert_eq_size!(Val, [u8; 24]);546547impl Val {548	pub const fn as_bool(&self) -> Option<bool> {549		match self {550			Self::Bool(v) => Some(*v),551			_ => None,552		}553	}554	pub const fn as_null(&self) -> Option<()> {555		match self {556			Self::Null => Some(()),557			_ => None,558		}559	}560	pub fn as_str(&self) -> Option<IStr> {561		match self {562			Self::Str(s) => Some(s.clone()),563			_ => None,564		}565	}566	pub const fn as_num(&self) -> Option<f64> {567		match self {568			Self::Num(n) => Some(*n),569			_ => None,570		}571	}572	pub fn as_arr(&self) -> Option<ArrValue> {573		match self {574			Self::Arr(a) => Some(a.clone()),575			_ => None,576		}577	}578	pub fn as_obj(&self) -> Option<ObjValue> {579		match self {580			Self::Obj(o) => Some(o.clone()),581			_ => None,582		}583	}584	pub fn as_func(&self) -> Option<FuncVal> {585		match self {586			Self::Func(f) => Some(f.clone()),587			_ => None,588		}589	}590591	/// Creates `Val::Num` after checking for numeric overflow.592	/// As numbers are `f64`, we can just check for their finity.593	pub fn new_checked_num(num: f64) -> Result<Self> {594		if num.is_finite() {595			Ok(Self::Num(num))596		} else {597			throw!("overflow")598		}599	}600601	pub const fn value_type(&self) -> ValType {602		match self {603			Self::Str(..) => ValType::Str,604			Self::Num(..) => ValType::Num,605			Self::Arr(..) => ValType::Arr,606			Self::Obj(..) => ValType::Obj,607			Self::Bool(_) => ValType::Bool,608			Self::Null => ValType::Null,609			Self::Func(..) => ValType::Func,610		}611	}612613	pub fn manifest(&self, format: impl ManifestFormat) -> Result<String> {614		fn manifest_dyn(val: &Val, manifest: &dyn ManifestFormat) -> Result<String> {615			manifest.manifest(val.clone())616		}617		manifest_dyn(self, &format)618	}619620	pub fn to_string(&self) -> Result<IStr> {621		Ok(match self {622			Self::Bool(true) => "true".into(),623			Self::Bool(false) => "false".into(),624			Self::Null => "null".into(),625			Self::Str(s) => s.clone(),626			_ => self.manifest(ToStringFormat).map(IStr::from)?,627		})628	}629630	pub fn into_indexable(self) -> Result<IndexableVal> {631		Ok(match self {632			Val::Str(s) => IndexableVal::Str(s),633			Val::Arr(arr) => IndexableVal::Arr(arr),634			_ => throw!(ValueIsNotIndexable(self.value_type())),635		})636	}637}638639const fn is_function_like(val: &Val) -> bool {640	matches!(val, Val::Func(_))641}642643/// Native implementation of `std.primitiveEquals`644pub fn primitive_equals(val_a: &Val, val_b: &Val) -> Result<bool> {645	Ok(match (val_a, val_b) {646		(Val::Bool(a), Val::Bool(b)) => a == b,647		(Val::Null, Val::Null) => true,648		(Val::Str(a), Val::Str(b)) => a == b,649		(Val::Num(a), Val::Num(b)) => (a - b).abs() <= f64::EPSILON,650		(Val::Arr(_), Val::Arr(_)) => {651			throw!("primitiveEquals operates on primitive types, got array")652		}653		(Val::Obj(_), Val::Obj(_)) => {654			throw!("primitiveEquals operates on primitive types, got object")655		}656		(a, b) if is_function_like(a) && is_function_like(b) => {657			throw!("cannot test equality of functions")658		}659		(_, _) => false,660	})661}662663/// Native implementation of `std.equals`664pub fn equals(val_a: &Val, val_b: &Val) -> Result<bool> {665	if val_a.value_type() != val_b.value_type() {666		return Ok(false);667	}668	match (val_a, val_b) {669		(Val::Arr(a), Val::Arr(b)) => {670			if ArrValue::ptr_eq(a, b) {671				return Ok(true);672			}673			if a.len() != b.len() {674				return Ok(false);675			}676			for (a, b) in a.iter().zip(b.iter()) {677				if !equals(&a?, &b?)? {678					return Ok(false);679				}680			}681			Ok(true)682		}683		(Val::Obj(a), Val::Obj(b)) => {684			if ObjValue::ptr_eq(a, b) {685				return Ok(true);686			}687			let fields = a.fields(688				#[cfg(feature = "exp-preserve-order")]689				false,690			);691			if fields692				!= b.fields(693					#[cfg(feature = "exp-preserve-order")]694					false,695				) {696				return Ok(false);697			}698			for field in fields {699				if !equals(700					&a.get(field.clone())?.expect("field exists"),701					&b.get(field)?.expect("field exists"),702				)? {703					return Ok(false);704				}705			}706			Ok(true)707		}708		(a, b) => Ok(primitive_equals(a, b)?),709	}710}
modifiedcrates/jrsonnet-stdlib/src/arrays.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -28,8 +28,8 @@
 }
 
 #[builtin]
-pub fn builtin_map(func: NativeFn<((Any,), Any)>, arr: ArrValue) -> Result<ArrValue> {
-	arr.map(|val| Ok(func(Any(val))?.0))
+pub fn builtin_map(func: FuncVal, arr: ArrValue) -> Result<ArrValue> {
+	Ok(arr.map(func))
 }
 
 #[builtin]
@@ -94,9 +94,9 @@
 #[builtin]
 pub fn builtin_range(from: i32, to: i32) -> Result<ArrValue> {
 	if to < from {
-		return Ok(ArrValue::new_eager());
+		return Ok(ArrValue::empty());
 	}
-	Ok(ArrValue::new_range(from, to))
+	Ok(ArrValue::range_inclusive(from, to))
 }
 
 #[builtin]
modifiedcrates/jrsonnet-stdlib/src/misc.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/misc.rs
+++ b/crates/jrsonnet-stdlib/src/misc.rs
@@ -77,7 +77,7 @@
 			} else if b.len() == a.len() {
 				return equals(&Val::Arr(a), &Val::Arr(b));
 			} else {
-				for (a, b) in a.slice(None, Some(b.len()), None).iter().zip(b.iter()) {
+				for (a, b) in a.iter().take(b.len()).zip(b.iter()) {
 					let a = a?;
 					let b = b?;
 					if !equals(&a, &b)? {
@@ -103,11 +103,7 @@
 				return equals(&Val::Arr(a), &Val::Arr(b));
 			} else {
 				let a_len = a.len();
-				for (a, b) in a
-					.slice(Some(a_len - b.len()), None, None)
-					.iter()
-					.zip(b.iter())
-				{
+				for (a, b) in a.iter().skip(a_len - b.len()).zip(b.iter()) {
 					let a = a?;
 					let b = b?;
 					if !equals(&a, &b)? {
modifiedcrates/jrsonnet-stdlib/src/sort.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/sort.rs
+++ b/crates/jrsonnet-stdlib/src/sort.rs
@@ -106,9 +106,9 @@
 	if arr.len() <= 1 {
 		return Ok(arr);
 	}
-	Ok(ArrValue::Eager(super::sort::sort(
+	Ok(ArrValue::eager(super::sort::sort(
 		ctx,
-		arr.evaluated()?,
+		arr.evaluatedcc()?,
 		keyF.unwrap_or_else(FuncVal::identity),
 	)?))
 }