git.delta.rocks / jrsonnet / refs/commits / 166fbe9afc2a

difftreelog

fix exp-destruct

wkqlwykpYaroslav Bolyukin2026-04-25parent: #a3646b3.patch.diff
in: master

7 files changed

modifiedcrates/jrsonnet-evaluator/src/analyze.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/analyze.rs
+++ b/crates/jrsonnet-evaluator/src/analyze.rs
@@ -425,7 +425,7 @@
 	/// h = 1 => referenced += [], closures += 0, destructs += 1
 	/// And the result is
 	///
-	/// ```
+	/// ```rust,ignore
 	/// Closures {
 	///     referenced: vec![d, e, f, a, b, c, h]
 	///     spec_shapes: vec![(3, 3), (4, 3), (0, 1)],
modifiedcrates/jrsonnet-evaluator/src/evaluate/compspec.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/compspec.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/compspec.rs
@@ -195,7 +195,7 @@
 ) -> Result<()> {
 	if idx >= specs.len() {
 		collector.reserve(guaranteed_reserve);
-		return collector.collect(ctx.clone());
+		return collector.collect(ctx);
 	}
 	match &specs[idx] {
 		LCompSpec::If(cond) => {
@@ -239,18 +239,20 @@
 						)?;
 					}
 				}
+				// TODO: Should not be eager? CoW won't work here
 				#[cfg(feature = "exp-destruct")]
 				_ => {
 					for (i, item) in arr.iter().enumerate() {
 						let item_val = item?;
 						let mut inner_builder = ContextBuilder::extend(ctx.clone(), 1);
+						let fctx = Pending::new();
 						destructure::destruct(
 							destruct,
 							Thunk::evaluated(item_val),
-							None,
+							fctx.clone(),
 							&mut inner_builder,
 						);
-						let inner_ctx = inner_builder.build();
+						let inner_ctx = inner_builder.build().into_future(fctx);
 						evaluate_compspecs_eager(
 							inner_ctx,
 							specs,
modifiedcrates/jrsonnet-evaluator/src/evaluate/destructure.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
@@ -12,7 +12,7 @@
 #[allow(dead_code, reason = "not dead in exp-destruct")]
 fn destruct_array(
 	start: &[LDestruct],
-	rest: Option<LDestructRest>,
+	rest: Option<&LDestructRest>,
 	end: &[LDestruct],
 
 	value: Thunk<Val>,
@@ -56,7 +56,7 @@
 	if let Some(crate::analyze::LDestructRest::Keep(id)) = rest {
 		let full = full.clone();
 		builder.bind(
-			id,
+			*id,
 			Thunk!(move || {
 				let full = full.evaluate()?;
 				let to = full.len() - end_len;
@@ -88,7 +88,7 @@
 #[allow(dead_code, reason = "not dead in exp-destruct")]
 fn destruct_object(
 	fields: &[LDestructField],
-	rest: Option<LDestructRest>,
+	rest: Option<&LDestructRest>,
 
 	value: Thunk<Val>,
 	fctx: Pending<Context>,
@@ -127,7 +127,7 @@
 	if let Some(crate::analyze::LDestructRest::Keep(id)) = rest {
 		let full = full.clone();
 		builder.bind(
-			id,
+			*id,
 			Thunk!(move || {
 				let full = full.evaluate()?;
 				let mut out = ObjValueBuilder::new();
@@ -178,9 +178,13 @@
 		#[cfg(feature = "exp-destruct")]
 		LDestruct::Skip => {}
 		#[cfg(feature = "exp-destruct")]
-		LDestruct::Array { start, rest, end } => destruct_array(start, rest, end, value, fctx, builder),
+		LDestruct::Array { start, rest, end } => {
+			destruct_array(start, rest.as_ref(), end, value, fctx, builder)
+		}
 		#[cfg(feature = "exp-destruct")]
-		LDestruct::Object { fields, rest } => destruct_object(fields, rest, value, fctx, builder),
+		LDestruct::Object { fields, rest } => {
+			destruct_object(fields, rest.as_ref(), value, fctx, builder)
+		}
 	}
 }
 
modifiedcrates/jrsonnet-evaluator/src/snapshots/jrsonnet_evaluator__analyze__tests__snapshots@redeclared_local.jsonnet.snapdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/snapshots/jrsonnet_evaluator__analyze__tests__snapshots@redeclared_local.jsonnet.snap
+++ b/crates/jrsonnet-evaluator/src/snapshots/jrsonnet_evaluator__analyze__tests__snapshots@redeclared_local.jsonnet.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/jrsonnet-evaluator/src/analyze.rs
 expression: rendered
-input_file: crates/jrsonnet-evaluator/src/analyze_tests/redeclared_local.jsonnet
+input_file: crates/jrsonnet-evaluator/src/analysis_tests/redeclared_local.jsonnet
 ---
 --- source ---
 local x = 1, x = 2; x
@@ -10,7 +10,7 @@
 local_dependent_depth: 0
 errored: true
 --- diagnostics ---
-   ·              ╭── variable redeclared: x
+   ·              ╭── local is already defined in the current frame: x
 1  │ local x = 1, x = 2; x 
 2  │  
 --- lir ---
modifiedcrates/jrsonnet-ir-parser/src/lib.rsdiffbeforeafterboth
before · crates/jrsonnet-ir-parser/src/lib.rs
1use jrsonnet_gcmodule::Acyclic;2use jrsonnet_ir::{3	ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BinaryOpType, BindSpec, CompSpec, Destruct, Expr,4	ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IfElse, IfSpecData,5	ImportKind, IndexPart, LiteralType, Member, NumValue, ObjBody, ObjComp, ObjMembers, Slice,6	SliceDesc, Source, Span, Spanned, UnaryOpType, Visibility, unescape,7};8use jrsonnet_lexer::{Lexeme, Lexer, Span as LexSpan, SyntaxKind, T, collect_lexed_str_block};910pub struct ParserSettings {11	pub source: Source,12}1314#[derive(Debug, Clone)]15pub struct ParseError {16	pub message: String,17	pub location: Span,18}1920impl std::fmt::Display for ParseError {21	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {22		write!(f, "{}", self.message)23	}24}2526type Result<T> = std::result::Result<T, ParseError>;2728struct Parser<'a> {29	lexemes: Vec<Lexeme<'a>>,30	offset: usize,31	source: Source,32}3334impl<'a> Parser<'a> {35	fn new(code: &'a str, source: Source) -> Self {36		Self {37			lexemes: Lexer::new(code)38				.filter(|l| {39					!matches!(40						l.kind,41						SyntaxKind::WHITESPACE42							| SyntaxKind::SINGLE_LINE_SLASH_COMMENT43							| SyntaxKind::SINGLE_LINE_HASH_COMMENT44							| SyntaxKind::MULTI_LINE_COMMENT45					)46				})47				.collect(),48			offset: 0,49			source,50		}51	}5253	fn peek(&self) -> SyntaxKind {54		if self.at_eof() {55			SyntaxKind::EOF56		} else {57			self.lexemes[self.offset].kind58		}59	}6061	fn text(&self) -> &'a str {62		self.lexemes[self.offset].text63	}6465	fn at(&self, kind: SyntaxKind) -> bool {66		!self.at_eof() && self.peek() == kind67	}6869	fn eat_any(&mut self) {70		self.offset += 1;71	}7273	fn at_eof(&self) -> bool {74		self.offset >= self.lexemes.len()75	}7677	fn try_eat(&mut self, t: SyntaxKind) -> bool {78		if self.at(t) {79			self.eat_any();80			return true;81		}82		false83	}8485	fn current_desc(&self) -> String {86		if self.at_eof() {87			return "end of file".to_owned();88		}89		let kind = self.peek();90		let text = self.text();91		let name = kind.display_name();92		if matches!(kind, SyntaxKind::IDENT | SyntaxKind::FLOAT) {93			format!("{name} \"{text}\"")94		} else {95			name.to_owned()96		}97	}9899	fn eat(&mut self, t: SyntaxKind) -> Result<()> {100		if !self.at(t) {101			return Err(self.error(format!(102				"expected {}, got {}",103				t.display_name(),104				self.current_desc(),105			)));106		}107		self.eat_any();108		Ok(())109	}110111	fn span_start(&self) -> u32 {112		if self.at_eof() {113			if let Some(last) = self.lexemes.last() {114				return last.range.1;115			}116			return 0;117		}118		self.lexemes[self.offset].range.0119	}120121	fn span_end(&self) -> u32 {122		self.lexemes[self.offset - 1].range.1123	}124125	fn error(&self, message: String) -> ParseError {126		if self.offset == self.lexemes.len() {127			let pos = self.lexemes.last().map_or(0, |v| v.range.1);128			return ParseError {129				location: Span(self.source.clone(), pos, pos),130				message,131			};132		}133		let LexSpan(start, end) = self.lexemes[self.offset].range;134		ParseError {135			location: Span(self.source.clone(), start, end),136			message,137		}138	}139}140141fn spanned<T: Acyclic>(142	p: &mut Parser<'_>,143	cb: impl FnOnce(&mut Parser<'_>) -> Result<T>,144) -> Result<Spanned<T>> {145	let start = p.span_start();146	let v = cb(p)?;147	let end = p.span_end();148	Ok(Spanned::new(v, Span(p.source.clone(), start, end)))149}150151fn parse_string_content(p: &mut Parser<'_>) -> Result<IStr> {152	let kind = p.peek();153	let text = p.text();154	let s = match kind {155		SyntaxKind::STRING_DOUBLE => {156			let inner = &text[1..text.len() - 1];157			unescape::unescape(inner).ok_or_else(|| p.error("invalid string escape".into()))?158		}159		SyntaxKind::STRING_SINGLE => {160			let inner = &text[1..text.len() - 1];161			unescape::unescape(inner).ok_or_else(|| p.error("invalid string escape".into()))?162		}163		SyntaxKind::STRING_DOUBLE_VERBATIM => {164			let inner = &text[2..text.len() - 1];165			inner.replace("\"\"", "\"")166		}167		SyntaxKind::STRING_SINGLE_VERBATIM => {168			let inner = &text[2..text.len() - 1];169			inner.replace("''", "'")170		}171		SyntaxKind::STRING_BLOCK => {172			let inner = &text[3..];173			let collected = collect_lexed_str_block(inner)174				.map_err(|_| p.error("invalid string block".into()))?;175			let mut result = String::new();176			for (i, line) in collected.lines.iter().enumerate() {177				if i > 0 {178					result.push('\n');179				}180				result.push_str(line);181			}182			if !collected.truncate {183				result.push('\n');184			}185			result186		}187		_ => return Err(p.error(format!("expected string, got {}", p.current_desc()))),188	};189	p.eat_any();190	Ok(s.into())191}192193fn is_string_token(kind: SyntaxKind) -> bool {194	matches!(195		kind,196		SyntaxKind::STRING_DOUBLE197			| SyntaxKind::STRING_SINGLE198			| SyntaxKind::STRING_DOUBLE_VERBATIM199			| SyntaxKind::STRING_SINGLE_VERBATIM200			| SyntaxKind::STRING_BLOCK201	)202}203204fn parse_number(p: &mut Parser<'_>) -> Result<NumValue> {205	let text = p.text();206	let n: f64 = text207		.replace('_', "")208		.parse()209		.map_err(|_| p.error(format!("invalid number literal: {text}")))?;210211	let v = match NumValue::try_from(n) {212		Ok(v) => v,213		Err(e) => return Err(p.error(format!("invalid number value: {e}"))),214	};215216	p.eat_any();217218	Ok(v)219}220221fn ident(p: &mut Parser<'_>) -> Result<IStr> {222	let text = p.text();223	p.eat(SyntaxKind::IDENT)?;224	Ok(IStr::from(text))225}226227fn literal(p: &mut Parser<'_>) -> Option<LiteralType> {228	let t = match p.peek() {229		T![self] => LiteralType::This,230		T![super] => LiteralType::Super,231		T!['$'] => LiteralType::Dollar,232		T![null] => LiteralType::Null,233		T![true] => LiteralType::True,234		T![false] => LiteralType::False,235		_ => return None,236	};237	p.eat_any();238	Some(t)239}240241fn assert_stmt(p: &mut Parser<'_>) -> Result<AssertStmt> {242	p.eat(T![assert])?;243	let assertion = spanned(p, expr)?;244	let message = if p.try_eat(T![:]) {245		Some(expr(p)?)246	} else {247		None248	};249	Ok(AssertStmt { assertion, message })250}251252fn if_spec_data(p: &mut Parser<'_>) -> Result<IfSpecData> {253	let v = spanned(p, |p| p.eat(T![if]))?;254	let cond = expr(p)?;255	Ok(IfSpecData { span: v.span, cond })256}257258fn if_else(p: &mut Parser<'_>) -> Result<IfElse> {259	let cond = if_spec_data(p)?;260	p.eat(T![then])?;261	let cond_then = expr(p)?;262	let cond_else = if p.try_eat(T![else]) {263		Some(expr(p)?)264	} else {265		None266	};267	Ok(IfElse {268		cond,269		cond_then,270		cond_else,271	})272}273274fn slice_desc(p: &mut Parser<'_>, start: Option<Spanned<Expr>>) -> Result<SliceDesc> {275	p.eat(T![:])?;276	let end = if !p.at(T![:]) && !p.at(T![']']) {277		Some(spanned(p, expr)?)278	} else {279		None280	};281	let step = if p.try_eat(T![:]) {282		if p.at(T![']']) {283			None284		} else {285			Some(spanned(p, expr)?)286		}287	} else {288		None289	};290	Ok(SliceDesc { start, end, step })291}292293fn destruct(p: &mut Parser<'_>) -> Result<Destruct> {294	if p.at(SyntaxKind::IDENT) {295		return Ok(Destruct::Full(spanned(p, ident)?));296	}297	#[cfg(not(feature = "exp-destruct"))]298	return Err(p.error(format!("expected identifier, got {}", p.current_desc())));299	#[cfg(feature = "exp-destruct")]300	{301		if p.try_eat(T![?]) {302			return Ok(Destruct::Skip);303		}304		if p.at(T!['[']) {305			return destruct_array(p);306		}307		if p.at(T!['{']) {308			return destruct_object(p);309		}310		Err(p.error(format!(311			"expected destructure pattern, got {}",312			p.current_desc()313		)))314	}315}316317#[cfg(feature = "exp-destruct")]318fn destruct_rest(p: &mut Parser<'_>) -> Result<jrsonnet_ir::DestructRest> {319	p.eat(T![...])?;320	if p.at(SyntaxKind::IDENT) {321		Ok(jrsonnet_ir::DestructRest::Keep(ident(p)?))322	} else {323		Ok(jrsonnet_ir::DestructRest::Drop)324	}325}326327#[cfg(feature = "exp-destruct")]328fn destruct_array(p: &mut Parser<'_>) -> Result<Destruct> {329	p.eat(T!['['])?;330	let mut start = Vec::new();331	let mut rest = None;332	let mut end = Vec::new();333	if !p.at(T![']']) {334		loop {335			if p.at(T![...]) {336				rest = Some(destruct_rest(p)?);337				if p.try_eat(T![,]) {338					if !p.at(T![']']) {339						loop {340							end.push(destruct(p)?);341							if !p.try_eat(T![,]) {342								break;343							}344							if p.at(T![']']) {345								break;346							}347						}348					}349				}350				break;351			}352			start.push(destruct(p)?);353			if !p.try_eat(T![,]) {354				break;355			}356			if p.at(T![']']) {357				break;358			}359		}360	}361	p.eat(T![']'])?;362	Ok(Destruct::Array { start, rest, end })363}364365#[cfg(feature = "exp-destruct")]366fn destruct_object(p: &mut Parser<'_>) -> Result<Destruct> {367	p.eat(T!['{'])?;368	let mut fields = Vec::new();369	let mut rest = None;370	if !p.at(T!['}']) {371		loop {372			if p.at(T![...]) {373				rest = Some(destruct_rest(p)?);374				p.try_eat(T![,]);375				break;376			}377			let name = ident(p)?;378			let into = if p.try_eat(T![:]) {379				Some(destruct(p)?)380			} else {381				None382			};383			let default = if p.try_eat(T![=]) {384				Some(Rc::new(spanned(p, expr)?))385			} else {386				None387			};388			fields.push((name, into, default));389			if !p.try_eat(T![,]) {390				break;391			}392			if p.at(T!['}']) {393				break;394			}395		}396	}397	p.eat(T!['}'])?;398	Ok(Destruct::Object { fields, rest })399}400401fn params(p: &mut Parser<'_>) -> Result<ExprParams> {402	if p.at(T![')']) {403		return Ok(ExprParams::new(Vec::new()));404	}405	let mut result = Vec::new();406	loop {407		let d = destruct(p)?;408		let default = if p.try_eat(T![=]) {409			Some(expr(p)?)410		} else {411			None412		};413		result.push(ExprParam {414			destruct: d,415			default,416		});417		if !p.try_eat(T![,]) {418			break;419		}420		if p.at(T![')']) {421			break;422		}423	}424	Ok(ExprParams::new(result))425}426427fn args(p: &mut Parser<'_>) -> Result<ArgsDesc> {428	if p.at(T![')']) {429		return Ok(ArgsDesc::new(Vec::new(), Vec::new(), Vec::new()));430	}431	let mut unnamed = Vec::new();432	let mut names = Vec::new();433	let mut values = Vec::new();434	let mut named_started = false;435	loop {436		let is_named = p.at(SyntaxKind::IDENT) && {437			let next_offset = p.offset + 1;438			next_offset < p.lexemes.len() && p.lexemes[next_offset].kind == T![=]439		};440		if is_named {441			let name: IStr = ident(p)?;442			p.eat(T![=])?;443444			names.push(name);445			values.push(expr(p)?);446			named_started = true;447		} else {448			if named_started {449				return Err(p.error("positional argument after named argument".into()));450			}451			unnamed.push(expr(p)?);452		}453		if !p.try_eat(T![,]) {454			break;455		}456		if p.at(T![')']) {457			break;458		}459	}460	Ok(ArgsDesc::new(unnamed, names, values))461}462463fn bind(p: &mut Parser<'_>) -> Result<BindSpec> {464	#[cfg(feature = "exp-destruct")]465	{466		if !p.at(SyntaxKind::IDENT) {467			let d = destruct(p)?;468			p.eat(T![=])?;469			let value = Rc::new(expr(p)?);470			return Ok(BindSpec::Field { into: d, value });471		}472	}473	let name_spanned = spanned(p, ident)?;474	if p.try_eat(T!['(']) {475		let ps = params(p)?;476		p.eat(T![')'])?;477		p.eat(T![=])?;478		Ok(BindSpec::Function {479			name: name_spanned.value,480			params: ps,481			value: expr(p)?,482		})483	} else {484		p.eat(T![=])?;485		Ok(BindSpec::Field {486			into: Destruct::Full(name_spanned),487			value: expr(p)?,488		})489	}490}491492fn visibility(p: &mut Parser<'_>) -> Result<Visibility> {493	p.eat(T![:])?;494	if p.try_eat(T![:]) {495		if p.try_eat(T![:]) {496			Ok(Visibility::Unhide)497		} else {498			Ok(Visibility::Hidden)499		}500	} else {501		Ok(Visibility::Normal)502	}503}504505fn field_name(p: &mut Parser<'_>) -> Result<FieldName> {506	if p.at(SyntaxKind::IDENT) {507		Ok(FieldName::Fixed(ident(p)?))508	} else if is_string_token(p.peek()) {509		Ok(FieldName::Fixed(parse_string_content(p)?))510	} else if p.at(T!['[']) {511		p.eat(T!['['])?;512		let e = expr(p)?;513		p.eat(T![']'])?;514		Ok(FieldName::Dyn(e))515	} else {516		Err(p.error(format!("expected field name, got {}", p.current_desc())))517	}518}519520fn field(p: &mut Parser<'_>) -> Result<FieldMember> {521	let name = spanned(p, field_name)?;522523	if p.at(T!['(']) {524		p.eat(T!['('])?;525		let ps = params(p)?;526		p.eat(T![')'])?;527		let vis = visibility(p)?;528		Ok(FieldMember {529			name,530			plus: false,531			params: Some(ps),532			visibility: vis,533			value: expr(p)?,534		})535	} else {536		let plus = p.try_eat(T![+]);537		let vis = visibility(p)?;538		Ok(FieldMember {539			name,540			plus,541			params: None,542			visibility: vis,543			value: expr(p)?,544		})545	}546}547548fn member(p: &mut Parser<'_>) -> Result<Member> {549	if p.at(T![local]) {550		p.eat(T![local])?;551		Ok(Member::BindStmt(bind(p)?))552	} else if p.at(T![assert]) {553		Ok(Member::AssertStmt(assert_stmt(p)?))554	} else {555		Ok(Member::Field(field(p)?))556	}557}558559fn for_spec(p: &mut Parser<'_>) -> Result<ForSpecData> {560	p.eat(T![for])?;561	let d = destruct(p)?;562	p.eat(T![in])?;563	let over = expr(p)?;564	Ok(ForSpecData { destruct: d, over })565}566567fn compspecs(p: &mut Parser<'_>) -> Result<Vec<CompSpec>> {568	let mut specs = Vec::new();569	specs.push(CompSpec::ForSpec(for_spec(p)?));570	loop {571		if p.at(T![for]) {572			specs.push(CompSpec::ForSpec(for_spec(p)?));573		} else if p.at(T![if]) {574			let isd = if_spec_data(p)?;575			specs.push(CompSpec::IfSpec(isd));576		} else {577			break;578		}579	}580	Ok(specs)581}582583fn objinside(p: &mut Parser<'_>) -> Result<ObjBody> {584	if p.at(T!['}']) {585		return Ok(ObjBody::MemberList(ObjMembers {586			locals: Vec::new(),587			asserts: Vec::new(),588			fields: Vec::new(),589		}));590	}591592	let mut members = Vec::new();593	loop {594		members.push(member(p)?);595		if !p.try_eat(T![,]) {596			break;597		}598		if p.at(T!['}']) || p.at(T![for]) {599			break;600		}601	}602603	if p.at(T![for]) {604		let specs = compspecs(p)?;605		let mut locals = Vec::new();606		let mut field_member = None;607		for m in members {608			match m {609				Member::Field(f) => {610					if field_member.is_some() {611						return Err(612							p.error("object comprehension can only contain one field".into())613						);614					}615					field_member = Some(f);616				}617				Member::BindStmt(b) => locals.push(b),618				Member::AssertStmt(_) => {619					return Err(p.error("asserts are unsupported in object comprehension".into()));620				}621			}622		}623		Ok(ObjBody::ObjComp(ObjComp {624			locals,625			field: Box::new(626				field_member.ok_or_else(|| p.error("missing object comprehension field".into()))?,627			),628			compspecs: specs,629		}))630	} else {631		let mut locals = Vec::new();632		let mut asserts = Vec::new();633		let mut fields = Vec::new();634		for m in members {635			match m {636				Member::Field(f) => fields.push(f),637				Member::BindStmt(b) => locals.push(b),638				Member::AssertStmt(a) => asserts.push(a),639			}640		}641		Ok(ObjBody::MemberList(ObjMembers {642			locals,643			asserts,644			fields,645		}))646	}647}648649#[allow(clippy::too_many_lines)]650fn expr_basic(p: &mut Parser<'_>) -> Result<Expr> {651	if let Some(lit) = literal(p) {652		return Ok(Expr::Literal(lit));653	}654655	match p.peek() {656		SyntaxKind::STRING_DOUBLE657		| SyntaxKind::STRING_SINGLE658		| SyntaxKind::STRING_DOUBLE_VERBATIM659		| SyntaxKind::STRING_SINGLE_VERBATIM660		| SyntaxKind::STRING_BLOCK => Ok(Expr::Str(parse_string_content(p)?)),661662		SyntaxKind::FLOAT => Ok(Expr::Num(parse_number(p)?)),663664		T!['('] => {665			p.eat(T!['('])?;666			let e = expr(p)?;667			p.eat(T![')'])?;668			Ok(e)669		}670671		T!['['] => {672			p.eat(T!['['])?;673			if p.at(T![']']) {674				p.eat(T![']'])?;675				return Ok(Expr::Arr(Vec::new()));676			}677			let first = expr(p)?;678			if p.at(T![for]) {679				let specs = compspecs(p)?;680				p.eat(T![']'])?;681				Ok(Expr::ArrComp(Box::new(first), specs))682			} else if p.at(T![,]) && {683				let next = p.offset + 1;684				next < p.lexemes.len() && p.lexemes[next].kind == T![for]685			} {686				p.eat(T![,])?;687				let specs = compspecs(p)?;688				p.eat(T![']'])?;689				Ok(Expr::ArrComp(Box::new(first), specs))690			} else {691				let mut elems = vec![first];692				while p.try_eat(T![,]) {693					if p.at(T![']']) {694						break;695					}696					elems.push(expr(p)?);697				}698				p.eat(T![']'])?;699				Ok(Expr::Arr(elems))700			}701		}702703		T!['{'] => {704			p.eat(T!['{'])?;705			let body = objinside(p)?;706			p.eat(T!['}'])?;707			Ok(Expr::Obj(body))708		}709710		T![local] => {711			p.eat(T![local])?;712			let mut binds = Vec::new();713			loop {714				binds.push(bind(p)?);715				if !p.try_eat(T![,]) {716					break;717				}718			}719			p.eat(T![;])?;720			let body = expr(p)?;721			Ok(Expr::LocalExpr(binds, Box::new(body)))722		}723724		T![if] => Ok(Expr::IfElse(Box::new(if_else(p)?))),725726		T![function] => {727			p.eat(T![function])?;728			p.eat(T!['('])?;729			let ps = params(p)?;730			p.eat(T![')'])?;731			let body = expr(p)?;732			Ok(Expr::Function(ps, Box::new(body)))733		}734735		T![assert] => {736			let a = assert_stmt(p)?;737			p.eat(T![;])?;738			let rest = expr(p)?;739			Ok(Expr::AssertExpr(Box::new(AssertExpr { assert: a, rest })))740		}741742		T![error] => {743			let span = spanned(p, |p| p.eat(T![error]))?;744			let e = expr(p)?;745			Ok(Expr::ErrorStmt(span.span, Box::new(e)))746		}747748		T![importstr] => {749			let kind = spanned(p, |p| {750				p.eat(T![importstr])?;751				Ok(ImportKind::Str)752			})?;753			let path = expr(p)?;754			Ok(Expr::Import(kind, Box::new(path)))755		}756757		T![importbin] => {758			let kind = spanned(p, |p| {759				p.eat(T![importbin])?;760				Ok(ImportKind::Bin)761			})?;762			let path = expr(p)?;763			Ok(Expr::Import(kind, Box::new(path)))764		}765766		T![import] => {767			let kind = spanned(p, |p| {768				p.eat(T![import])?;769				Ok(ImportKind::Normal)770			})?;771			let path = expr(p)?;772			Ok(Expr::Import(kind, Box::new(path)))773		}774775		SyntaxKind::IDENT => {776			let n = spanned(p, |p| {777				let s: IStr = p.text().into();778				p.eat_any();779				Ok(s)780			})?;781			Ok(Expr::Var(n))782		}783784		_ => Err(p.error(format!("unexpected {}", p.current_desc()))),785	}786}787788fn flush_index_parts(e: &mut Expr, parts: &mut Vec<IndexPart>) {789	if parts.is_empty() {790		return;791	}792	let old = std::mem::replace(e, Expr::Literal(LiteralType::Null));793	*e = Expr::Index {794		indexable: Box::new(old),795		parts: std::mem::take(parts),796	};797}798799fn expr_suffix(p: &mut Parser<'_>) -> Result<Expr> {800	let mut e = expr_basic(p)?;801	// Accumulate consecutive index parts (.field, [expr], ?.field, ?.[expr])802	// into a single Expr::Index. This is critical for null-coalesce semantics:803	// a?.b.c needs all parts in one Index so the evaluator can skip .c when .b is null.804	let mut parts: Vec<IndexPart> = Vec::new();805806	loop {807		#[cfg(feature = "exp-null-coaelse")]808		if p.at(T![?]) {809			p.eat_any();810			if p.try_eat(T![.]) {811				if p.at(T!['[']) {812					// ?.[expr]813					p.eat(T!['['])?;814					let idx = spanned(p, expr)?;815					p.eat(T![']'])?;816					parts.push(IndexPart {817						span: idx.span,818						value: idx.value,819						null_coaelse: true,820					});821				} else {822					// ?.field823					let id_spanned = spanned(p, |p| Ok(Expr::Str(ident(p)?)))?;824					parts.push(IndexPart {825						span: id_spanned.span,826						value: id_spanned.value,827						null_coaelse: true,828					});829				}830			} else {831				return Err(p.error("expected '.' after '?'".into()));832			}833			continue;834		}835836		if p.at(T![.]) {837			p.eat(T![.])?;838			let id_spanned = spanned(p, |p| Ok(Expr::Str(ident(p)?)))?;839			parts.push(IndexPart {840				span: id_spanned.span,841				value: id_spanned.value,842				#[cfg(feature = "exp-null-coaelse")]843				null_coaelse: false,844			});845		} else if p.at(T!['[']) {846			p.eat(T!['['])?;847848			if p.at(T![:]) {849				// Slice: flush index parts first, then handle slice850				flush_index_parts(&mut e, &mut parts);851				let slice = slice_desc(p, None)?;852				p.eat(T![']'])?;853				e = Expr::Slice(Box::new(Slice { value: e, slice }));854			} else {855				let idx = spanned(p, expr)?;856				if p.at(T![:]) {857					// Slice with start: flush index parts first858					flush_index_parts(&mut e, &mut parts);859					let slice = slice_desc(p, Some(idx))?;860					p.eat(T![']'])?;861					e = Expr::Slice(Box::new(Slice { value: e, slice }));862				} else {863					// Bracket index: add to parts864					p.eat(T![']'])?;865					parts.push(IndexPart {866						span: idx.span,867						value: idx.value,868						#[cfg(feature = "exp-null-coaelse")]869						null_coaelse: false,870					});871				}872			}873		} else if p.at(T!['(']) {874			flush_index_parts(&mut e, &mut parts);875			let args_spanned = spanned(p, |p| {876				p.eat(T!['('])?;877				let a = args(p)?;878				p.eat(T![')'])?;879				Ok(a)880			})?;881			let tailstrict = p.try_eat(T![tailstrict]);882			e = Expr::Apply(Box::new(e), args_spanned, tailstrict);883		} else if p.at(T!['{']) {884			flush_index_parts(&mut e, &mut parts);885			p.eat(T!['{'])?;886			let body = objinside(p)?;887			p.eat(T!['}'])?;888			e = Expr::ObjExtend(Box::new(e), body);889		} else {890			break;891		}892	}893894	flush_index_parts(&mut e, &mut parts);895	Ok(e)896}897898fn prefix_binding_power(op: UnaryOpType) -> u8 {899	match op {900		UnaryOpType::Plus | UnaryOpType::Minus | UnaryOpType::Not | UnaryOpType::BitNot => 20,901	}902}903904fn infix_binding_power(op: BinaryOpType) -> (u8, u8) {905	match op {906		BinaryOpType::Or => (2, 3),907		#[cfg(feature = "exp-null-coaelse")]908		BinaryOpType::NullCoaelse => (2, 3),909		BinaryOpType::And => (4, 5),910		BinaryOpType::BitOr => (6, 7),911		BinaryOpType::BitXor => (8, 9),912		BinaryOpType::BitAnd => (10, 11),913		BinaryOpType::Eq | BinaryOpType::Neq => (12, 13),914		BinaryOpType::Lt915		| BinaryOpType::Gt916		| BinaryOpType::Lte917		| BinaryOpType::Gte918		| BinaryOpType::In => (14, 15),919		BinaryOpType::Lhs | BinaryOpType::Rhs => (16, 17),920		BinaryOpType::Add | BinaryOpType::Sub => (18, 19),921		BinaryOpType::Mul | BinaryOpType::Div | BinaryOpType::Mod => (20, 21),922	}923}924925fn unary_op(kind: SyntaxKind) -> Option<UnaryOpType> {926	match kind {927		T![+] => Some(UnaryOpType::Plus),928		T![-] => Some(UnaryOpType::Minus),929		T![!] => Some(UnaryOpType::Not),930		T![~] => Some(UnaryOpType::BitNot),931		_ => None,932	}933}934935fn binary_op(p: &Parser<'_>) -> Option<BinaryOpType> {936	match p.peek() {937		T![||] => Some(BinaryOpType::Or),938		T![&&] => Some(BinaryOpType::And),939		T![|] => Some(BinaryOpType::BitOr),940		T![^] => Some(BinaryOpType::BitXor),941		T![&] => Some(BinaryOpType::BitAnd),942		T![==] => Some(BinaryOpType::Eq),943		T![!=] => Some(BinaryOpType::Neq),944		T![<] => Some(BinaryOpType::Lt),945		T![>] => Some(BinaryOpType::Gt),946		T![<=] => Some(BinaryOpType::Lte),947		T![>=] => Some(BinaryOpType::Gte),948		T![<<] => Some(BinaryOpType::Lhs),949		T![>>] => Some(BinaryOpType::Rhs),950		T![+] => Some(BinaryOpType::Add),951		T![-] => Some(BinaryOpType::Sub),952		T![*] => Some(BinaryOpType::Mul),953		T![/] => Some(BinaryOpType::Div),954		T![%] => Some(BinaryOpType::Mod),955		T![in] => Some(BinaryOpType::In),956		#[cfg(feature = "exp-null-coaelse")]957		T![??] => Some(BinaryOpType::NullCoaelse),958		_ => None,959	}960}961962fn expr_bp(p: &mut Parser<'_>, min_bp: u8) -> Result<Expr> {963	let mut lhs = if let Some(op) = unary_op(p.peek()) {964		p.eat_any();965		let rbp = prefix_binding_power(op);966		let rhs = expr_bp(p, rbp)?;967		Expr::UnaryOp(op, Box::new(rhs))968	} else {969		expr_suffix(p)?970	};971972	loop {973		if p.at_eof() {974			break;975		}976977		let Some(op) = binary_op(p) else {978			break;979		};980981		let (lbp, rbp) = infix_binding_power(op);982		if lbp < min_bp {983			break;984		}985986		p.eat_any();987		let rhs = expr_bp(p, rbp)?;988		lhs = Expr::BinaryOp(Box::new(BinaryOp { lhs, op, rhs }));989	}990991	Ok(lhs)992}993994fn expr(p: &mut Parser<'_>) -> Result<Expr> {995	expr_bp(p, 0)996}997998pub fn parse(str: &str, settings: &ParserSettings) -> Result<Expr> {999	let mut p = Parser::new(str, settings.source.clone());1000	for lexeme in &p.lexemes {1001		if let Some(desc) = lexeme.kind.error_description() {1002			return Err(ParseError {1003				message: desc.to_owned(),1004				location: Span(p.source.clone(), lexeme.range.0, lexeme.range.1),1005			});1006		}1007	}1008	let e = expr(&mut p)?;1009	if !p.at_eof() {1010		return Err(p.error(format!("expected end of file, got {}", p.current_desc(),)));1011	}1012	Ok(e)1013}10141015pub fn string_to_expr(s: IStr, settings: &ParserSettings) -> Spanned<Expr> {1016	let len = u32::try_from(s.len()).expect("code size is limited by 4gb");10171018	Spanned::new(Expr::Str(s), Span(settings.source.clone(), 0, len))1019}10201021#[cfg(test)]1022mod tests {1023	use std::fs;10241025	use insta::{assert_snapshot, glob};1026	use jrsonnet_ir::{IStr, Source};10271028	use super::*;10291030	fn parse_str(input: &str) -> Expr {1031		let source = Source::new_virtual("<test>".into(), input.into());1032		let settings = ParserSettings { source };1033		parse(input, &settings).unwrap()1034	}10351036	#[test]1037	#[cfg(not(feature = "exp-null-coaelse"))]1038	fn basic_test() {1039		let v = parse_str("assert true[false] : false ; true");1040		assert_snapshot!(format!("{v:#?}"));1041	}10421043	#[test]1044	fn literals() {1045		let v = parse_str("[null, true, false, self, super, $]");1046		assert_snapshot!(format!("{v:#?}"));1047	}10481049	#[test]1050	fn basic_math() {1051		let v = parse_str("2+2*2");1052		assert_snapshot!(format!("{v:#?}"));1053	}10541055	#[test]1056	fn underscore_numbers() {1057		let v = parse_str("[1_000, 1_000.000_1, 1_0e1_0]");1058		assert_snapshot!(format!("{v:#?}"));1059	}10601061	#[test]1062	fn strings() {1063		let v = parse_str(r#"["hello", 'world', @"raw""str", @'raw''str']"#);1064		assert_snapshot!(format!("{v:#?}"));1065	}10661067	#[test]1068	fn object() {1069		let v = parse_str("{a: 1, b:: 2, c::: 3}");1070		assert_snapshot!(format!("{v:#?}"));1071	}10721073	#[test]1074	fn function_and_call() {1075		let v = parse_str("local f(x, y=1) = x + y; f(2, y=3)");1076		assert_snapshot!(format!("{v:#?}"));1077	}10781079	#[test]1080	fn if_then_else() {1081		let v = parse_str("if true then 1 else 2");1082		assert_snapshot!(format!("{v:#?}"));1083	}10841085	#[test]1086	fn imports() {1087		let v = parse_str(r#"[import "a", importstr "b", importbin "c"]"#);1088		assert_snapshot!(format!("{v:#?}"));1089	}10901091	#[test]1092	fn array_comp() {1093		let v = parse_str("[x for x in arr]");1094		assert_snapshot!(format!("{v:#?}"));1095	}10961097	#[test]1098	#[cfg(not(feature = "exp-null-coaelse"))]1099	fn index_and_suffix() {1100		let v = parse_str("std.test(2).field[0]");1101		assert_snapshot!(format!("{v:#?}"));1102	}11031104	#[test]1105	fn obj_extend() {1106		let v = parse_str("{} { x: 1 }");1107		assert_snapshot!(format!("{v:#?}"));1108	}11091110	#[test]1111	fn unary_ops() {1112		let v = parse_str("!a && !b");1113		assert_snapshot!(format!("{v:#?}"));1114	}11151116	#[test]1117	fn error_expr() {1118		let v = parse_str("error \"bad\"");1119		assert_snapshot!(format!("{v:#?}"));1120	}11211122	#[test]1123	fn slice() {1124		let v = parse_str("[a[1:], a[1::], a[:1:], a[::1]]");1125		assert_snapshot!(format!("{v:#?}"));1126	}11271128	#[test]1129	#[cfg(not(feature = "exp-null-coaelse"))]1130	fn peg_snapshots() {1131		glob!("../../jrsonnet-peg-parser/src", "tests/*.jsonnet", |path| {1132			let input = fs::read_to_string(path).expect("read test file");1133			let source = Source::new_virtual("<test>".into(), IStr::empty());1134			let settings = ParserSettings { source };1135			let v = parse(&input, &settings).unwrap();1136			let v = format!("{v:#?}");1137			assert_snapshot!(v);1138		});1139	}1140}
modifiedcrates/jrsonnet-ir/src/expr.rsdiffbeforeafterboth
--- a/crates/jrsonnet-ir/src/expr.rs
+++ b/crates/jrsonnet-ir/src/expr.rs
@@ -211,7 +211,7 @@
 	}
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Acyclic)]
+#[derive(Debug, PartialEq, Eq, Acyclic)]
 pub enum DestructRest {
 	/// ...rest
 	Keep(IStr),
@@ -219,7 +219,7 @@
 	Drop,
 }
 
-#[derive(Debug, Clone, PartialEq, Acyclic)]
+#[derive(Debug, PartialEq, Acyclic)]
 pub enum Destruct {
 	Full(Spanned<IStr>),
 	#[cfg(feature = "exp-destruct")]
@@ -233,7 +233,7 @@
 	#[cfg(feature = "exp-destruct")]
 	Object {
 		#[allow(clippy::type_complexity)]
-		fields: Vec<(IStr, Option<Destruct>, Option<Rc<Spanned<Expr>>>)>,
+		fields: Vec<(IStr, Option<Destruct>, Option<Spanned<Expr>>)>,
 		rest: Option<DestructRest>,
 	},
 }
modifiedcrates/jrsonnet-peg-parser/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-peg-parser/src/lib.rs
+++ b/crates/jrsonnet-peg-parser/src/lib.rs
@@ -1,5 +1,3 @@
-use std::rc::Rc;
-
 use jrsonnet_gcmodule::Acyclic;
 use jrsonnet_ir::{
 	ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BindSpec, CompSpec, Destruct, DestructRest, Expr,
@@ -110,7 +108,7 @@
 			}
 		pub rule destruct_object(s: &ParserSettings) -> Destruct
 			= "{" _
-				fields:(name:id() into:(_ ":" _ into:destruct(s) {into})? default:(_ "=" _ v:spanned(<expr(s)>, s) {v})? {(name, into, default.map(Rc::new))})**comma()
+				fields:(name:id() into:(_ ":" _ into:destruct(s) {into})? default:(_ "=" _ v:spanned(<expr(s)>, s) {v})? {(name, into, default)})**comma()
 				rest:(
 					comma() rest:destruct_rest()? {rest}
 					/ comma()? {None}