difftreelog
refactor split literals and trivials
in: master
39 files changed
crates/jrsonnet-ir-parser/src/lib.rsdiffbeforeafterboth1use 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 #[allow(dead_code)]70 fn nth(&self, n: usize) -> SyntaxKind {71 self.lexemes72 .get(self.offset + n)73 .map_or(SyntaxKind::EOF, |l| l.kind)74 }7576 fn eat_any(&mut self) {77 self.offset += 1;78 }7980 fn eat_any_spanned(&mut self) -> Span {81 let start = self.span_start();82 self.eat_any();83 let end = self.span_end();84 Span(self.source.clone(), start, end)85 }8687 fn at_eof(&self) -> bool {88 self.offset >= self.lexemes.len()89 }9091 fn try_eat(&mut self, t: SyntaxKind) -> bool {92 if self.at(t) {93 self.eat_any();94 return true;95 }96 false97 }9899 fn current_desc(&self) -> String {100 if self.at_eof() {101 return "end of file".to_owned();102 }103 let kind = self.peek();104 let text = self.text();105 let name = kind.display_name();106 if matches!(kind, SyntaxKind::IDENT | SyntaxKind::FLOAT) {107 format!("{name} \"{text}\"")108 } else {109 name.to_owned()110 }111 }112113 fn eat(&mut self, t: SyntaxKind) -> Result<()> {114 if !self.at(t) {115 return Err(self.error(format!(116 "expected {}, got {}",117 t.display_name(),118 self.current_desc(),119 )));120 }121 self.eat_any();122 Ok(())123 }124 fn eat_spanned(&mut self, t: SyntaxKind) -> Result<Span> {125 let start = self.span_start();126 self.eat(t)?;127 let end = self.span_end();128 Ok(Span(self.source.clone(), start, end))129 }130131 fn span_start(&self) -> u32 {132 if self.at_eof() {133 if let Some(last) = self.lexemes.last() {134 return last.range.1;135 }136 return 0;137 }138 self.lexemes[self.offset].range.0139 }140141 fn span_end(&self) -> u32 {142 self.lexemes[self.offset - 1].range.1143 }144145 fn error(&self, message: String) -> ParseError {146 if self.offset == self.lexemes.len() {147 let pos = self.lexemes.last().map_or(0, |v| v.range.1);148 return ParseError {149 location: Span(self.source.clone(), pos, pos),150 message,151 };152 }153 let LexSpan(start, end) = self.lexemes[self.offset].range;154 ParseError {155 location: Span(self.source.clone(), start, end),156 message,157 }158 }159}160161fn spanned<T: Acyclic>(162 p: &mut Parser<'_>,163 cb: impl FnOnce(&mut Parser<'_>) -> Result<T>,164) -> Result<Spanned<T>> {165 let start = p.span_start();166 let v = cb(p)?;167 let end = p.span_end();168 Ok(Spanned::new(v, Span(p.source.clone(), start, end)))169}170171fn parse_string_content(p: &mut Parser<'_>) -> Result<IStr> {172 let kind = p.peek();173 let text = p.text();174 let s = match kind {175 SyntaxKind::STRING_DOUBLE => {176 let inner = &text[1..text.len() - 1];177 unescape::unescape(inner).ok_or_else(|| p.error("invalid string escape".into()))?178 }179 SyntaxKind::STRING_SINGLE => {180 let inner = &text[1..text.len() - 1];181 unescape::unescape(inner).ok_or_else(|| p.error("invalid string escape".into()))?182 }183 SyntaxKind::STRING_DOUBLE_VERBATIM => {184 let inner = &text[2..text.len() - 1];185 inner.replace("\"\"", "\"")186 }187 SyntaxKind::STRING_SINGLE_VERBATIM => {188 let inner = &text[2..text.len() - 1];189 inner.replace("''", "'")190 }191 SyntaxKind::STRING_BLOCK => {192 let inner = &text[3..];193 let collected = collect_lexed_str_block(inner)194 .map_err(|_| p.error("invalid string block".into()))?;195 let mut result = String::new();196 for (i, line) in collected.lines.iter().enumerate() {197 if i > 0 {198 result.push('\n');199 }200 result.push_str(line);201 }202 if !collected.truncate {203 result.push('\n');204 }205 result206 }207 _ => return Err(p.error(format!("expected string, got {}", p.current_desc()))),208 };209 p.eat_any();210 Ok(s.into())211}212213fn is_string_token(kind: SyntaxKind) -> bool {214 matches!(215 kind,216 SyntaxKind::STRING_DOUBLE217 | SyntaxKind::STRING_SINGLE218 | SyntaxKind::STRING_DOUBLE_VERBATIM219 | SyntaxKind::STRING_SINGLE_VERBATIM220 | SyntaxKind::STRING_BLOCK221 )222}223224fn parse_number(p: &mut Parser<'_>) -> Result<NumValue> {225 let text = p.text();226 let n: f64 = text227 .replace('_', "")228 .parse()229 .map_err(|_| p.error(format!("invalid number literal: {text}")))?;230231 let v = match NumValue::try_from(n) {232 Ok(v) => v,233 Err(e) => return Err(p.error(format!("invalid number value: {e}"))),234 };235236 p.eat_any();237238 Ok(v)239}240241fn ident(p: &mut Parser<'_>) -> Result<IStr> {242 if !p.at(SyntaxKind::IDENT) {243 return Err(p.error(format!("expected identifier, got {}", p.current_desc())));244 }245 let text = p.text();246 p.eat_any();247 Ok(IStr::from(text))248}249250fn literal(p: &mut Parser<'_>) -> Option<(Span, LiteralType)> {251 let t = match p.peek() {252 T![self] => LiteralType::This,253 T![super] => LiteralType::Super,254 T!['$'] => LiteralType::Dollar,255 T![null] => LiteralType::Null,256 T![true] => LiteralType::True,257 T![false] => LiteralType::False,258 _ => return None,259 };260 Some((p.eat_any_spanned(), t))261}262263fn assert_stmt(p: &mut Parser<'_>) -> Result<AssertStmt> {264 p.eat(T![assert])?;265 let assertion = spanned(p, expr)?;266 let message = if p.try_eat(T![:]) {267 Some(expr(p)?)268 } else {269 None270 };271 Ok(AssertStmt { assertion, message })272}273274fn if_spec_data(p: &mut Parser<'_>) -> Result<IfSpecData> {275 let v = spanned(p, |p| p.eat(T![if]))?;276 let cond = expr(p)?;277 Ok(IfSpecData { span: v.span, cond })278}279280fn if_else(p: &mut Parser<'_>) -> Result<IfElse> {281 let cond = if_spec_data(p)?;282 p.eat(T![then])?;283 let cond_then = expr(p)?;284 let cond_else = if p.try_eat(T![else]) {285 Some(expr(p)?)286 } else {287 None288 };289 Ok(IfElse {290 cond,291 cond_then,292 cond_else,293 })294}295296fn slice_desc(p: &mut Parser<'_>, start: Option<Spanned<Expr>>) -> Result<SliceDesc> {297 p.eat(T![:])?;298 let end = if !p.at(T![:]) && !p.at(T![']']) {299 Some(spanned(p, expr)?)300 } else {301 None302 };303 let step = if p.try_eat(T![:]) {304 if p.at(T![']']) {305 None306 } else {307 Some(spanned(p, expr)?)308 }309 } else {310 None311 };312 Ok(SliceDesc { start, end, step })313}314315fn destruct(p: &mut Parser<'_>) -> Result<Destruct> {316 if p.at(SyntaxKind::IDENT) {317 return Ok(Destruct::Full(spanned(p, ident)?));318 }319 #[cfg(not(feature = "exp-destruct"))]320 return Err(p.error(format!("expected identifier, got {}", p.current_desc())));321 #[cfg(feature = "exp-destruct")]322 {323 if p.try_eat(T![?]) {324 return Ok(Destruct::Skip);325 }326 if p.at(T!['[']) {327 return destruct_array(p);328 }329 if p.at(T!['{']) {330 return destruct_object(p);331 }332 Err(p.error(format!(333 "expected destructure pattern, got {}",334 p.current_desc()335 )))336 }337}338339#[cfg(feature = "exp-destruct")]340fn destruct_rest(p: &mut Parser<'_>) -> Result<jrsonnet_ir::DestructRest> {341 p.eat(T![...])?;342 if p.at(SyntaxKind::IDENT) {343 Ok(jrsonnet_ir::DestructRest::Keep(ident(p)?))344 } else {345 Ok(jrsonnet_ir::DestructRest::Drop)346 }347}348349#[cfg(feature = "exp-destruct")]350fn destruct_array(p: &mut Parser<'_>) -> Result<Destruct> {351 p.eat(T!['['])?;352 let mut start = Vec::new();353 let mut rest = None;354 let mut end = Vec::new();355 if !p.at(T![']']) {356 loop {357 if p.at(T![...]) {358 rest = Some(destruct_rest(p)?);359 if p.try_eat(T![,]) {360 if !p.at(T![']']) {361 loop {362 end.push(destruct(p)?);363 if !p.try_eat(T![,]) {364 break;365 }366 if p.at(T![']']) {367 break;368 }369 }370 }371 }372 break;373 }374 start.push(destruct(p)?);375 if !p.try_eat(T![,]) {376 break;377 }378 if p.at(T![']']) {379 break;380 }381 }382 }383 p.eat(T![']'])?;384 Ok(Destruct::Array { start, rest, end })385}386387#[cfg(feature = "exp-destruct")]388fn destruct_object(p: &mut Parser<'_>) -> Result<Destruct> {389 p.eat(T!['{'])?;390 let mut fields = Vec::new();391 let mut rest = None;392 if !p.at(T!['}']) {393 loop {394 if p.at(T![...]) {395 rest = Some(destruct_rest(p)?);396 p.try_eat(T![,]);397 break;398 }399 let name = ident(p)?;400 let into = if p.try_eat(T![:]) {401 Some(destruct(p)?)402 } else {403 None404 };405 let default = if p.try_eat(T![=]) {406 Some(spanned(p, expr)?)407 } else {408 None409 };410 fields.push((name, into, default));411 if !p.try_eat(T![,]) {412 break;413 }414 if p.at(T!['}']) {415 break;416 }417 }418 }419 p.eat(T!['}'])?;420 Ok(Destruct::Object { fields, rest })421}422423fn params(p: &mut Parser<'_>) -> Result<ExprParams> {424 if p.at(T![')']) {425 return Ok(ExprParams::new(Vec::new()));426 }427 let mut result = Vec::new();428 loop {429 let d = destruct(p)?;430 let default = if p.try_eat(T![=]) {431 Some(expr(p)?)432 } else {433 None434 };435 result.push(ExprParam {436 destruct: d,437 default,438 });439 if !p.try_eat(T![,]) {440 break;441 }442 if p.at(T![')']) {443 break;444 }445 }446 Ok(ExprParams::new(result))447}448449fn args(p: &mut Parser<'_>) -> Result<ArgsDesc> {450 if p.at(T![')']) {451 return Ok(ArgsDesc::new(Vec::new(), Vec::new(), Vec::new()));452 }453 let mut unnamed = Vec::new();454 let mut names = Vec::new();455 let mut values = Vec::new();456 let mut named_started = false;457 loop {458 let is_named = p.at(SyntaxKind::IDENT) && {459 let next_offset = p.offset + 1;460 next_offset < p.lexemes.len() && p.lexemes[next_offset].kind == T![=]461 };462 if is_named {463 let name: IStr = ident(p)?;464 p.eat(T![=])?;465466 names.push(name);467 values.push(expr(p)?);468 named_started = true;469 } else {470 if named_started {471 return Err(p.error("positional argument after named argument".into()));472 }473 unnamed.push(expr(p)?);474 }475 if !p.try_eat(T![,]) {476 break;477 }478 if p.at(T![')']) {479 break;480 }481 }482 Ok(ArgsDesc::new(unnamed, names, values))483}484485fn bind(p: &mut Parser<'_>) -> Result<BindSpec> {486 #[cfg(feature = "exp-destruct")]487 {488 if !p.at(SyntaxKind::IDENT) {489 let d = destruct(p)?;490 p.eat(T![=])?;491 return Ok(BindSpec::Field {492 into: d,493 value: expr(p)?,494 });495 }496 }497 let name = spanned(p, ident)?;498 if p.try_eat(T!['(']) {499 let ps = params(p)?;500 p.eat(T![')'])?;501 p.eat(T![=])?;502 Ok(BindSpec::Function {503 name,504 params: ps,505 value: expr(p)?,506 })507 } else {508 p.eat(T![=])?;509 Ok(BindSpec::Field {510 into: Destruct::Full(name),511 value: expr(p)?,512 })513 }514}515516fn visibility(p: &mut Parser<'_>) -> Result<Visibility> {517 p.eat(T![:])?;518 if p.try_eat(T![:]) {519 if p.try_eat(T![:]) {520 Ok(Visibility::Unhide)521 } else {522 Ok(Visibility::Hidden)523 }524 } else {525 Ok(Visibility::Normal)526 }527}528529fn field_name(p: &mut Parser<'_>) -> Result<FieldName> {530 if p.at(SyntaxKind::IDENT) {531 Ok(FieldName::Fixed(ident(p)?))532 } else if is_string_token(p.peek()) {533 Ok(FieldName::Fixed(parse_string_content(p)?))534 } else if p.at(T!['[']) {535 p.eat(T!['['])?;536 let e = expr(p)?;537 p.eat(T![']'])?;538 Ok(FieldName::Dyn(e))539 } else {540 Err(p.error(format!("expected field name, got {}", p.current_desc())))541 }542}543544fn field(p: &mut Parser<'_>) -> Result<FieldMember> {545 let name = spanned(p, field_name)?;546547 if p.at(T!['(']) {548 p.eat(T!['('])?;549 let ps = params(p)?;550 p.eat(T![')'])?;551 let vis = visibility(p)?;552 Ok(FieldMember {553 name,554 plus: false,555 params: Some(ps),556 visibility: vis,557 value: expr(p)?,558 })559 } else {560 let plus = p.try_eat(T![+]);561 let vis = visibility(p)?;562 Ok(FieldMember {563 name,564 plus,565 params: None,566 visibility: vis,567 value: expr(p)?,568 })569 }570}571572fn member(p: &mut Parser<'_>) -> Result<Member> {573 if p.at(T![local]) {574 p.eat(T![local])?;575 Ok(Member::BindStmt(bind(p)?))576 } else if p.at(T![assert]) {577 Ok(Member::AssertStmt(assert_stmt(p)?))578 } else {579 Ok(Member::Field(field(p)?))580 }581}582583fn for_spec(p: &mut Parser<'_>) -> Result<CompSpec> {584 p.eat(T![for])?;585 #[cfg(feature = "exp-object-iteration")]586 if p.at(T!['[']) && p.nth(1) == SyntaxKind::IDENT && p.nth(2) == T![']'] && p.nth(3) == T![:] {587 p.eat(T!['['])?;588 let key = ident(p)?;589 p.eat(T![']'])?;590 let visibility = visibility(p)?;591 let value = destruct(p)?;592 p.eat(T![in])?;593 let over = expr(p)?;594 return Ok(CompSpec::ForObjSpec(jrsonnet_ir::ForObjSpecData {595 key,596 visibility,597 value,598 over,599 }));600 }601 let d = destruct(p)?;602 p.eat(T![in])?;603 let over = expr(p)?;604 Ok(CompSpec::ForSpec(ForSpecData { destruct: d, over }))605}606607fn compspecs(p: &mut Parser<'_>) -> Result<Vec<CompSpec>> {608 let mut specs = Vec::new();609 specs.push(for_spec(p)?);610 loop {611 if p.at(T![for]) {612 specs.push(for_spec(p)?);613 } else if p.at(T![if]) {614 let isd = if_spec_data(p)?;615 specs.push(CompSpec::IfSpec(isd));616 } else {617 break;618 }619 }620 Ok(specs)621}622623fn objinside(p: &mut Parser<'_>) -> Result<ObjBody> {624 if p.at(T!['}']) {625 return Ok(ObjBody::MemberList(ObjMembers {626 locals: Vec::new(),627 asserts: Vec::new(),628 fields: Vec::new(),629 }));630 }631632 let mut members = Vec::new();633 loop {634 members.push(member(p)?);635 if !p.try_eat(T![,]) {636 break;637 }638 if p.at(T!['}']) || p.at(T![for]) {639 break;640 }641 }642643 if p.at(T![for]) {644 let specs = compspecs(p)?;645 let mut locals = Vec::new();646 let mut field_member = None;647 for m in members {648 match m {649 Member::Field(f) => {650 if field_member.is_some() {651 return Err(652 p.error("object comprehension can only contain one field".into())653 );654 }655 field_member = Some(f);656 }657 Member::BindStmt(b) => locals.push(b),658 Member::AssertStmt(_) => {659 return Err(p.error("asserts are unsupported in object comprehension".into()));660 }661 }662 }663 Ok(ObjBody::ObjComp(ObjComp {664 locals,665 field: Box::new(666 field_member.ok_or_else(|| p.error("missing object comprehension field".into()))?,667 ),668 compspecs: specs,669 }))670 } else {671 let mut locals = Vec::new();672 let mut asserts = Vec::new();673 let mut fields = Vec::new();674 for m in members {675 match m {676 Member::Field(f) => fields.push(f),677 Member::BindStmt(b) => locals.push(b),678 Member::AssertStmt(a) => asserts.push(a),679 }680 }681 Ok(ObjBody::MemberList(ObjMembers {682 locals,683 asserts,684 fields,685 }))686 }687}688689#[allow(clippy::too_many_lines)]690fn expr_basic(p: &mut Parser<'_>) -> Result<Expr> {691 if let Some((span, lit)) = literal(p) {692 return Ok(Expr::Literal(span, lit));693 }694695 match p.peek() {696 SyntaxKind::STRING_DOUBLE697 | SyntaxKind::STRING_SINGLE698 | SyntaxKind::STRING_DOUBLE_VERBATIM699 | SyntaxKind::STRING_SINGLE_VERBATIM700 | SyntaxKind::STRING_BLOCK => Ok(Expr::Str(parse_string_content(p)?)),701702 SyntaxKind::FLOAT => Ok(Expr::Num(parse_number(p)?)),703704 T!['('] => {705 p.eat(T!['('])?;706 let e = expr(p)?;707 p.eat(T![')'])?;708 Ok(e)709 }710711 T!['['] => {712 p.eat(T!['['])?;713 if p.at(T![']']) {714 p.eat(T![']'])?;715 return Ok(Expr::Arr(Vec::new()));716 }717 let first = expr(p)?;718 if p.at(T![for]) {719 let specs = compspecs(p)?;720 p.eat(T![']'])?;721 Ok(Expr::ArrComp(Box::new(first), specs))722 } else if p.at(T![,]) && {723 let next = p.offset + 1;724 next < p.lexemes.len() && p.lexemes[next].kind == T![for]725 } {726 p.eat(T![,])?;727 let specs = compspecs(p)?;728 p.eat(T![']'])?;729 Ok(Expr::ArrComp(Box::new(first), specs))730 } else {731 let mut elems = vec![first];732 while p.try_eat(T![,]) {733 if p.at(T![']']) {734 break;735 }736 elems.push(expr(p)?);737 }738 p.eat(T![']'])?;739 Ok(Expr::Arr(elems))740 }741 }742743 T!['{'] => {744 p.eat(T!['{'])?;745 let body = objinside(p)?;746 p.eat(T!['}'])?;747 Ok(Expr::Obj(body))748 }749750 T![local] => {751 p.eat(T![local])?;752 let mut binds = Vec::new();753 loop {754 if p.at(T![;]) {755 break;756 }757 binds.push(bind(p)?);758 if !p.try_eat(T![,]) {759 break;760 }761 }762 p.eat(T![;])?;763 let body = expr(p)?;764 Ok(Expr::LocalExpr(binds, Box::new(body)))765 }766767 T![if] => Ok(Expr::IfElse(Box::new(if_else(p)?))),768769 T![function] => {770 let span = p.eat_spanned(T![function])?;771 p.eat(T!['('])?;772 let ps = params(p)?;773 p.eat(T![')'])?;774 let body = expr(p)?;775 Ok(Expr::Function(span, ps, Box::new(body)))776 }777778 T![assert] => {779 let a = assert_stmt(p)?;780 p.eat(T![;])?;781 let rest = expr(p)?;782 Ok(Expr::AssertExpr(Box::new(AssertExpr { assert: a, rest })))783 }784785 T![error] => {786 let span = spanned(p, |p| p.eat(T![error]))?;787 let e = expr(p)?;788 Ok(Expr::ErrorStmt(span.span, Box::new(e)))789 }790791 T![importstr] => {792 let kind = spanned(p, |p| {793 p.eat(T![importstr])?;794 Ok(ImportKind::Str)795 })?;796 let path = expr(p)?;797 Ok(Expr::Import(kind, Box::new(path)))798 }799800 T![importbin] => {801 let kind = spanned(p, |p| {802 p.eat(T![importbin])?;803 Ok(ImportKind::Bin)804 })?;805 let path = expr(p)?;806 Ok(Expr::Import(kind, Box::new(path)))807 }808809 T![import] => {810 let kind = spanned(p, |p| {811 p.eat(T![import])?;812 Ok(ImportKind::Normal)813 })?;814 let path = expr(p)?;815 Ok(Expr::Import(kind, Box::new(path)))816 }817818 SyntaxKind::IDENT => {819 let n = spanned(p, |p| {820 let s: IStr = p.text().into();821 p.eat_any();822 Ok(s)823 })?;824 Ok(Expr::Var(n))825 }826827 _ => Err(p.error(format!("unexpected {}", p.current_desc()))),828 }829}830831fn flush_index_parts(e: &mut Expr, parts: &mut Vec<IndexPart>) {832 if parts.is_empty() {833 return;834 }835 let old = std::mem::replace(e, Expr::Str(IStr::empty()));836 *e = Expr::Index {837 indexable: Box::new(old),838 parts: std::mem::take(parts),839 };840}841842fn expr_suffix(p: &mut Parser<'_>) -> Result<Expr> {843 let mut e = expr_basic(p)?;844 // Accumulate consecutive index parts (.field, [expr], ?.field, ?.[expr])845 // into a single Expr::Index. This is critical for null-coalesce semantics:846 // a?.b.c needs all parts in one Index so the evaluator can skip .c when .b is null.847 let mut parts: Vec<IndexPart> = Vec::new();848849 loop {850 #[cfg(feature = "exp-null-coaelse")]851 if p.at(T![?]) {852 p.eat_any();853 if p.try_eat(T![.]) {854 if p.at(T!['[']) {855 // ?.[expr]856 p.eat(T!['['])?;857 let idx = spanned(p, expr)?;858 p.eat(T![']'])?;859 parts.push(IndexPart {860 span: idx.span,861 value: idx.value,862 null_coaelse: true,863 });864 } else {865 // ?.field866 let id_spanned = spanned(p, |p| Ok(Expr::Str(ident(p)?)))?;867 parts.push(IndexPart {868 span: id_spanned.span,869 value: id_spanned.value,870 null_coaelse: true,871 });872 }873 } else {874 return Err(p.error("expected '.' after '?'".into()));875 }876 continue;877 }878879 if p.at(T![.]) {880 p.eat(T![.])?;881 let id_spanned = spanned(p, |p| Ok(Expr::Str(ident(p)?)))?;882 parts.push(IndexPart {883 span: id_spanned.span,884 value: id_spanned.value,885 #[cfg(feature = "exp-null-coaelse")]886 null_coaelse: false,887 });888 } else if p.at(T!['[']) {889 p.eat(T!['['])?;890891 if p.at(T![:]) {892 // Slice: flush index parts first, then handle slice893 flush_index_parts(&mut e, &mut parts);894 let slice = slice_desc(p, None)?;895 p.eat(T![']'])?;896 e = Expr::Slice(Box::new(Slice { value: e, slice }));897 } else {898 let idx = spanned(p, expr)?;899 if p.at(T![:]) {900 // Slice with start: flush index parts first901 flush_index_parts(&mut e, &mut parts);902 let slice = slice_desc(p, Some(idx))?;903 p.eat(T![']'])?;904 e = Expr::Slice(Box::new(Slice { value: e, slice }));905 } else {906 // Bracket index: add to parts907 p.eat(T![']'])?;908 parts.push(IndexPart {909 span: idx.span,910 value: idx.value,911 #[cfg(feature = "exp-null-coaelse")]912 null_coaelse: false,913 });914 }915 }916 } else if p.at(T!['(']) {917 flush_index_parts(&mut e, &mut parts);918 let args_spanned = spanned(p, |p| {919 p.eat(T!['('])?;920 let a = args(p)?;921 p.eat(T![')'])?;922 Ok(a)923 })?;924 let tailstrict = p.try_eat(T![tailstrict]);925 e = Expr::Apply(Box::new(e), args_spanned, tailstrict);926 } else if p.at(T!['{']) {927 flush_index_parts(&mut e, &mut parts);928 p.eat(T!['{'])?;929 let body = objinside(p)?;930 p.eat(T!['}'])?;931 e = Expr::ObjExtend(Box::new(e), body);932 } else {933 break;934 }935 }936937 flush_index_parts(&mut e, &mut parts);938 Ok(e)939}940941fn prefix_binding_power(op: UnaryOpType) -> u8 {942 match op {943 UnaryOpType::Plus | UnaryOpType::Minus | UnaryOpType::Not | UnaryOpType::BitNot => 20,944 }945}946947fn infix_binding_power(op: BinaryOpType) -> (u8, u8) {948 match op {949 BinaryOpType::Or => (2, 3),950 #[cfg(feature = "exp-null-coaelse")]951 BinaryOpType::NullCoaelse => (2, 3),952 BinaryOpType::And => (4, 5),953 BinaryOpType::BitOr => (6, 7),954 BinaryOpType::BitXor => (8, 9),955 BinaryOpType::BitAnd => (10, 11),956 BinaryOpType::Eq | BinaryOpType::Neq => (12, 13),957 BinaryOpType::Lt958 | BinaryOpType::Gt959 | BinaryOpType::Lte960 | BinaryOpType::Gte961 | BinaryOpType::In => (14, 15),962 BinaryOpType::Lhs | BinaryOpType::Rhs => (16, 17),963 BinaryOpType::Add | BinaryOpType::Sub => (18, 19),964 BinaryOpType::Mul | BinaryOpType::Div | BinaryOpType::Mod => (20, 21),965 }966}967968fn unary_op(kind: SyntaxKind) -> Option<UnaryOpType> {969 match kind {970 T![+] => Some(UnaryOpType::Plus),971 T![-] => Some(UnaryOpType::Minus),972 T![!] => Some(UnaryOpType::Not),973 T![~] => Some(UnaryOpType::BitNot),974 _ => None,975 }976}977978fn binary_op(p: &Parser<'_>) -> Option<BinaryOpType> {979 match p.peek() {980 T![||] => Some(BinaryOpType::Or),981 T![&&] => Some(BinaryOpType::And),982 T![|] => Some(BinaryOpType::BitOr),983 T![^] => Some(BinaryOpType::BitXor),984 T![&] => Some(BinaryOpType::BitAnd),985 T![==] => Some(BinaryOpType::Eq),986 T![!=] => Some(BinaryOpType::Neq),987 T![<] => Some(BinaryOpType::Lt),988 T![>] => Some(BinaryOpType::Gt),989 T![<=] => Some(BinaryOpType::Lte),990 T![>=] => Some(BinaryOpType::Gte),991 T![<<] => Some(BinaryOpType::Lhs),992 T![>>] => Some(BinaryOpType::Rhs),993 T![+] => Some(BinaryOpType::Add),994 T![-] => Some(BinaryOpType::Sub),995 T![*] => Some(BinaryOpType::Mul),996 T![/] => Some(BinaryOpType::Div),997 T![%] => Some(BinaryOpType::Mod),998 T![in] => Some(BinaryOpType::In),999 #[cfg(feature = "exp-null-coaelse")]1000 T![??] => Some(BinaryOpType::NullCoaelse),1001 _ => None,1002 }1003}10041005fn expr_bp(p: &mut Parser<'_>, min_bp: u8) -> Result<Expr> {1006 let mut lhs = if let Some(op) = unary_op(p.peek()) {1007 p.eat_any();1008 let rbp = prefix_binding_power(op);1009 let rhs = expr_bp(p, rbp)?;1010 Expr::UnaryOp(op, Box::new(rhs))1011 } else {1012 expr_suffix(p)?1013 };10141015 loop {1016 if p.at_eof() {1017 break;1018 }10191020 let Some(op) = binary_op(p) else {1021 break;1022 };10231024 let (lbp, rbp) = infix_binding_power(op);1025 if lbp < min_bp {1026 break;1027 }10281029 p.eat_any();1030 let rhs = expr_bp(p, rbp)?;1031 lhs = Expr::BinaryOp(Box::new(BinaryOp { lhs, op, rhs }));1032 }10331034 Ok(lhs)1035}10361037fn expr(p: &mut Parser<'_>) -> Result<Expr> {1038 expr_bp(p, 0)1039}10401041pub fn parse(str: &str, settings: &ParserSettings) -> Result<Expr> {1042 let mut p = Parser::new(str, settings.source.clone());1043 for lexeme in &p.lexemes {1044 if let Some(desc) = lexeme.kind.error_description() {1045 return Err(ParseError {1046 message: desc.to_owned(),1047 location: Span(p.source.clone(), lexeme.range.0, lexeme.range.1),1048 });1049 }1050 }1051 let e = expr(&mut p)?;1052 if !p.at_eof() {1053 return Err(p.error(format!("expected end of file, got {}", p.current_desc())));1054 }1055 Ok(e)1056}10571058pub fn string_to_expr(s: IStr, settings: &ParserSettings) -> Spanned<Expr> {1059 let len = u32::try_from(s.len()).expect("code size is limited by 4gb");10601061 Spanned::new(Expr::Str(s), Span(settings.source.clone(), 0, len))1062}10631064#[cfg(test)]1065mod tests {1066 use insta::assert_snapshot;10671068 use super::*;10691070 fn parse_str(input: &str) -> Expr {1071 let source = Source::new_virtual("<test>".into(), input.into());1072 let settings = ParserSettings { source };1073 parse(input, &settings).unwrap()1074 }10751076 #[test]1077 #[cfg(not(feature = "exp-null-coaelse"))]1078 fn basic_test() {1079 let v = parse_str("assert true[false] : false ; true");1080 assert_snapshot!(format!("{v:#?}"));1081 }10821083 #[test]1084 fn literals() {1085 let v = parse_str("[null, true, false, self, super, $]");1086 assert_snapshot!(format!("{v:#?}"));1087 }10881089 #[test]1090 fn basic_math() {1091 let v = parse_str("2+2*2");1092 assert_snapshot!(format!("{v:#?}"));1093 }10941095 #[test]1096 fn underscore_numbers() {1097 let v = parse_str("[1_000, 1_000.000_1, 1_0e1_0]");1098 assert_snapshot!(format!("{v:#?}"));1099 }11001101 #[test]1102 fn strings() {1103 let v = parse_str(r#"["hello", 'world', @"raw""str", @'raw''str']"#);1104 assert_snapshot!(format!("{v:#?}"));1105 }11061107 #[test]1108 fn object() {1109 let v = parse_str("{a: 1, b:: 2, c::: 3}");1110 assert_snapshot!(format!("{v:#?}"));1111 }11121113 #[test]1114 fn function_and_call() {1115 let v = parse_str("local f(x, y=1) = x + y; f(2, y=3)");1116 assert_snapshot!(format!("{v:#?}"));1117 }11181119 #[test]1120 fn if_then_else() {1121 let v = parse_str("if true then 1 else 2");1122 assert_snapshot!(format!("{v:#?}"));1123 }11241125 #[test]1126 fn imports() {1127 let v = parse_str(r#"[import "a", importstr "b", importbin "c"]"#);1128 assert_snapshot!(format!("{v:#?}"));1129 }11301131 #[test]1132 fn array_comp() {1133 let v = parse_str("[x for x in arr]");1134 assert_snapshot!(format!("{v:#?}"));1135 }11361137 #[test]1138 #[cfg(not(feature = "exp-null-coaelse"))]1139 fn index_and_suffix() {1140 let v = parse_str("std.test(2).field[0]");1141 assert_snapshot!(format!("{v:#?}"));1142 }11431144 #[test]1145 fn obj_extend() {1146 let v = parse_str("{} { x: 1 }");1147 assert_snapshot!(format!("{v:#?}"));1148 }11491150 #[test]1151 fn unary_ops() {1152 let v = parse_str("!a && !b");1153 assert_snapshot!(format!("{v:#?}"));1154 }11551156 #[test]1157 fn error_expr() {1158 let v = parse_str("error \"bad\"");1159 assert_snapshot!(format!("{v:#?}"));1160 }11611162 #[test]1163 fn slice() {1164 let v = parse_str("[a[1:], a[1::], a[:1:], a[::1]]");1165 assert_snapshot!(format!("{v:#?}"));1166 }11671168 #[test]1169 #[cfg(not(feature = "exp-null-coaelse"))]1170 fn peg_snapshots() {1171 use std::fs;11721173 use insta::glob;1174 use jrsonnet_ir::{IStr, Source};11751176 glob!("../../jrsonnet-peg-parser/src", "tests/*.jsonnet", |path| {1177 let input = fs::read_to_string(path).expect("read test file");1178 let source = Source::new_virtual("<test>".into(), IStr::empty());1179 let settings = ParserSettings { source };1180 let v = parse(&input, &settings).unwrap();1181 let v = format!("{v:#?}");1182 assert_snapshot!(v);1183 });1184 }1185}crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__basic_math.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__basic_math.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__basic_math.snap
@@ -1,21 +1,28 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1094
expression: "format!(\"{v:#?}\")"
---
BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Add,
rhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Mul,
- rhs: Num(
- 2.0,
+ rhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
},
),
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__basic_test.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__basic_test.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__basic_test.snap
@@ -1,35 +1,40 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1082
expression: "format!(\"{v:#?}\")"
---
AssertExpr(
AssertExpr {
assert: AssertStmt {
assertion: Index {
- indexable: Literal(
- virtual:<test>:7-11,
- True,
+ indexable: Trivial(
+ Bool(
+ true,
+ ),
),
parts: [
IndexPart {
span: virtual:<test>:12-17,
- value: Literal(
- virtual:<test>:12-17,
- False,
+ value: Trivial(
+ Bool(
+ false,
+ ),
),
},
],
} from virtual:<test>:7-18,
message: Some(
- Literal(
- virtual:<test>:21-26,
- False,
+ Trivial(
+ Bool(
+ false,
+ ),
),
),
},
- rest: Literal(
- virtual:<test>:29-33,
- True,
+ rest: Trivial(
+ Bool(
+ true,
+ ),
),
},
)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__error_expr.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__error_expr.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__error_expr.snap
@@ -1,10 +1,13 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1161
expression: "format!(\"{v:#?}\")"
---
ErrorStmt(
virtual:<test>:0-5,
- Str(
- "bad",
+ Trivial(
+ Str(
+ "bad",
+ ),
),
)
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
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1118
expression: "format!(\"{v:#?}\")"
---
LocalExpr(
@@ -19,8 +20,10 @@
"y" from virtual:<test>:11-12,
),
default: Some(
- Num(
- 1.0,
+ Trivial(
+ Num(
+ 1.0,
+ ),
),
),
},
@@ -62,16 +65,20 @@
),
ArgsDesc {
unnamed: [
- Num(
- 2.0,
+ Trivial(
+ Num(
+ 2.0,
+ ),
),
],
names: [
"y",
],
values: [
- Num(
- 3.0,
+ Trivial(
+ Num(
+ 3.0,
+ ),
),
],
} from virtual:<test>:26-34,
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__if_then_else.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__if_then_else.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__if_then_else.snap
@@ -1,22 +1,28 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1124
expression: "format!(\"{v:#?}\")"
---
IfElse(
IfElse {
cond: IfSpecData {
span: virtual:<test>:0-2,
- cond: Literal(
- virtual:<test>:3-7,
- True,
+ cond: Trivial(
+ Bool(
+ true,
+ ),
),
},
- cond_then: Num(
- 1.0,
+ cond_then: Trivial(
+ Num(
+ 1.0,
+ ),
),
cond_else: Some(
- Num(
- 2.0,
+ Trivial(
+ Num(
+ 2.0,
+ ),
),
),
},
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__imports.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__imports.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__imports.snap
@@ -1,25 +1,32 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1130
expression: "format!(\"{v:#?}\")"
---
Arr(
[
Import(
Normal from virtual:<test>:1-7,
- Str(
- "a",
+ Trivial(
+ Str(
+ "a",
+ ),
),
),
Import(
Str from virtual:<test>:13-22,
- Str(
- "b",
+ Trivial(
+ Str(
+ "b",
+ ),
),
),
Import(
Bin from virtual:<test>:28-37,
- Str(
- "c",
+ Trivial(
+ Str(
+ "c",
+ ),
),
),
],
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__index_and_suffix.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__index_and_suffix.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__index_and_suffix.snap
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1143
expression: "format!(\"{v:#?}\")"
---
Index {
@@ -11,16 +12,20 @@
parts: [
IndexPart {
span: virtual:<test>:4-8,
- value: Str(
- "test",
+ value: Trivial(
+ Str(
+ "test",
+ ),
),
},
],
},
ArgsDesc {
unnamed: [
- Num(
- 2.0,
+ Trivial(
+ Num(
+ 2.0,
+ ),
),
],
names: [],
@@ -31,14 +36,18 @@
parts: [
IndexPart {
span: virtual:<test>:12-17,
- value: Str(
- "field",
+ value: Trivial(
+ Str(
+ "field",
+ ),
),
},
IndexPart {
span: virtual:<test>:18-19,
- value: Num(
- 0.0,
+ value: Trivial(
+ Num(
+ 0.0,
+ ),
),
},
],
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__literals.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__literals.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__literals.snap
@@ -1,30 +1,32 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1088
expression: "format!(\"{v:#?}\")"
---
Arr(
[
- Literal(
- virtual:<test>:1-5,
+ Trivial(
Null,
),
- Literal(
- virtual:<test>:7-11,
- True,
+ Trivial(
+ Bool(
+ true,
+ ),
),
- Literal(
- virtual:<test>:13-18,
- False,
+ Trivial(
+ Bool(
+ false,
+ ),
),
- Literal(
+ Identity(
virtual:<test>:20-24,
This,
),
- Literal(
+ Identity(
virtual:<test>:26-31,
Super,
),
- Literal(
+ Identity(
virtual:<test>:33-34,
Dollar,
),
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__obj_extend.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__obj_extend.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__obj_extend.snap
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1149
expression: "format!(\"{v:#?}\")"
---
ObjExtend(
@@ -24,8 +25,10 @@
plus: false,
params: None,
visibility: Normal,
- value: Num(
- 1.0,
+ value: Trivial(
+ Num(
+ 1.0,
+ ),
),
},
],
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__object.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__object.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__object.snap
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1112
expression: "format!(\"{v:#?}\")"
---
Obj(
@@ -15,8 +16,10 @@
plus: false,
params: None,
visibility: Normal,
- value: Num(
- 1.0,
+ value: Trivial(
+ Num(
+ 1.0,
+ ),
),
},
FieldMember {
@@ -26,8 +29,10 @@
plus: false,
params: None,
visibility: Hidden,
- value: Num(
- 2.0,
+ value: Trivial(
+ Num(
+ 2.0,
+ ),
),
},
FieldMember {
@@ -37,8 +42,10 @@
plus: false,
params: None,
visibility: Unhide,
- value: Num(
- 3.0,
+ value: Trivial(
+ Num(
+ 3.0,
+ ),
),
},
],
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
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1184
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/array_comp.jsonnet
---
@@ -14,8 +15,10 @@
parts: [
IndexPart {
span: virtual:<test>:7-15,
- value: Str(
- "deepJoin",
+ value: Trivial(
+ Str(
+ "deepJoin",
+ ),
),
},
],
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@basic_math.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@basic_math.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@basic_math.jsonnet.snap
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1184
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/basic_math.jsonnet
---
@@ -7,18 +8,24 @@
[
BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Add,
rhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Mul,
- rhs: Num(
- 2.0,
+ rhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
},
),
@@ -26,18 +33,24 @@
),
BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Add,
rhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Mul,
- rhs: Num(
- 2.0,
+ rhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
},
),
@@ -47,24 +60,32 @@
BinaryOp {
lhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Add,
- rhs: Num(
- 2.0,
+ rhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
},
),
op: Add,
rhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Mul,
- rhs: Num(
- 2.0,
+ rhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
},
),
@@ -72,24 +93,32 @@
),
BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Add,
rhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Add,
rhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Mul,
- rhs: Num(
- 2.0,
+ rhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
},
),
@@ -99,18 +128,24 @@
),
BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Add,
rhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 3.0,
+ lhs: Trivial(
+ Num(
+ 3.0,
+ ),
),
op: Mul,
- rhs: Num(
- 4.0,
+ rhs: Trivial(
+ Num(
+ 4.0,
+ ),
),
},
),
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@comment_eof.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@comment_eof.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@comment_eof.jsonnet.snap
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1184
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/comment_eof.jsonnet
---
@@ -16,8 +17,10 @@
plus: false,
params: None,
visibility: Normal,
- value: Num(
- 1.0,
+ value: Trivial(
+ Num(
+ 1.0,
+ ),
),
},
],
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
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1184
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/default_nondefault.jsonnet
---
@@ -14,8 +15,10 @@
"foo" from virtual:<test>:8-11,
),
default: Some(
- Str(
- "foo",
+ Trivial(
+ Str(
+ "foo",
+ ),
),
),
},
@@ -44,14 +47,12 @@
),
binds_len: 2,
},
- value: Literal(
- virtual:<test>:28-32,
+ value: Trivial(
Null,
),
},
],
- Literal(
- virtual:<test>:34-38,
+ Trivial(
Null,
),
)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@imports.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@imports.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@imports.jsonnet.snap
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1184
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/imports.jsonnet
---
@@ -7,20 +8,26 @@
[
Import(
Normal from virtual:<test>:2-8,
- Str(
- "hello",
+ Trivial(
+ Str(
+ "hello",
+ ),
),
),
Import(
Str from virtual:<test>:18-27,
- Str(
- "garnish.txt",
+ Trivial(
+ Str(
+ "garnish.txt",
+ ),
),
),
Import(
Bin from virtual:<test>:43-52,
- Str(
- "garnish.bin",
+ Trivial(
+ Str(
+ "garnish.bin",
+ ),
),
),
],
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@multiline.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@multiline.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@multiline.jsonnet.snap
@@ -1,21 +1,30 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1184
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/multiline.jsonnet
---
Arr(
[
- Str(
- "Hello world!\na\n",
+ Trivial(
+ Str(
+ "Hello world!\na\n",
+ ),
),
- Str(
- "Hello world!\na\n",
+ Trivial(
+ Str(
+ "Hello world!\na\n",
+ ),
),
- Str(
- "Hello world!\n\ta\n",
+ Trivial(
+ Str(
+ "Hello world!\n\ta\n",
+ ),
),
- Str(
- "Hello world!\n a\n",
+ Trivial(
+ Str(
+ "Hello world!\n a\n",
+ ),
),
],
)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@reserved.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@reserved.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@reserved.jsonnet.snap
@@ -1,12 +1,12 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1184
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/reserved.jsonnet
---
Arr(
[
- Literal(
- virtual:<test>:2-6,
+ Trivial(
Null,
),
Var(
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@slice.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@slice.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@slice.jsonnet.snap
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1184
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/slice.jsonnet
---
@@ -12,8 +13,10 @@
),
slice: SliceDesc {
start: Some(
- Num(
- 1.0,
+ Trivial(
+ Num(
+ 1.0,
+ ),
) from virtual:<test>:4-5,
),
end: None,
@@ -28,8 +31,10 @@
),
slice: SliceDesc {
start: Some(
- Num(
- 1.0,
+ Trivial(
+ Num(
+ 1.0,
+ ),
) from virtual:<test>:11-12,
),
end: None,
@@ -45,8 +50,10 @@
slice: SliceDesc {
start: None,
end: Some(
- Num(
- 1.0,
+ Trivial(
+ Num(
+ 1.0,
+ ),
) from virtual:<test>:20-21,
),
step: None,
@@ -62,8 +69,10 @@
start: None,
end: None,
step: Some(
- Num(
- 1.0,
+ Trivial(
+ Num(
+ 1.0,
+ ),
) from virtual:<test>:29-30,
),
},
@@ -83,8 +92,10 @@
"len" from virtual:<test>:38-41,
),
op: Sub,
- rhs: Num(
- 1.0,
+ rhs: Trivial(
+ Num(
+ 1.0,
+ ),
),
},
) from virtual:<test>:38-45,
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@string_escaping.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@string_escaping.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@string_escaping.jsonnet.snap
@@ -1,24 +1,35 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1184
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/string_escaping.jsonnet
---
Arr(
[
- Str(
- "Hello, \"world\"!",
+ Trivial(
+ Str(
+ "Hello, \"world\"!",
+ ),
),
- Str(
- "Hello 'world'!",
+ Trivial(
+ Str(
+ "Hello 'world'!",
+ ),
),
- Str(
- "\\\\",
+ Trivial(
+ Str(
+ "\\\\",
+ ),
),
- Str(
- "Hello\nWorld",
+ Trivial(
+ Str(
+ "Hello\nWorld",
+ ),
),
- Str(
- "Hello\\n\"World\"",
+ Trivial(
+ Str(
+ "Hello\\n\"World\"",
+ ),
),
],
)
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
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1184
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/subexp.jsonnet
---
@@ -22,8 +23,10 @@
into: Full(
"x" from virtual:<test>:11-12,
),
- value: Num(
- 1.0,
+ value: Trivial(
+ Num(
+ 1.0,
+ ),
),
},
],
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@suffix.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@suffix.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@suffix.jsonnet.snap
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1184
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/suffix.jsonnet
---
@@ -12,8 +13,10 @@
parts: [
IndexPart {
span: virtual:<test>:6-10,
- value: Str(
- "test",
+ value: Trivial(
+ Str(
+ "test",
+ ),
),
},
],
@@ -24,8 +27,10 @@
),
ArgsDesc {
unnamed: [
- Num(
- 2.0,
+ Trivial(
+ Num(
+ 2.0,
+ ),
),
],
names: [],
@@ -41,16 +46,20 @@
parts: [
IndexPart {
span: virtual:<test>:24-28,
- value: Str(
- "test",
+ value: Trivial(
+ Str(
+ "test",
+ ),
),
},
],
},
ArgsDesc {
unnamed: [
- Num(
- 2.0,
+ Trivial(
+ Num(
+ 2.0,
+ ),
),
],
names: [],
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__slice.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__slice.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__slice.snap
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1167
expression: "format!(\"{v:#?}\")"
---
Arr(
@@ -11,8 +12,10 @@
),
slice: SliceDesc {
start: Some(
- Num(
- 1.0,
+ Trivial(
+ Num(
+ 1.0,
+ ),
) from virtual:<test>:3-4,
),
end: None,
@@ -27,8 +30,10 @@
),
slice: SliceDesc {
start: Some(
- Num(
- 1.0,
+ Trivial(
+ Num(
+ 1.0,
+ ),
) from virtual:<test>:10-11,
),
end: None,
@@ -44,8 +49,10 @@
slice: SliceDesc {
start: None,
end: Some(
- Num(
- 1.0,
+ Trivial(
+ Num(
+ 1.0,
+ ),
) from virtual:<test>:19-20,
),
step: None,
@@ -61,8 +68,10 @@
start: None,
end: None,
step: Some(
- Num(
- 1.0,
+ Trivial(
+ Num(
+ 1.0,
+ ),
) from virtual:<test>:28-29,
),
},
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__strings.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__strings.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__strings.snap
@@ -1,20 +1,29 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1106
expression: "format!(\"{v:#?}\")"
---
Arr(
[
- Str(
- "hello",
+ Trivial(
+ Str(
+ "hello",
+ ),
),
- Str(
- "world",
+ Trivial(
+ Str(
+ "world",
+ ),
),
- Str(
- "raw\"str",
+ Trivial(
+ Str(
+ "raw\"str",
+ ),
),
- Str(
- "raw'str",
+ Trivial(
+ Str(
+ "raw'str",
+ ),
),
],
)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__underscore_numbers.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__underscore_numbers.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__underscore_numbers.snap
@@ -1,17 +1,24 @@
---
source: crates/jrsonnet-ir-parser/src/lib.rs
+assertion_line: 1100
expression: "format!(\"{v:#?}\")"
---
Arr(
[
- Num(
- 1000.0,
+ Trivial(
+ Num(
+ 1000.0,
+ ),
),
- Num(
- 1000.0001,
+ Trivial(
+ Num(
+ 1000.0001,
+ ),
),
- Num(
- 100000000000.0,
+ Trivial(
+ Num(
+ 100000000000.0,
+ ),
),
],
)
crates/jrsonnet-ir/src/expr.rsdiffbeforeafterboth--- a/crates/jrsonnet-ir/src/expr.rs
+++ b/crates/jrsonnet-ir/src/expr.rs
@@ -31,6 +31,14 @@
Unhide,
}
+#[derive(Debug, Clone, PartialEq, Acyclic)]
+pub enum TrivialVal {
+ Null,
+ Bool(bool),
+ Num(NumValue),
+ Str(IStr),
+}
+
impl Visibility {
pub fn is_visible(&self) -> bool {
matches!(self, Self::Normal | Self::Unhide)
@@ -351,14 +359,12 @@
ObjComp(ObjComp),
}
-#[derive(Debug, PartialEq, Eq, Clone, Copy, Acyclic)]
-pub enum LiteralType {
+/// Object identity reference: `self`, `super`, or `$`.#[derive(Debug, PartialEq, Eq, Clone, Copy, Acyclic)]
+#[derive(Debug, PartialEq, Acyclic)]
+pub enum IdentityKind {
This,
Super,
Dollar,
- Null,
- True,
- False,
}
#[derive(Debug, PartialEq, Acyclic)]
@@ -404,12 +410,12 @@
/// Syntax base
#[derive(Debug, PartialEq, Acyclic)]
pub enum Expr {
- Literal(Span, LiteralType),
+ /// Object-identity reference: `self`, `super`, `$`.
+ Identity(Span, IdentityKind),
+
+ /// Trivial value literal
+ Trivial(TrivialVal),
- /// String value: "hello"
- Str(IStr),
- /// Number: 1, 2.0, 2e+20
- Num(NumValue),
/// Variable name: test
Var(Spanned<IStr>),
crates/jrsonnet-ir/src/visit.rsdiffbeforeafterboth--- a/crates/jrsonnet-ir/src/visit.rs
+++ b/crates/jrsonnet-ir/src/visit.rs
@@ -5,7 +5,7 @@
use crate::{
ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BindSpec, CompSpec, Destruct, Expr, ExprParam,
ExprParams, FieldMember, FieldName, ForSpecData, IfElse, IfSpecData, ImportKind, IndexPart,
- ObjBody, ObjComp, ObjMembers, Slice, SliceDesc,
+ ObjBody, ObjComp, ObjMembers, Slice, SliceDesc, TrivialVal,
};
pub trait Visitor: Sized {
@@ -178,9 +178,8 @@
}
pub fn visit_expr<V: Visitor>(v: &mut V, e: &Expr) {
match e {
- Expr::Literal(_span, _literal_type) => {}
- Expr::Str(_istr) => {}
- Expr::Num(_num) => {}
+ Expr::Identity(_span, _identity_kind) => {}
+ Expr::Trivial(_) => {}
Expr::Var(_spanned) => {}
Expr::Arr(exprs) => {
for e in &**exprs {
@@ -220,7 +219,7 @@
Expr::Import(kind, expr) => {
v.visit_expr(expr);
- if let Expr::Str(expr) = &**expr {
+ if let Expr::Trivial(TrivialVal::Str(expr)) = &**expr {
v.visit_import(matches!(**kind, ImportKind::Normal), expr.clone());
}
}
crates/jrsonnet-peg-parser/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/lib.rs
+++ b/crates/jrsonnet-peg-parser/src/lib.rs
@@ -1,9 +1,9 @@
use jrsonnet_gcmodule::Acyclic;
use jrsonnet_ir::{
ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BindSpec, CompSpec, Destruct, DestructRest, Expr,
- ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IfElse, IfSpecData,
- ImportKind, IndexPart, LiteralType, Member, NumValue, ObjBody, ObjComp, ObjMembers, Slice,
- SliceDesc, Source, Span, Spanned, Visibility, unescape,
+ ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IdentityKind, IfElse,
+ IfSpecData, ImportKind, IndexPart, Member, NumValue, ObjBody, ObjComp, ObjMembers, Slice,
+ SliceDesc, Source, Span, Spanned, TrivialVal, Visibility, unescape,
};
use peg::parser;
@@ -263,7 +263,7 @@
pub rule local_expr(s: &ParserSettings) -> Expr
= keyword("local") _ binds:bind(s) ** comma() (_ ",")? _ ";" _ expr:expr(s) { Expr::LocalExpr(binds, Box::new(expr)) }
pub rule string_expr(s: &ParserSettings) -> Expr
- = s:string() {Expr::Str(s.into())}
+ = s:string() {Expr::Trivial(TrivialVal::Str(s.into()))}
pub rule obj_expr(s: &ParserSettings) -> Expr
= "{" _ body:objinside(s) _ "}" {Expr::Obj(body)}
pub rule array_expr(s: &ParserSettings) -> Expr
@@ -273,7 +273,7 @@
Expr::ArrComp(Box::new(expr), specs)
}
pub rule number_expr(s: &ParserSettings) -> Expr
- = n:number() {? NumValue::new(n).map_or_else(|| Err("!!!numbers are finite"), |n| Ok(Expr::Num(n)))}
+ = n:number() {? NumValue::new(n).map_or_else(|| Err("!!!numbers are finite"), |n| Ok(Expr::Trivial(TrivialVal::Num(n))))}
rule spanned<T: Acyclic>(x: rule<T>, s: &ParserSettings) -> Spanned<T>
= a:position!() n:x() b:position!() { Spanned::new(n, Span(s.source.clone(), codeidx(a), codeidx(b))) }
@@ -281,7 +281,7 @@
pub rule var_expr(s: &ParserSettings) -> Expr
= n:spanned(<id()>, s) { Expr::Var(n) }
pub rule id_loc(s: &ParserSettings) -> Spanned<Expr>
- = a:position!() n:id() b:position!() { Spanned::new(Expr::Str(n), Span(s.source.clone(), codeidx(a), codeidx(b))) }
+ = a:position!() n:id() b:position!() { Spanned::new(Expr::Trivial(TrivialVal::Str(n)), Span(s.source.clone(), codeidx(a), codeidx(b))) }
pub rule if_then_else_expr(s: &ParserSettings) -> Expr
= cond:ifspec(s) _ keyword("then") _ cond_then:expr(s) cond_else:(_ keyword("else") _ e:expr(s) {e})? {Expr::IfElse(Box::new(IfElse{
cond,
@@ -290,14 +290,14 @@
}))}
pub rule literal(s: &ParserSettings) -> Expr
- = a:position!() v:(
- keyword("null") {LiteralType::Null}
- / keyword("true") {LiteralType::True}
- / keyword("false") {LiteralType::False}
- / keyword("self") {LiteralType::This}
- / keyword("$") {LiteralType::Dollar}
- / keyword("super") {LiteralType::Super}
- ) b:position!() {Expr::Literal(Span(s.source.clone(), codeidx(a), codeidx(b)), v)}
+ = keyword("null") { Expr::Trivial(TrivialVal::Null) }
+ / keyword("true") { Expr::Trivial(TrivialVal::Bool(true)) }
+ / keyword("false") { Expr::Trivial(TrivialVal::Bool(false)) }
+ / a:position!() v:(
+ keyword("self") {IdentityKind::This}
+ / keyword("$") {IdentityKind::Dollar}
+ / keyword("super") {IdentityKind::Super}
+ ) b:position!() { Expr::Identity(Span(s.source.clone(), codeidx(a), codeidx(b)), v) }
rule import_kind() -> ImportKind
= keyword("importstr") { ImportKind::Str }
@@ -429,7 +429,7 @@
pub fn string_to_expr(str: IStr, settings: &ParserSettings) -> Spanned<Expr> {
let len = str.len();
Spanned::new(
- Expr::Str(str),
+ Expr::Trivial(TrivialVal::Str(str)),
Span(settings.source.clone(), 0, codeidx(len)),
)
}
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
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-peg-parser/src/lib.rs
+assertion_line: 459
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/array_comp.jsonnet
---
@@ -14,8 +15,10 @@
parts: [
IndexPart {
span: virtual:<test>:7-15,
- value: Str(
- "deepJoin",
+ value: Trivial(
+ Str(
+ "deepJoin",
+ ),
),
},
],
crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@basic_math.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@basic_math.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@basic_math.jsonnet.snap
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-peg-parser/src/lib.rs
+assertion_line: 459
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/basic_math.jsonnet
---
@@ -7,18 +8,24 @@
[
BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Add,
rhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Mul,
- rhs: Num(
- 2.0,
+ rhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
},
),
@@ -26,18 +33,24 @@
),
BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Add,
rhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Mul,
- rhs: Num(
- 2.0,
+ rhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
},
),
@@ -47,24 +60,32 @@
BinaryOp {
lhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Add,
- rhs: Num(
- 2.0,
+ rhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
},
),
op: Add,
rhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Mul,
- rhs: Num(
- 2.0,
+ rhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
},
),
@@ -72,24 +93,32 @@
),
BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Add,
rhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Add,
rhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Mul,
- rhs: Num(
- 2.0,
+ rhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
},
),
@@ -99,18 +128,24 @@
),
BinaryOp(
BinaryOp {
- lhs: Num(
- 2.0,
+ lhs: Trivial(
+ Num(
+ 2.0,
+ ),
),
op: Add,
rhs: BinaryOp(
BinaryOp {
- lhs: Num(
- 3.0,
+ lhs: Trivial(
+ Num(
+ 3.0,
+ ),
),
op: Mul,
- rhs: Num(
- 4.0,
+ rhs: Trivial(
+ Num(
+ 4.0,
+ ),
),
},
),
crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@comment_eof.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@comment_eof.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@comment_eof.jsonnet.snap
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-peg-parser/src/lib.rs
+assertion_line: 459
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/comment_eof.jsonnet
---
@@ -16,8 +17,10 @@
plus: false,
params: None,
visibility: Normal,
- value: Num(
- 1.0,
+ value: Trivial(
+ Num(
+ 1.0,
+ ),
),
},
],
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
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-peg-parser/src/lib.rs
+assertion_line: 459
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/default_nondefault.jsonnet
---
@@ -14,8 +15,10 @@
"foo" from virtual:<test>:8-11,
),
default: Some(
- Str(
- "foo",
+ Trivial(
+ Str(
+ "foo",
+ ),
),
),
},
@@ -44,14 +47,12 @@
),
binds_len: 2,
},
- value: Literal(
- virtual:<test>:28-32,
+ value: Trivial(
Null,
),
},
],
- Literal(
- virtual:<test>:34-38,
+ Trivial(
Null,
),
)
crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@imports.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@imports.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@imports.jsonnet.snap
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-peg-parser/src/lib.rs
+assertion_line: 459
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/imports.jsonnet
---
@@ -7,20 +8,26 @@
[
Import(
Normal from virtual:<test>:2-8,
- Str(
- "hello",
+ Trivial(
+ Str(
+ "hello",
+ ),
),
),
Import(
Str from virtual:<test>:18-27,
- Str(
- "garnish.txt",
+ Trivial(
+ Str(
+ "garnish.txt",
+ ),
),
),
Import(
Bin from virtual:<test>:43-52,
- Str(
- "garnish.bin",
+ Trivial(
+ Str(
+ "garnish.bin",
+ ),
),
),
],
crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@multiline.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@multiline.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@multiline.jsonnet.snap
@@ -1,21 +1,30 @@
---
source: crates/jrsonnet-peg-parser/src/lib.rs
+assertion_line: 459
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/multiline.jsonnet
---
Arr(
[
- Str(
- "Hello world!\na\n",
+ Trivial(
+ Str(
+ "Hello world!\na\n",
+ ),
),
- Str(
- "Hello world!\na\n",
+ Trivial(
+ Str(
+ "Hello world!\na\n",
+ ),
),
- Str(
- "Hello world!\n\ta\n",
+ Trivial(
+ Str(
+ "Hello world!\n\ta\n",
+ ),
),
- Str(
- "Hello world!\n a\n",
+ Trivial(
+ Str(
+ "Hello world!\n a\n",
+ ),
),
],
)
crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@reserved.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@reserved.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@reserved.jsonnet.snap
@@ -1,12 +1,12 @@
---
source: crates/jrsonnet-peg-parser/src/lib.rs
+assertion_line: 459
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/reserved.jsonnet
---
Arr(
[
- Literal(
- virtual:<test>:2-6,
+ Trivial(
Null,
),
Var(
crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@slice.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@slice.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@slice.jsonnet.snap
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-peg-parser/src/lib.rs
+assertion_line: 459
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/slice.jsonnet
---
@@ -12,8 +13,10 @@
),
slice: SliceDesc {
start: Some(
- Num(
- 1.0,
+ Trivial(
+ Num(
+ 1.0,
+ ),
) from virtual:<test>:4-5,
),
end: None,
@@ -28,8 +31,10 @@
),
slice: SliceDesc {
start: Some(
- Num(
- 1.0,
+ Trivial(
+ Num(
+ 1.0,
+ ),
) from virtual:<test>:11-12,
),
end: None,
@@ -45,8 +50,10 @@
slice: SliceDesc {
start: None,
end: Some(
- Num(
- 1.0,
+ Trivial(
+ Num(
+ 1.0,
+ ),
) from virtual:<test>:20-21,
),
step: None,
@@ -62,8 +69,10 @@
start: None,
end: None,
step: Some(
- Num(
- 1.0,
+ Trivial(
+ Num(
+ 1.0,
+ ),
) from virtual:<test>:29-30,
),
},
@@ -83,8 +92,10 @@
"len" from virtual:<test>:38-41,
),
op: Sub,
- rhs: Num(
- 1.0,
+ rhs: Trivial(
+ Num(
+ 1.0,
+ ),
),
},
) from virtual:<test>:38-45,
crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@string_escaping.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@string_escaping.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@string_escaping.jsonnet.snap
@@ -1,24 +1,35 @@
---
source: crates/jrsonnet-peg-parser/src/lib.rs
+assertion_line: 459
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/string_escaping.jsonnet
---
Arr(
[
- Str(
- "Hello, \"world\"!",
+ Trivial(
+ Str(
+ "Hello, \"world\"!",
+ ),
),
- Str(
- "Hello 'world'!",
+ Trivial(
+ Str(
+ "Hello 'world'!",
+ ),
),
- Str(
- "\\\\",
+ Trivial(
+ Str(
+ "\\\\",
+ ),
),
- Str(
- "Hello\nWorld",
+ Trivial(
+ Str(
+ "Hello\nWorld",
+ ),
),
- Str(
- "Hello\\n\"World\"",
+ Trivial(
+ Str(
+ "Hello\\n\"World\"",
+ ),
),
],
)
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
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-peg-parser/src/lib.rs
+assertion_line: 459
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/subexp.jsonnet
---
@@ -22,8 +23,10 @@
into: Full(
"x" from virtual:<test>:11-12,
),
- value: Num(
- 1.0,
+ value: Trivial(
+ Num(
+ 1.0,
+ ),
),
},
],
crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@suffix.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@suffix.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@suffix.jsonnet.snap
@@ -1,5 +1,6 @@
---
source: crates/jrsonnet-peg-parser/src/lib.rs
+assertion_line: 459
expression: v
input_file: crates/jrsonnet-peg-parser/src/tests/suffix.jsonnet
---
@@ -12,8 +13,10 @@
parts: [
IndexPart {
span: virtual:<test>:6-10,
- value: Str(
- "test",
+ value: Trivial(
+ Str(
+ "test",
+ ),
),
},
],
@@ -24,8 +27,10 @@
),
ArgsDesc {
unnamed: [
- Num(
- 2.0,
+ Trivial(
+ Num(
+ 2.0,
+ ),
),
],
names: [],
@@ -41,16 +46,20 @@
parts: [
IndexPart {
span: virtual:<test>:24-28,
- value: Str(
- "test",
+ value: Trivial(
+ Str(
+ "test",
+ ),
),
},
],
},
ArgsDesc {
unnamed: [
- Num(
- 2.0,
+ Trivial(
+ Num(
+ 2.0,
+ ),
),
],
names: [],