Merge pull request #145 from CertainLach/fix/lazy-array-comprehension

fix: lazy object comprehension
CertainLach · Jan 16, 2024 · c9696b8 · c9696b8
2 parents 58696dc + eeb6fd0
commit c9696b8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/cmds/jrsonnet/Cargo.toml b/cmds/jrsonnet/Cargo.toml
@@ -15,6 +15,7 @@ experimental = [
     "exp-object-iteration",
     "exp-bigint",
     "exp-apply",
+    "exp-regex",
 ]
 # Use mimalloc as allocator
 mimalloc = ["mimallocator"]

diff --git a/crates/jrsonnet-evaluator/src/evaluate/mod.rs b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -596,10 +596,24 @@ pub fn evaluate(ctx: Context, expr: &LocExpr) -> Result<Val> {
 		ArrComp(expr, comp_specs) => {
 			let mut out = Vec::new();
 			evaluate_comp(ctx, comp_specs, &mut |ctx| {
-				out.push(evaluate(ctx, expr)?);
+				#[derive(Trace)]
+				struct EvaluateThunk {
+					ctx: Context,
+					expr: LocExpr,
+				}
+				impl ThunkValue for EvaluateThunk {
+					type Output = Val;
+					fn get(self: Box<Self>) -> Result<Val> {
+						evaluate(self.ctx, &self.expr)
+					}
+				}
+				out.push(Thunk::new(EvaluateThunk {
+					ctx,
+					expr: expr.clone(),
+				}));
 				Ok(())
 			})?;
-			Val::Arr(ArrValue::eager(out))
+			Val::Arr(ArrValue::lazy(out))
 		}
 		Obj(body) => Val::Obj(evaluate_object(ctx, body)?),
 		ObjExtend(a, b) => evaluate_add_op(