difftreelog
refactor(ir) flatten
in: master
11 files changed
crates/jrsonnet-ir-parser/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/lib.rs
+++ b/crates/jrsonnet-ir-parser/src/lib.rs
@@ -1,13 +1,11 @@
-use std::rc::Rc;
-
use jrsonnet_gcmodule::Acyclic;
use jrsonnet_ir::{
- ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BinaryOpType, BindSpec, CompSpec, Destruct, Expr,
- ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IfElse, IfSpecData,
- ImportKind, IndexPart, LiteralType, Member, NumValue, ObjBody, ObjComp, ObjMembers, Slice,
- SliceDesc, Source, Span, Spanned, UnaryOpType, Visibility, unescape,
+ unescape, ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BinaryOpType, BindSpec, CompSpec,
+ Destruct, Expr, ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IfElse,
+ IfSpecData, ImportKind, IndexPart, LiteralType, Member, NumValue, ObjBody, ObjComp, ObjMembers,
+ Slice, SliceDesc, Source, Span, Spanned, UnaryOpType, Visibility,
};
-use jrsonnet_lexer::{Lexeme, Lexer, Span as LexSpan, SyntaxKind, T, collect_lexed_str_block};
+use jrsonnet_lexer::{collect_lexed_str_block, Lexeme, Lexer, Span as LexSpan, SyntaxKind, T};
pub struct ParserSettings {
pub source: Source,
@@ -16,7 +14,7 @@
#[derive(Debug, Clone)]
pub struct ParseError {
pub message: String,
- pub location: LexSpan,
+ pub location: Span,
}
impl std::fmt::Display for ParseError {
@@ -128,12 +126,13 @@
if self.offset == self.lexemes.len() {
let pos = self.lexemes.last().map_or(0, |v| v.range.1);
return ParseError {
- location: LexSpan(pos, pos),
+ location: Span(self.source.clone(), pos, pos),
message,
};
}
+ let LexSpan(start, end) = self.lexemes[self.offset].range;
ParseError {
- location: self.lexemes[self.offset].range,
+ location: Span(self.source.clone(), start, end),
message,
}
}
@@ -293,7 +292,7 @@
fn destruct(p: &mut Parser<'_>) -> Result<Destruct> {
if p.at(SyntaxKind::IDENT) {
- return Ok(Destruct::Full(ident(p)?));
+ return Ok(Destruct::Full(spanned(p, ident)?));
}
#[cfg(not(feature = "exp-destruct"))]
return Err(p.error(format!("expected identifier, got {}", p.current_desc())));
@@ -407,7 +406,7 @@
loop {
let d = destruct(p)?;
let default = if p.try_eat(T![=]) {
- Some(Rc::new(expr(p)?))
+ Some(expr(p)?)
} else {
None
};
@@ -441,16 +440,15 @@
if is_named {
let name: IStr = ident(p)?;
p.eat(T![=])?;
- let value = Rc::new(expr(p)?);
names.push(name);
- values.push(value);
+ values.push(expr(p)?);
named_started = true;
} else {
if named_started {
return Err(p.error("positional argument after named argument".into()));
}
- unnamed.push(Rc::new(expr(p)?));
+ unnamed.push(expr(p)?);
}
if !p.try_eat(T![,]) {
break;
@@ -472,23 +470,21 @@
return Ok(BindSpec::Field { into: d, value });
}
}
- let name = ident(p)?;
+ let name_spanned = spanned(p, ident)?;
if p.try_eat(T!['(']) {
let ps = params(p)?;
p.eat(T![')'])?;
p.eat(T![=])?;
- let value = Rc::new(expr(p)?);
Ok(BindSpec::Function {
- name,
+ name: name_spanned.value,
params: ps,
- value,
+ value: expr(p)?,
})
} else {
p.eat(T![=])?;
- let value = Rc::new(expr(p)?);
Ok(BindSpec::Field {
- into: Destruct::Full(name),
- value,
+ into: Destruct::Full(name_spanned),
+ value: expr(p)?,
})
}
}
@@ -529,24 +525,22 @@
let ps = params(p)?;
p.eat(T![')'])?;
let vis = visibility(p)?;
- let value = Rc::new(expr(p)?);
Ok(FieldMember {
name,
plus: false,
params: Some(ps),
visibility: vis,
- value,
+ value: expr(p)?,
})
} else {
let plus = p.try_eat(T![+]);
let vis = visibility(p)?;
- let value = Rc::new(expr(p)?);
Ok(FieldMember {
name,
plus,
params: None,
visibility: vis,
- value,
+ value: expr(p)?,
})
}
}
@@ -589,8 +583,8 @@
fn objinside(p: &mut Parser<'_>) -> Result<ObjBody> {
if p.at(T!['}']) {
return Ok(ObjBody::MemberList(ObjMembers {
- locals: Rc::new(Vec::new()),
- asserts: Rc::new(Vec::new()),
+ locals: Vec::new(),
+ asserts: Vec::new(),
fields: Vec::new(),
}));
}
@@ -627,8 +621,8 @@
}
}
Ok(ObjBody::ObjComp(ObjComp {
- locals: Rc::new(locals),
- field: Rc::new(
+ locals,
+ field: Box::new(
field_member.ok_or_else(|| p.error("missing object comprehension field".into()))?,
),
compspecs: specs,
@@ -645,8 +639,8 @@
}
}
Ok(ObjBody::MemberList(ObjMembers {
- locals: Rc::new(locals),
- asserts: Rc::new(asserts),
+ locals,
+ asserts,
fields,
}))
}
@@ -678,13 +672,13 @@
p.eat(T!['['])?;
if p.at(T![']']) {
p.eat(T![']'])?;
- return Ok(Expr::Arr(Rc::new(Vec::new())));
+ return Ok(Expr::Arr(Vec::new()));
}
let first = expr(p)?;
if p.at(T![for]) {
let specs = compspecs(p)?;
p.eat(T![']'])?;
- Ok(Expr::ArrComp(Rc::new(first), specs))
+ Ok(Expr::ArrComp(Box::new(first), specs))
} else if p.at(T![,]) && {
let next = p.offset + 1;
next < p.lexemes.len() && p.lexemes[next].kind == T![for]
@@ -692,7 +686,7 @@
p.eat(T![,])?;
let specs = compspecs(p)?;
p.eat(T![']'])?;
- Ok(Expr::ArrComp(Rc::new(first), specs))
+ Ok(Expr::ArrComp(Box::new(first), specs))
} else {
let mut elems = vec![first];
while p.try_eat(T![,]) {
@@ -702,7 +696,7 @@
elems.push(expr(p)?);
}
p.eat(T![']'])?;
- Ok(Expr::Arr(Rc::new(elems)))
+ Ok(Expr::Arr(elems))
}
}
@@ -735,14 +729,14 @@
let ps = params(p)?;
p.eat(T![')'])?;
let body = expr(p)?;
- Ok(Expr::Function(ps, Rc::new(body)))
+ Ok(Expr::Function(ps, Box::new(body)))
}
T![assert] => {
let a = assert_stmt(p)?;
p.eat(T![;])?;
let rest = expr(p)?;
- Ok(Expr::AssertExpr(Rc::new(AssertExpr { assert: a, rest })))
+ Ok(Expr::AssertExpr(Box::new(AssertExpr { assert: a, rest })))
}
T![error] => {
@@ -891,7 +885,7 @@
p.eat(T!['{'])?;
let body = objinside(p)?;
p.eat(T!['}'])?;
- e = Expr::ObjExtend(Rc::new(e), body);
+ e = Expr::ObjExtend(Box::new(e), body);
} else {
break;
}
@@ -1007,7 +1001,7 @@
if let Some(desc) = lexeme.kind.error_description() {
return Err(ParseError {
message: desc.to_owned(),
- location: lexeme.range,
+ location: Span(p.source.clone(), lexeme.range.0, lexeme.range.1),
});
}
}
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__array_comp.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__array_comp.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__array_comp.snap
@@ -10,7 +10,7 @@
ForSpec(
ForSpecData {
destruct: Full(
- "x",
+ "x" from virtual:<test>:7-8,
),
over: Var(
"arr" from virtual:<test>:12-15,
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__function_and_call.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__function_and_call.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__function_and_call.snap
@@ -10,13 +10,13 @@
exprs: [
ExprParam {
destruct: Full(
- "x",
+ "x" from virtual:<test>:8-9,
),
default: None,
},
ExprParam {
destruct: Full(
- "y",
+ "y" from virtual:<test>:11-12,
),
default: Some(
Num(
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@array_comp.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@array_comp.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@array_comp.jsonnet.snap
@@ -35,7 +35,7 @@
ForSpec(
ForSpecData {
destruct: Full(
- "x",
+ "x" from virtual:<test>:23-24,
),
over: Var(
"arr" from virtual:<test>:28-31,
@@ -52,7 +52,7 @@
ForSpec(
ForSpecData {
destruct: Full(
- "a",
+ "a" from virtual:<test>:41-42,
),
over: Var(
"b" from virtual:<test>:46-47,
@@ -70,7 +70,7 @@
ForSpec(
ForSpecData {
destruct: Full(
- "e",
+ "e" from virtual:<test>:57-58,
),
over: Var(
"f" from virtual:<test>:62-63,
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@default_nondefault.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@default_nondefault.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@default_nondefault.jsonnet.snap
@@ -11,7 +11,7 @@
exprs: [
ExprParam {
destruct: Full(
- "foo",
+ "foo" from virtual:<test>:8-11,
),
default: Some(
Str(
@@ -21,7 +21,7 @@
},
ExprParam {
destruct: Full(
- "bar",
+ "bar" from virtual:<test>:21-24,
),
default: None,
},
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@subexp.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@subexp.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@subexp.jsonnet.snap
@@ -20,7 +20,7 @@
locals: [
Field {
into: Full(
- "x",
+ "x" from virtual:<test>:11-12,
),
value: Num(
1.0,
crates/jrsonnet-ir/src/expr.rsdiffbeforeafterboth--- a/crates/jrsonnet-ir/src/expr.rs
+++ b/crates/jrsonnet-ir/src/expr.rs
@@ -1,16 +1,15 @@
use std::{
fmt::{self, Debug, Display},
ops::{Deref, RangeInclusive},
- rc::Rc,
};
use jrsonnet_gcmodule::Acyclic;
use jrsonnet_interner::IStr;
use crate::{
- NumValue,
function::{FunctionSignature, ParamDefault, ParamName, ParamParse},
source::Source,
+ NumValue,
};
#[derive(Debug, PartialEq, Acyclic)]
@@ -50,7 +49,7 @@
pub plus: bool,
pub params: Option<ExprParams>,
pub visibility: Visibility,
- pub value: Rc<Expr>,
+ pub value: Expr,
}
#[derive(Debug, PartialEq, Acyclic)]
@@ -156,13 +155,13 @@
#[derive(Debug, PartialEq, Acyclic)]
pub struct ExprParam {
pub destruct: Destruct,
- pub default: Option<Rc<Expr>>,
+ pub default: Option<Expr>,
}
/// Defined function parameters
-#[derive(Debug, Clone, PartialEq, Acyclic)]
+#[derive(Debug, PartialEq, Acyclic)]
pub struct ExprParams {
- pub exprs: Rc<Vec<ExprParam>>,
+ pub exprs: Vec<ExprParam>,
pub signature: FunctionSignature,
pub(crate) binds_len: usize,
}
@@ -191,19 +190,19 @@
.collect(),
),
binds_len: exprs.iter().map(|v| v.destruct.binds_len()).sum(),
- exprs: Rc::new(exprs),
+ exprs,
}
}
}
#[derive(Debug, PartialEq, Acyclic)]
pub struct ArgsDesc {
- pub unnamed: Vec<Rc<Expr>>,
+ pub unnamed: Vec<Expr>,
pub names: Vec<IStr>,
- pub values: Vec<Rc<Expr>>,
+ pub values: Vec<Expr>,
}
impl ArgsDesc {
- pub fn new(unnamed: Vec<Rc<Expr>>, names: Vec<IStr>, values: Vec<Rc<Expr>>) -> Self {
+ pub fn new(unnamed: Vec<Expr>, names: Vec<IStr>, values: Vec<Expr>) -> Self {
Self {
unnamed,
names,
@@ -222,7 +221,7 @@
#[derive(Debug, Clone, PartialEq, Acyclic)]
pub enum Destruct {
- Full(IStr),
+ Full(Spanned<IStr>),
#[cfg(feature = "exp-destruct")]
Skip,
#[cfg(feature = "exp-destruct")]
@@ -242,7 +241,7 @@
/// Name of destructure, used for function parameter names
pub fn name(&self) -> ParamName {
match self {
- Self::Full(name) => ParamName::Named(name.clone()),
+ Self::Full(name) => ParamName::Named(name.value.clone()),
#[cfg(feature = "exp-destruct")]
_ => ParamName::Unnamed,
}
@@ -286,12 +285,12 @@
pub enum BindSpec {
Field {
into: Destruct,
- value: Rc<Expr>,
+ value: Expr,
},
Function {
name: IStr,
params: ExprParams,
- value: Rc<Expr>,
+ value: Expr,
},
}
impl BindSpec {
@@ -323,15 +322,15 @@
#[derive(Debug, PartialEq, Acyclic)]
pub struct ObjComp {
- pub locals: Rc<Vec<BindSpec>>,
- pub field: Rc<FieldMember>,
+ pub locals: Vec<BindSpec>,
+ pub field: Box<FieldMember>,
pub compspecs: Vec<CompSpec>,
}
#[derive(Debug, PartialEq, Acyclic)]
pub struct ObjMembers {
- pub locals: Rc<Vec<BindSpec>>,
- pub asserts: Rc<Vec<AssertStmt>>,
+ pub locals: Vec<BindSpec>,
+ pub asserts: Vec<AssertStmt>,
pub fields: Vec<FieldMember>,
}
@@ -371,7 +370,7 @@
pub rhs: Expr,
}
-#[derive(Debug, PartialEq, Acyclic)]
+#[derive(Debug, PartialEq, Acyclic, Clone, Copy)]
pub enum ImportKind {
Normal,
Str,
@@ -404,7 +403,7 @@
Var(Spanned<IStr>),
/// Array of expressions: [1, 2, "Hello"]
- Arr(Rc<Vec<Expr>>),
+ Arr(Vec<Expr>),
/// Array comprehension:
/// ```jsonnet
/// ingredients: [
@@ -416,19 +415,19 @@
/// ]
/// ],
/// ```
- ArrComp(Rc<Expr>, Vec<CompSpec>),
+ ArrComp(Box<Expr>, Vec<CompSpec>),
/// Object: {a: 2}
Obj(ObjBody),
/// Object extension: var1 {b: 2}
- ObjExtend(Rc<Expr>, ObjBody),
+ ObjExtend(Box<Expr>, ObjBody),
/// -2
UnaryOp(UnaryOpType, Box<Expr>),
/// 2 - 2
BinaryOp(Box<BinaryOp>),
/// assert 2 == 2 : "Math is broken"
- AssertExpr(Rc<AssertExpr>),
+ AssertExpr(Box<AssertExpr>),
/// local a = 2; { b: a }
LocalExpr(Vec<BindSpec>, Box<Expr>),
@@ -444,7 +443,7 @@
parts: Vec<IndexPart>,
},
/// function(x) x
- Function(ExprParams, Rc<Expr>),
+ Function(ExprParams, Box<Expr>),
/// if true == false then 1 else 2
IfElse(Box<IfElse>),
Slice(Box<Slice>),
crates/jrsonnet-peg-parser/src/lib.rsdiffbeforeafterboth61 rule keyword(id: &'static str) -> ()61 rule keyword(id: &'static str) -> ()62 = #{|input, pos| input.parse_string_literal(pos, id)} end_of_ident()62 = #{|input, pos| input.parse_string_literal(pos, id)} end_of_ident()636364 pub rule param(s: &ParserSettings) -> ExprParam = destruct:destruct(s) expr:(_ "=" _ expr:expr(s){expr})? { ExprParam { destruct, default: expr.map(Rc::new) } }64 pub rule param(s: &ParserSettings) -> ExprParam = destruct:destruct(s) default:(_ "=" _ default:expr(s){default})? { ExprParam { destruct, default } }65 pub rule params(s: &ParserSettings) -> ExprParams65 pub rule params(s: &ParserSettings) -> ExprParams66 = params:param(s) ** comma() comma()? { ExprParams::new(params) }66 = params:param(s) ** comma() comma()? { ExprParams::new(params) }67 / { ExprParams::new(Vec::new()) }67 / { ExprParams::new(Vec::new()) }686869 pub rule arg(s: &ParserSettings) -> (Option<IStr>, Rc<Expr>)69 pub rule arg(s: &ParserSettings) -> (Option<IStr>, Expr)70 = name:(quiet! { (s:id() _ "=" !['='] _ {s})? } / expected!("<argument name>")) expr:expr(s) {(name, Rc::new(expr))}70 = name:(quiet! { (s:id() _ "=" !['='] _ {s})? } / expected!("<argument name>")) expr:expr(s) {(name, expr)}717172 pub rule args(s: &ParserSettings) -> ArgsDesc72 pub rule args(s: &ParserSettings) -> ArgsDesc73 = args:arg(s)**comma() comma()? {?73 = args:arg(s)**comma() comma()? {?123 #[cfg(not(feature = "exp-destruct"))] Err("!!!experimental destructuring was not enabled")123 #[cfg(not(feature = "exp-destruct"))] Err("!!!experimental destructuring was not enabled")124 }124 }125 pub rule destruct(s: &ParserSettings) -> Destruct125 pub rule destruct(s: &ParserSettings) -> Destruct126 = v:id() {Destruct::Full(v)}126 = v:spanned(<id()>, s) {Destruct::Full(v)}127 / "?" {?127 / "?" {?128 #[cfg(feature = "exp-destruct")] return Ok(Destruct::Skip);128 #[cfg(feature = "exp-destruct")] return Ok(Destruct::Skip);129 #[cfg(not(feature = "exp-destruct"))] Err("!!!experimental destructuring was not enabled")129 #[cfg(not(feature = "exp-destruct"))] Err("!!!experimental destructuring was not enabled")132 / obj:destruct_object(s) {obj}132 / obj:destruct_object(s) {obj}133133134 pub rule bind(s: &ParserSettings) -> BindSpec134 pub rule bind(s: &ParserSettings) -> BindSpec135 = into:destruct(s) _ "=" _ value:expr(s) {BindSpec::Field{into, value: Rc::new(value)}}135 = into:destruct(s) _ "=" _ value:expr(s) {BindSpec::Field{into, value}}136 / name:id() _ "(" _ params:params(s) _ ")" _ "=" _ value:expr(s) {BindSpec::Function{name, params, value: Rc::new(value)}}136 / name:id() _ "(" _ params:params(s) _ ")" _ "=" _ value:expr(s) {BindSpec::Function{name, params, value}}137137138 pub rule assertion(s: &ParserSettings) -> AssertStmt138 pub rule assertion(s: &ParserSettings) -> AssertStmt139 = keyword("assert") _ assertion:spanned(<expr(s)>, s) message:(_ ":" _ e:expr(s) {e})? { AssertStmt{assertion, message} }139 = keyword("assert") _ assertion:spanned(<expr(s)>, s) message:(_ ":" _ e:expr(s) {e})? { AssertStmt{assertion, message} }187 plus: plus.is_some(),187 plus: plus.is_some(),188 params: None,188 params: None,189 visibility,189 visibility,190 value: Rc::new(value),190 value,191 }}191 }}192 / name:spanned(<field_name(s)>, s) _ "(" _ params:params(s) _ ")" _ visibility:visibility() _ value:expr(s) {FieldMember{192 / name:spanned(<field_name(s)>, s) _ "(" _ params:params(s) _ ")" _ visibility:visibility() _ value:expr(s) {FieldMember{193 name,193 name,194 plus: false,194 plus: false,195 params: Some(params),195 params: Some(params),196 visibility,196 visibility,197 value: Rc::new(value),197 value,198 }}198 }}199 pub rule obj_local(s: &ParserSettings) -> BindSpec199 pub rule obj_local(s: &ParserSettings) -> BindSpec200 = keyword("local") _ bind:bind(s) {bind}200 = keyword("local") _ bind:bind(s) {bind}217 }217 }218 }218 }219 ObjBody::ObjComp(ObjComp {219 ObjBody::ObjComp(ObjComp {220 locals: Rc::new(locals),220 locals,221 field: field.map(Rc::new).ok_or("<missing object comprehension field>")?,221 field: Box::new(field.ok_or("<missing object comprehension field>")?),222 compspecs222 compspecs223 })223 })224 } else {224 } else {233 }233 }234 }234 }235 ObjBody::MemberList(ObjMembers {235 ObjBody::MemberList(ObjMembers {236 locals: Rc::new(locals),236 locals,237 asserts: Rc::new(asserts),237 asserts,238 fields238 fields239 })239 })240 })240 })259 pub rule obj_expr(s: &ParserSettings) -> Expr259 pub rule obj_expr(s: &ParserSettings) -> Expr260 = "{" _ body:objinside(s) _ "}" {Expr::Obj(body)}260 = "{" _ body:objinside(s) _ "}" {Expr::Obj(body)}261 pub rule array_expr(s: &ParserSettings) -> Expr261 pub rule array_expr(s: &ParserSettings) -> Expr262 = "[" _ elems:(expr(s) ** comma()) _ comma()? "]" {Expr::Arr(Rc::new(elems))}262 = "[" _ elems:(expr(s) ** comma()) _ comma()? "]" {Expr::Arr(elems)}263 pub rule array_comp_expr(s: &ParserSettings) -> Expr263 pub rule array_comp_expr(s: &ParserSettings) -> Expr264 = "[" _ expr:expr(s) _ comma()? _ specs:(r: compspecs(s) _ {r}) "]" {264 = "[" _ expr:expr(s) _ comma()? _ specs:(r: compspecs(s) _ {r}) "]" {265 Expr::ArrComp(Rc::new(expr), specs)265 Expr::ArrComp(Box::new(expr), specs)266 }266 }267 pub rule number_expr(s: &ParserSettings) -> Expr267 pub rule number_expr(s: &ParserSettings) -> Expr268 = n:number() {? if let Some(n) = NumValue::new(n) {268 = n:number() {? if let Some(n) = NumValue::new(n) {315 / local_expr(s)315 / local_expr(s)316 / if_then_else_expr(s)316 / if_then_else_expr(s)317317318 / keyword("function") _ "(" _ params:params(s) _ ")" _ expr:expr(s) {Expr::Function(params, Rc::new(expr))}318 / keyword("function") _ "(" _ params:params(s) _ ")" _ expr:expr(s) {Expr::Function(params, Box::new(expr))}319 / assert:assertion(s) _ ";" _ rest:expr(s) { Expr::AssertExpr(Rc::new(AssertExpr{319 / assert:assertion(s) _ ";" _ rest:expr(s) { Expr::AssertExpr(Box::new(AssertExpr{320 assert, rest320 assert, rest321 })) }321 })) }322322390 value:(@) _ "[" _ slice:slice_desc(s) _ "]" {Expr::Slice(Box::new(Slice{value, slice}))}390 value:(@) _ "[" _ slice:slice_desc(s) _ "]" {Expr::Slice(Box::new(Slice{value, slice}))}391 indexable:(@) _ parts:index_part(s)+ {Expr::Index{indexable: Box::new(indexable), parts}}391 indexable:(@) _ parts:index_part(s)+ {Expr::Index{indexable: Box::new(indexable), parts}}392 a:(@) _ args:spanned(<"(" _ a:args(s) _ ")" {a}>, s) ts:(_ keyword("tailstrict"))? {Expr::Apply(Box::new(a), args, ts.is_some())}392 a:(@) _ args:spanned(<"(" _ a:args(s) _ ")" {a}>, s) ts:(_ keyword("tailstrict"))? {Expr::Apply(Box::new(a), args, ts.is_some())}393 a:(@) _ "{" _ body:objinside(s) _ "}" {Expr::ObjExtend(Rc::new(a), body)}393 a:(@) _ "{" _ body:objinside(s) _ "}" {Expr::ObjExtend(Box::new(a), body)}394 --394 --395 e:expr_basic(s) {e}395 e:expr_basic(s) {e}396 "(" _ e:expr(s) _ ")" {e}396 "(" _ e:expr(s) _ ")" {e}crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@array_comp.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@array_comp.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@array_comp.jsonnet.snap
@@ -35,7 +35,7 @@
ForSpec(
ForSpecData {
destruct: Full(
- "x",
+ "x" from virtual:<test>:23-24,
),
over: Var(
"arr" from virtual:<test>:28-31,
@@ -52,7 +52,7 @@
ForSpec(
ForSpecData {
destruct: Full(
- "a",
+ "a" from virtual:<test>:41-42,
),
over: Var(
"b" from virtual:<test>:46-47,
@@ -70,7 +70,7 @@
ForSpec(
ForSpecData {
destruct: Full(
- "e",
+ "e" from virtual:<test>:57-58,
),
over: Var(
"f" from virtual:<test>:62-63,
crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@default_nondefault.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@default_nondefault.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@default_nondefault.jsonnet.snap
@@ -11,7 +11,7 @@
exprs: [
ExprParam {
destruct: Full(
- "foo",
+ "foo" from virtual:<test>:8-11,
),
default: Some(
Str(
@@ -21,7 +21,7 @@
},
ExprParam {
destruct: Full(
- "bar",
+ "bar" from virtual:<test>:21-24,
),
default: None,
},
crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@subexp.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@subexp.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@subexp.jsonnet.snap
@@ -20,7 +20,7 @@
locals: [
Field {
into: Full(
- "x",
+ "x" from virtual:<test>:11-12,
),
value: Num(
1.0,