difftreelog
feat show full error range instead of just start
in: master
4 files changed
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -15,14 +15,9 @@
};
#[derive(Debug, Clone)]
-pub struct SyntaxErrorLocation {
- pub offset: usize,
-}
-
-#[derive(Debug, Clone)]
pub struct SyntaxError {
pub message: String,
- pub location: SyntaxErrorLocation,
+ pub location: (u32, u32),
}
impl fmt::Display for SyntaxError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -50,7 +50,7 @@
#[cfg(not(any(feature = "ir-parser", feature = "peg-parser")))]
compile_error!("at least one of `ir-parser` or `peg-parser` features must be enabled");
-pub use error::{SyntaxError, SyntaxErrorLocation};
+pub use error::SyntaxError;
pub use obj::*;
pub use rustc_hash;
use rustc_hash::FxHashMap;
@@ -87,9 +87,7 @@
jrsonnet_ir_parser::parse(code, &jrsonnet_ir_parser::ParserSettings { source }).map_err(|e| {
SyntaxError {
message: e.message,
- location: SyntaxErrorLocation {
- offset: e.location.offset,
- },
+ location: (e.location.0, e.location.1),
}
})
}
@@ -107,7 +105,7 @@
"expected {}, got {:?}",
e.expected,
code.chars()
- .nth(e.location.offset)
+ .nth(e.location.0)
.map_or_else(|| "EOF".into(), |c: char| c.to_string())
)
},
@@ -115,9 +113,7 @@
);
SyntaxError {
message,
- location: SyntaxErrorLocation {
- offset: e.location.offset,
- },
+ location: e.location,
}
})
}
crates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -122,7 +122,7 @@
|| path.source_path().to_string(),
|r| self.resolver.resolve(r),
);
- let mut offset = error.location.offset;
+ let mut offset = error.location.0 as usize;
let is_eof = if offset >= path.code().len() {
offset = path.code().len().saturating_sub(1);
true
@@ -263,11 +263,15 @@
write!(out, "{}", error.error())?;
if let ErrorKind::ImportSyntaxError { path, error } = error.error() {
writeln!(out)?;
- let offset = error.location.offset;
+ let mut offset = error.location;
+ // To inclusive range
+ if offset.1 > offset.0 {
+ offset.1 -= 1;
+ }
let mut builder = SnippetBuilder::new(path.code());
builder
.error(Text::fragment("syntax error", Formatting::default()))
- .range(offset..=offset)
+ .range(offset.0 as usize..=offset.1 as usize)
.build();
let source = builder.build();
let ansi = source_to_ansi(&source);
crates/jrsonnet-ir-parser/src/lib.rsdiffbeforeafterboth1use std::rc::Rc;23use jrsonnet_gcmodule::Acyclic;4use jrsonnet_ir::{5 ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BinaryOpType, BindSpec, CompSpec, Destruct, Expr,6 ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IfElse, IfSpecData,7 ImportKind, IndexPart, LiteralType, Member, ObjBody, ObjComp, ObjMembers, Slice, SliceDesc,8 Source, Span, Spanned, UnaryOpType, Visibility, unescape,9};10use jrsonnet_lexer::{Lexeme, Lexer, SyntaxKind, T, collect_lexed_str_block};1112pub struct ParserSettings {13 pub source: Source,14}1516#[derive(Debug, Clone)]17pub struct ParseErrorLocation {18 pub offset: usize,19}2021#[derive(Debug, Clone)]22pub struct ParseError {23 pub message: String,24 pub location: ParseErrorLocation,25}2627impl std::fmt::Display for ParseError {28 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {29 write!(f, "{}", self.message)30 }31}3233type Result<T> = std::result::Result<T, ParseError>;3435struct Parser<'a> {36 lexemes: Vec<Lexeme<'a>>,37 offset: usize,38 source: Source,39}4041impl<'a> Parser<'a> {42 fn new(code: &'a str, source: Source) -> Self {43 Self {44 lexemes: Lexer::new(code)45 .filter(|l| {46 !matches!(47 l.kind,48 SyntaxKind::WHITESPACE49 | SyntaxKind::SINGLE_LINE_SLASH_COMMENT50 | SyntaxKind::SINGLE_LINE_HASH_COMMENT51 | SyntaxKind::MULTI_LINE_COMMENT52 )53 })54 .collect(),55 offset: 0,56 source,57 }58 }5960 fn peek(&self) -> SyntaxKind {61 if self.at_eof() {62 SyntaxKind::EOF63 } else {64 self.lexemes[self.offset].kind65 }66 }6768 fn text(&self) -> &'a str {69 self.lexemes[self.offset].text70 }7172 fn at(&self, kind: SyntaxKind) -> bool {73 !self.at_eof() && self.peek() == kind74 }7576 fn eat_any(&mut self) {77 self.offset += 1;78 }7980 fn at_eof(&self) -> bool {81 self.offset >= self.lexemes.len()82 }8384 fn try_eat(&mut self, t: SyntaxKind) -> bool {85 if self.at(t) {86 self.eat_any();87 return true;88 }89 false90 }9192 fn current_desc(&self) -> String {93 if self.at_eof() {94 return "end of file".to_owned();95 }96 let kind = self.peek();97 let text = self.text();98 let name = kind.display_name();99 if matches!(kind, SyntaxKind::IDENT | SyntaxKind::FLOAT) {100 format!("{name} \"{text}\"")101 } else {102 name.to_owned()103 }104 }105106 fn eat(&mut self, t: SyntaxKind) -> Result<()> {107 if !self.at(t) {108 return Err(self.error(format!(109 "expected {}, got {}",110 t.display_name(),111 self.current_desc(),112 )));113 }114 self.eat_any();115 Ok(())116 }117118 fn span_start(&self) -> u32 {119 if self.at_eof() {120 if let Some(last) = self.lexemes.last() {121 return last.range.1;122 }123 return 0;124 }125 self.lexemes[self.offset].range.0126 }127128 fn span_end(&self) -> u32 {129 self.lexemes[self.offset - 1].range.1130 }131132 fn error(&self, message: String) -> ParseError {133 ParseError {134 location: ParseErrorLocation {135 offset: self.span_start() as usize,136 },137 message,138 }139 }140141 fn expect_ident(&mut self) -> Result<IStr> {142 if !self.at(SyntaxKind::IDENT) {143 return Err(self.error(format!("expected identifier, got {}", self.current_desc())));144 }145 let text = self.text();146 if is_reserved(text) {147 return Err(self.error(format!("expected identifier, got reserved word '{text}'")));148 }149 let s: IStr = text.into();150 self.eat_any();151 Ok(s)152 }153154 fn at_ident(&self) -> bool {155 self.at(SyntaxKind::IDENT) && !is_reserved(self.lexemes[self.offset].text)156 }157}158159fn is_reserved(s: &str) -> bool {160 matches!(161 s,162 "assert"163 | "else" | "error"164 | "false" | "for"165 | "function"166 | "if" | "import"167 | "importstr"168 | "importbin"169 | "in" | "local"170 | "null" | "tailstrict"171 | "then" | "self"172 | "super" | "true"173 )174}175176fn spanned<T: Acyclic>(177 p: &mut Parser<'_>,178 cb: impl FnOnce(&mut Parser<'_>) -> Result<T>,179) -> Result<Spanned<T>> {180 let start = p.span_start();181 let v = cb(p)?;182 let end = p.span_end();183 Ok(Spanned::new(v, Span(p.source.clone(), start, end)))184}185186fn parse_string_content(p: &mut Parser<'_>) -> Result<IStr> {187 let kind = p.peek();188 let text = p.text();189 let s = match kind {190 SyntaxKind::STRING_DOUBLE => {191 let inner = &text[1..text.len() - 1];192 unescape::unescape(inner).ok_or_else(|| p.error("invalid string escape".into()))?193 }194 SyntaxKind::STRING_SINGLE => {195 let inner = &text[1..text.len() - 1];196 unescape::unescape(inner).ok_or_else(|| p.error("invalid string escape".into()))?197 }198 SyntaxKind::STRING_DOUBLE_VERBATIM => {199 let inner = &text[2..text.len() - 1];200 inner.replace("\"\"", "\"")201 }202 SyntaxKind::STRING_SINGLE_VERBATIM => {203 let inner = &text[2..text.len() - 1];204 inner.replace("''", "'")205 }206 SyntaxKind::STRING_BLOCK => {207 let inner = &text[3..];208 let collected = collect_lexed_str_block(inner)209 .map_err(|_| p.error("invalid string block".into()))?;210 let mut result = String::new();211 for (i, line) in collected.lines.iter().enumerate() {212 if i > 0 {213 result.push('\n');214 }215 result.push_str(line);216 }217 if !collected.truncate {218 result.push('\n');219 }220 result221 }222 _ => return Err(p.error(format!("expected string, got {}", p.current_desc()))),223 };224 p.eat_any();225 Ok(s.into())226}227228fn is_string_token(kind: SyntaxKind) -> bool {229 matches!(230 kind,231 SyntaxKind::STRING_DOUBLE232 | SyntaxKind::STRING_SINGLE233 | SyntaxKind::STRING_DOUBLE_VERBATIM234 | SyntaxKind::STRING_SINGLE_VERBATIM235 | SyntaxKind::STRING_BLOCK236 )237}238239fn parse_number(p: &mut Parser<'_>) -> Result<f64> {240 let text = p.text();241 let n: f64 = text242 .replace('_', "")243 .parse()244 .map_err(|_| p.error(format!("invalid number literal: {text}")))?;245 if !n.is_finite() {246 return Err(p.error("numbers are finite".into()));247 }248 p.eat_any();249 Ok(n)250}251252fn literal(p: &mut Parser<'_>) -> Option<LiteralType> {253 let t = match p.peek() {254 T![self] => LiteralType::This,255 T![super] => LiteralType::Super,256 T!['$'] => LiteralType::Dollar,257 T![null] => LiteralType::Null,258 T![true] => LiteralType::True,259 T![false] => LiteralType::False,260 _ => return None,261 };262 p.eat_any();263 Some(t)264}265266fn assert_stmt(p: &mut Parser<'_>) -> Result<AssertStmt> {267 p.eat(T![assert])?;268 let cond = spanned(p, expr)?;269 let msg = if p.try_eat(T![:]) {270 Some(spanned(p, expr)?)271 } else {272 None273 };274 Ok(AssertStmt(cond, msg))275}276277fn if_spec_data(p: &mut Parser<'_>) -> Result<IfSpecData> {278 let v = spanned(p, |p| p.eat(T![if]))?;279 let cond = expr(p)?;280 Ok(IfSpecData { span: v.span, cond })281}282283fn if_else(p: &mut Parser<'_>) -> Result<IfElse> {284 let cond = if_spec_data(p)?;285 p.eat(T![then])?;286 let cond_then = expr(p)?;287 let cond_else = if p.try_eat(T![else]) {288 Some(expr(p)?)289 } else {290 None291 };292 Ok(IfElse {293 cond,294 cond_then,295 cond_else,296 })297}298299fn slice_desc(p: &mut Parser<'_>, start: Option<Spanned<Expr>>) -> Result<SliceDesc> {300 p.eat(T![:])?;301 let end = if !p.at(T![:]) && !p.at(T![']']) {302 Some(spanned(p, expr)?)303 } else {304 None305 };306 let step = if p.try_eat(T![:]) {307 if p.at(T![']']) {308 None309 } else {310 Some(spanned(p, expr)?)311 }312 } else {313 None314 };315 Ok(SliceDesc { start, end, step })316}317318fn destruct(p: &mut Parser<'_>) -> Result<Destruct> {319 if p.at_ident() {320 return Ok(Destruct::Full(p.expect_ident()?));321 }322 #[cfg(not(feature = "exp-destruct"))]323 return Err(p.error(format!("expected identifier, got {}", p.current_desc())));324 #[cfg(feature = "exp-destruct")]325 {326 if p.try_eat(T![?]) {327 return Ok(Destruct::Skip);328 }329 if p.at(T!['[']) {330 return destruct_array(p);331 }332 if p.at(T!['{']) {333 return destruct_object(p);334 }335 Err(p.error(format!(336 "expected destructure pattern, got {}",337 p.current_desc()338 )))339 }340}341342#[cfg(feature = "exp-destruct")]343fn destruct_rest(p: &mut Parser<'_>) -> Result<jrsonnet_ir::DestructRest> {344 p.eat(T![...])?;345 if p.at_ident() {346 Ok(jrsonnet_ir::DestructRest::Keep(p.expect_ident()?))347 } else {348 Ok(jrsonnet_ir::DestructRest::Drop)349 }350}351352#[cfg(feature = "exp-destruct")]353fn destruct_array(p: &mut Parser<'_>) -> Result<Destruct> {354 p.eat(T!['['])?;355 let mut start = Vec::new();356 let mut rest = None;357 let mut end = Vec::new();358 if !p.at(T![']']) {359 loop {360 if p.at(T![...]) {361 rest = Some(destruct_rest(p)?);362 if p.try_eat(T![,]) {363 if !p.at(T![']']) {364 loop {365 end.push(destruct(p)?);366 if !p.try_eat(T![,]) {367 break;368 }369 if p.at(T![']']) {370 break;371 }372 }373 }374 }375 break;376 }377 start.push(destruct(p)?);378 if !p.try_eat(T![,]) {379 break;380 }381 if p.at(T![']']) {382 break;383 }384 }385 }386 p.eat(T![']'])?;387 Ok(Destruct::Array { start, rest, end })388}389390#[cfg(feature = "exp-destruct")]391fn destruct_object(p: &mut Parser<'_>) -> Result<Destruct> {392 p.eat(T!['{'])?;393 let mut fields = Vec::new();394 let mut rest = None;395 if !p.at(T!['}']) {396 loop {397 if p.at(T![...]) {398 rest = Some(destruct_rest(p)?);399 p.try_eat(T![,]);400 break;401 }402 let name = p.expect_ident()?;403 let into = if p.try_eat(T![:]) {404 Some(destruct(p)?)405 } else {406 None407 };408 let default = if p.try_eat(T![=]) {409 Some(Rc::new(spanned(p, expr)?))410 } else {411 None412 };413 fields.push((name, into, default));414 if !p.try_eat(T![,]) {415 break;416 }417 if p.at(T!['}']) {418 break;419 }420 }421 }422 p.eat(T!['}'])?;423 Ok(Destruct::Object { fields, rest })424}425426fn params(p: &mut Parser<'_>) -> Result<ExprParams> {427 if p.at(T![')']) {428 return Ok(ExprParams::new(Vec::new()));429 }430 let mut result = Vec::new();431 loop {432 let d = destruct(p)?;433 let default = if p.try_eat(T![=]) {434 Some(Rc::new(expr(p)?))435 } else {436 None437 };438 result.push(ExprParam {439 destruct: d,440 default,441 });442 if !p.try_eat(T![,]) {443 break;444 }445 if p.at(T![')']) {446 break;447 }448 }449 Ok(ExprParams::new(result))450}451452fn args(p: &mut Parser<'_>) -> Result<ArgsDesc> {453 if p.at(T![')']) {454 return Ok(ArgsDesc::new(Vec::new(), Vec::new()));455 }456 let mut unnamed = Vec::new();457 let mut named = Vec::new();458 let mut named_started = false;459 loop {460 let is_named = p.at_ident() && {461 let next_offset = p.offset + 1;462 next_offset < p.lexemes.len() && p.lexemes[next_offset].kind == T![=] && {463 let after_eq = next_offset + 1;464 after_eq >= p.lexemes.len() || p.lexemes[after_eq].kind != T![=]465 }466 };467 if is_named {468 let name: IStr = p.expect_ident()?;469 p.eat(T![=])?;470 let value = Rc::new(expr(p)?);471 named.push((name, value));472 named_started = true;473 } else {474 if named_started {475 return Err(p.error("positional argument after named argument".into()));476 }477 unnamed.push(Rc::new(expr(p)?));478 }479 if !p.try_eat(T![,]) {480 break;481 }482 if p.at(T![')']) {483 break;484 }485 }486 Ok(ArgsDesc::new(unnamed, named))487}488489fn bind(p: &mut Parser<'_>) -> Result<BindSpec> {490 #[cfg(feature = "exp-destruct")]491 {492 if !p.at_ident() {493 let d = destruct(p)?;494 p.eat(T![=])?;495 let value = Rc::new(expr(p)?);496 return Ok(BindSpec::Field { into: d, value });497 }498 }499 let name = p.expect_ident()?;500 if p.try_eat(T!['(']) {501 let ps = params(p)?;502 p.eat(T![')'])?;503 p.eat(T![=])?;504 let value = Rc::new(expr(p)?);505 Ok(BindSpec::Function {506 name,507 params: ps,508 value,509 })510 } else {511 p.eat(T![=])?;512 let value = Rc::new(expr(p)?);513 Ok(BindSpec::Field {514 into: Destruct::Full(name),515 value,516 })517 }518}519520fn visibility(p: &mut Parser<'_>) -> Result<Visibility> {521 p.eat(T![:])?;522 if p.try_eat(T![:]) {523 if p.try_eat(T![:]) {524 Ok(Visibility::Unhide)525 } else {526 Ok(Visibility::Hidden)527 }528 } else {529 Ok(Visibility::Normal)530 }531}532533fn field_name(p: &mut Parser<'_>) -> Result<FieldName> {534 if p.at_ident() {535 Ok(FieldName::Fixed(p.expect_ident()?))536 } else if is_string_token(p.peek()) {537 Ok(FieldName::Fixed(parse_string_content(p)?))538 } else if p.at(T!['[']) {539 p.eat(T!['['])?;540 let e = expr(p)?;541 p.eat(T![']'])?;542 Ok(FieldName::Dyn(e))543 } else {544 Err(p.error(format!("expected field name, got {}", p.current_desc())))545 }546}547548fn field(p: &mut Parser<'_>) -> Result<FieldMember> {549 let name = spanned(p, field_name)?;550551 if p.at(T!['(']) {552 p.eat(T!['('])?;553 let ps = params(p)?;554 p.eat(T![')'])?;555 let vis = visibility(p)?;556 let value = Rc::new(expr(p)?);557 Ok(FieldMember {558 name,559 plus: false,560 params: Some(ps),561 visibility: vis,562 value,563 })564 } else {565 let plus = p.try_eat(T![+]);566 let vis = visibility(p)?;567 let value = Rc::new(expr(p)?);568 Ok(FieldMember {569 name,570 plus,571 params: None,572 visibility: vis,573 value,574 })575 }576}577578fn member(p: &mut Parser<'_>) -> Result<Member> {579 if p.at(T![local]) {580 p.eat(T![local])?;581 Ok(Member::BindStmt(bind(p)?))582 } else if p.at(T![assert]) {583 Ok(Member::AssertStmt(assert_stmt(p)?))584 } else {585 Ok(Member::Field(field(p)?))586 }587}588589fn for_spec(p: &mut Parser<'_>) -> Result<ForSpecData> {590 p.eat(T![for])?;591 let d = destruct(p)?;592 p.eat(T![in])?;593 let over = expr(p)?;594 Ok(ForSpecData { destruct: d, over })595}596597fn compspecs(p: &mut Parser<'_>) -> Result<Vec<CompSpec>> {598 let mut specs = Vec::new();599 specs.push(CompSpec::ForSpec(for_spec(p)?));600 loop {601 if p.at(T![for]) {602 specs.push(CompSpec::ForSpec(for_spec(p)?));603 } else if p.at(T![if]) {604 let isd = if_spec_data(p)?;605 specs.push(CompSpec::IfSpec(isd));606 } else {607 break;608 }609 }610 Ok(specs)611}612613fn objinside(p: &mut Parser<'_>) -> Result<ObjBody> {614 if p.at(T!['}']) {615 return Ok(ObjBody::MemberList(ObjMembers {616 locals: Rc::new(Vec::new()),617 asserts: Rc::new(Vec::new()),618 fields: Vec::new(),619 }));620 }621622 let mut members = Vec::new();623 loop {624 members.push(member(p)?);625 if !p.try_eat(T![,]) {626 break;627 }628 if p.at(T!['}']) || p.at(T![for]) {629 break;630 }631 }632633 if p.at(T![for]) {634 let specs = compspecs(p)?;635 let mut locals = Vec::new();636 let mut field_member = None;637 for m in members {638 match m {639 Member::Field(f) => {640 if field_member.is_some() {641 return Err(642 p.error("object comprehension can only contain one field".into())643 );644 }645 field_member = Some(f);646 }647 Member::BindStmt(b) => locals.push(b),648 Member::AssertStmt(_) => {649 return Err(p.error("asserts are unsupported in object comprehension".into()));650 }651 }652 }653 Ok(ObjBody::ObjComp(ObjComp {654 locals: Rc::new(locals),655 field: Rc::new(656 field_member.ok_or_else(|| p.error("missing object comprehension field".into()))?,657 ),658 compspecs: specs,659 }))660 } else {661 let mut locals = Vec::new();662 let mut asserts = Vec::new();663 let mut fields = Vec::new();664 for m in members {665 match m {666 Member::Field(f) => fields.push(f),667 Member::BindStmt(b) => locals.push(b),668 Member::AssertStmt(a) => asserts.push(a),669 }670 }671 Ok(ObjBody::MemberList(ObjMembers {672 locals: Rc::new(locals),673 asserts: Rc::new(asserts),674 fields,675 }))676 }677}678679fn expr_basic(p: &mut Parser<'_>) -> Result<Expr> {680 if let Some(lit) = literal(p) {681 return Ok(Expr::Literal(lit));682 }683684 match p.peek() {685 SyntaxKind::STRING_DOUBLE686 | SyntaxKind::STRING_SINGLE687 | SyntaxKind::STRING_DOUBLE_VERBATIM688 | SyntaxKind::STRING_SINGLE_VERBATIM689 | SyntaxKind::STRING_BLOCK => Ok(Expr::Str(parse_string_content(p)?)),690691 SyntaxKind::FLOAT => Ok(Expr::Num(parse_number(p)?)),692693 T!['('] => {694 p.eat(T!['('])?;695 let e = expr(p)?;696 p.eat(T![')'])?;697 Ok(e)698 }699700 T!['['] => {701 p.eat(T!['['])?;702 if p.at(T![']']) {703 p.eat(T![']'])?;704 return Ok(Expr::Arr(Rc::new(Vec::new())));705 }706 let first = expr(p)?;707 if p.at(T![for]) {708 let specs = compspecs(p)?;709 p.eat(T![']'])?;710 Ok(Expr::ArrComp(Rc::new(first), specs))711 } else if p.at(T![,]) && {712 let next = p.offset + 1;713 next < p.lexemes.len() && p.lexemes[next].kind == T![for]714 } {715 p.eat(T![,])?;716 let specs = compspecs(p)?;717 p.eat(T![']'])?;718 Ok(Expr::ArrComp(Rc::new(first), specs))719 } else {720 let mut elems = vec![first];721 while p.try_eat(T![,]) {722 if p.at(T![']']) {723 break;724 }725 elems.push(expr(p)?);726 }727 p.eat(T![']'])?;728 Ok(Expr::Arr(Rc::new(elems)))729 }730 }731732 T!['{'] => {733 p.eat(T!['{'])?;734 let body = objinside(p)?;735 p.eat(T!['}'])?;736 Ok(Expr::Obj(body))737 }738739 T![local] => {740 p.eat(T![local])?;741 let mut binds = Vec::new();742 loop {743 binds.push(bind(p)?);744 if !p.try_eat(T![,]) {745 break;746 }747 }748 p.eat(T![;])?;749 let body = expr(p)?;750 Ok(Expr::LocalExpr(binds, Box::new(body)))751 }752753 T![if] => Ok(Expr::IfElse(Box::new(if_else(p)?))),754755 T![function] => {756 p.eat(T![function])?;757 p.eat(T!['('])?;758 let ps = params(p)?;759 p.eat(T![')'])?;760 let body = expr(p)?;761 Ok(Expr::Function(ps, Rc::new(body)))762 }763764 T![assert] => {765 let a = assert_stmt(p)?;766 p.eat(T![;])?;767 let rest = expr(p)?;768 Ok(Expr::AssertExpr(Rc::new(AssertExpr { assert: a, rest })))769 }770771 T![error] => {772 let span = spanned(p, |p| p.eat(T![error]))?;773 let e = expr(p)?;774 Ok(Expr::ErrorStmt(span.span, Box::new(e)))775 }776777 T![importstr] => {778 let kind = spanned(p, |p| {779 p.eat(T![importstr])?;780 Ok(ImportKind::Str)781 })?;782 let path = expr(p)?;783 Ok(Expr::Import(kind, Box::new(path)))784 }785786 T![importbin] => {787 let kind = spanned(p, |p| {788 p.eat(T![importbin])?;789 Ok(ImportKind::Bin)790 })?;791 let path = expr(p)?;792 Ok(Expr::Import(kind, Box::new(path)))793 }794795 T![import] => {796 let kind = spanned(p, |p| {797 p.eat(T![import])?;798 Ok(ImportKind::Normal)799 })?;800 let path = expr(p)?;801 Ok(Expr::Import(kind, Box::new(path)))802 }803804 SyntaxKind::IDENT => {805 let text = p.text();806 if is_reserved(text) {807 return Err(p.error(format!("unexpected reserved word '{text}'")));808 }809 let n = spanned(p, |p| {810 let s: IStr = p.text().into();811 p.eat_any();812 Ok(s)813 })?;814 Ok(Expr::Var(n))815 }816817 _ => Err(p.error(format!("unexpected {}", p.current_desc()))),818 }819}820821fn flush_index_parts(e: &mut Expr, parts: &mut Vec<IndexPart>) {822 if parts.is_empty() {823 return;824 }825 let old = std::mem::replace(e, Expr::Literal(LiteralType::Null));826 *e = Expr::Index {827 indexable: Box::new(old),828 parts: std::mem::take(parts),829 };830}831832fn expr_suffix(p: &mut Parser<'_>) -> Result<Expr> {833 let mut e = expr_basic(p)?;834 // Accumulate consecutive index parts (.field, [expr], ?.field, ?.[expr])835 // into a single Expr::Index. This is critical for null-coalesce semantics:836 // a?.b.c needs all parts in one Index so the evaluator can skip .c when .b is null.837 let mut parts: Vec<IndexPart> = Vec::new();838839 loop {840 #[cfg(feature = "exp-null-coaelse")]841 if p.at(T![?]) {842 p.eat_any();843 if p.try_eat(T![.]) {844 if p.at(T!['[']) {845 // ?.[expr]846 p.eat(T!['['])?;847 let idx = spanned(p, expr)?;848 p.eat(T![']'])?;849 parts.push(IndexPart {850 span: idx.span,851 value: idx.value,852 null_coaelse: true,853 });854 } else {855 // ?.field856 let id_spanned = spanned(p, |p| {857 let name = p.expect_ident()?;858 Ok(Expr::Str(name))859 })?;860 parts.push(IndexPart {861 span: id_spanned.span,862 value: id_spanned.value,863 null_coaelse: true,864 });865 }866 } else {867 return Err(p.error("expected '.' after '?'".into()));868 }869 continue;870 }871872 if p.at(T![.]) {873 p.eat(T![.])?;874 let id_spanned = spanned(p, |p| {875 let name = p.expect_ident()?;876 Ok(Expr::Str(name))877 })?;878 parts.push(IndexPart {879 span: id_spanned.span,880 value: id_spanned.value,881 #[cfg(feature = "exp-null-coaelse")]882 null_coaelse: false,883 });884 } else if p.at(T!['[']) {885 p.eat(T!['['])?;886887 if p.at(T![:]) {888 // Slice: flush index parts first, then handle slice889 flush_index_parts(&mut e, &mut parts);890 let slice = slice_desc(p, None)?;891 p.eat(T![']'])?;892 e = Expr::Slice(Box::new(Slice { value: e, slice }));893 } else {894 let idx = spanned(p, expr)?;895 if p.at(T![:]) {896 // Slice with start: flush index parts first897 flush_index_parts(&mut e, &mut parts);898 let slice = slice_desc(p, Some(idx))?;899 p.eat(T![']'])?;900 e = Expr::Slice(Box::new(Slice { value: e, slice }));901 } else {902 // Bracket index: add to parts903 p.eat(T![']'])?;904 parts.push(IndexPart {905 span: idx.span,906 value: idx.value,907 #[cfg(feature = "exp-null-coaelse")]908 null_coaelse: false,909 });910 }911 }912 } else if p.at(T!['(']) {913 flush_index_parts(&mut e, &mut parts);914 let args_spanned = spanned(p, |p| {915 p.eat(T!['('])?;916 let a = args(p)?;917 p.eat(T![')'])?;918 Ok(a)919 })?;920 let tailstrict = p.try_eat(T![tailstrict]);921 e = Expr::Apply(Box::new(e), args_spanned, tailstrict);922 } else if p.at(T!['{']) {923 flush_index_parts(&mut e, &mut parts);924 p.eat(T!['{'])?;925 let body = objinside(p)?;926 p.eat(T!['}'])?;927 e = Expr::ObjExtend(Rc::new(e), body);928 } else {929 break;930 }931 }932933 flush_index_parts(&mut e, &mut parts);934 Ok(e)935}936937fn prefix_binding_power(op: UnaryOpType) -> u8 {938 match op {939 UnaryOpType::Plus | UnaryOpType::Minus | UnaryOpType::Not | UnaryOpType::BitNot => 20,940 }941}942943fn infix_binding_power(op: BinaryOpType) -> (u8, u8) {944 match op {945 BinaryOpType::Or => (2, 3),946 #[cfg(feature = "exp-null-coaelse")]947 BinaryOpType::NullCoaelse => (2, 3),948 BinaryOpType::And => (4, 5),949 BinaryOpType::BitOr => (6, 7),950 BinaryOpType::BitXor => (8, 9),951 BinaryOpType::BitAnd => (10, 11),952 BinaryOpType::Eq | BinaryOpType::Neq => (12, 13),953 BinaryOpType::Lt954 | BinaryOpType::Gt955 | BinaryOpType::Lte956 | BinaryOpType::Gte957 | BinaryOpType::In => (14, 15),958 BinaryOpType::Lhs | BinaryOpType::Rhs => (16, 17),959 BinaryOpType::Add | BinaryOpType::Sub => (18, 19),960 BinaryOpType::Mul | BinaryOpType::Div | BinaryOpType::Mod => (20, 21),961 }962}963964fn unary_op(kind: SyntaxKind) -> Option<UnaryOpType> {965 match kind {966 T![+] => Some(UnaryOpType::Plus),967 T![-] => Some(UnaryOpType::Minus),968 T![!] => Some(UnaryOpType::Not),969 T![~] => Some(UnaryOpType::BitNot),970 _ => None,971 }972}973974fn binary_op(p: &Parser<'_>) -> Option<BinaryOpType> {975 match p.peek() {976 T![||] => Some(BinaryOpType::Or),977 T![&&] => Some(BinaryOpType::And),978 T![|] => Some(BinaryOpType::BitOr),979 T![^] => Some(BinaryOpType::BitXor),980 T![&] => Some(BinaryOpType::BitAnd),981 T![==] => Some(BinaryOpType::Eq),982 T![!=] => Some(BinaryOpType::Neq),983 T![<] => Some(BinaryOpType::Lt),984 T![>] => Some(BinaryOpType::Gt),985 T![<=] => Some(BinaryOpType::Lte),986 T![>=] => Some(BinaryOpType::Gte),987 T![<<] => Some(BinaryOpType::Lhs),988 T![>>] => Some(BinaryOpType::Rhs),989 T![+] => Some(BinaryOpType::Add),990 T![-] => Some(BinaryOpType::Sub),991 T![*] => Some(BinaryOpType::Mul),992 T![/] => Some(BinaryOpType::Div),993 T![%] => Some(BinaryOpType::Mod),994 T![in] => Some(BinaryOpType::In),995 #[cfg(feature = "exp-null-coaelse")]996 T![??] => Some(BinaryOpType::NullCoaelse),997 _ => None,998 }999}10001001fn expr_bp(p: &mut Parser<'_>, min_bp: u8) -> Result<Expr> {1002 let mut lhs = if let Some(op) = unary_op(p.peek()) {1003 p.eat_any();1004 let rbp = prefix_binding_power(op);1005 let rhs = expr_bp(p, rbp)?;1006 Expr::UnaryOp(op, Box::new(rhs))1007 } else {1008 expr_suffix(p)?1009 };10101011 loop {1012 if p.at_eof() {1013 break;1014 }10151016 let Some(op) = binary_op(p) else {1017 break;1018 };10191020 let (lbp, rbp) = infix_binding_power(op);1021 if lbp < min_bp {1022 break;1023 }10241025 p.eat_any();1026 let rhs = expr_bp(p, rbp)?;1027 lhs = Expr::BinaryOp(Box::new(BinaryOp { lhs, op, rhs }));1028 }10291030 Ok(lhs)1031}10321033fn expr(p: &mut Parser<'_>) -> Result<Expr> {1034 expr_bp(p, 0)1035}10361037pub fn parse(str: &str, settings: &ParserSettings) -> Result<Expr> {1038 let mut p = Parser::new(str, settings.source.clone());1039 for lexeme in &p.lexemes {1040 if let Some(desc) = lexeme.kind.error_description() {1041 return Err(ParseError {1042 message: desc.to_owned(),1043 location: ParseErrorLocation {1044 offset: lexeme.range.0 as usize,1045 },1046 });1047 }1048 }1049 let e = expr(&mut p)?;1050 if !p.at_eof() {1051 return Err(p.error(format!("expected end of file, got {}", p.current_desc(),)));1052 }1053 Ok(e)1054}10551056pub fn string_to_expr(s: IStr, settings: &ParserSettings) -> Spanned<Expr> {1057 let len = s.len();1058 Spanned::new(Expr::Str(s), Span(settings.source.clone(), 0, len as u32))1059}10601061#[cfg(test)]1062mod tests {1063 use std::fs;10641065 use insta::{assert_snapshot, glob};1066 use jrsonnet_ir::{IStr, Source};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 glob!("../../jrsonnet-peg-parser/src", "tests/*.jsonnet", |path| {1172 let input = fs::read_to_string(path).expect("read test file");1173 let source = Source::new_virtual("<test>".into(), IStr::empty());1174 let settings = ParserSettings { source };1175 let v = parse(&input, &settings).unwrap();1176 let v = format!("{v:#?}");1177 assert_snapshot!(v);1178 });1179 }1180}1use std::rc::Rc;23use jrsonnet_gcmodule::Acyclic;4use jrsonnet_ir::{5 ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BinaryOpType, BindSpec, CompSpec, Destruct, Expr,6 ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IfElse, IfSpecData,7 ImportKind, IndexPart, LiteralType, Member, ObjBody, ObjComp, ObjMembers, Slice, SliceDesc,8 Source, Span, Spanned, UnaryOpType, Visibility, unescape,9};10use jrsonnet_lexer::{Lexeme, Lexer, Span as LexSpan, SyntaxKind, T, collect_lexed_str_block};1112pub struct ParserSettings {13 pub source: Source,14}1516#[derive(Debug, Clone)]17pub struct ParseError {18 pub message: String,19 pub location: LexSpan,20}2122impl std::fmt::Display for ParseError {23 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {24 write!(f, "{}", self.message)25 }26}2728type Result<T> = std::result::Result<T, ParseError>;2930struct Parser<'a> {31 lexemes: Vec<Lexeme<'a>>,32 offset: usize,33 source: Source,34}3536impl<'a> Parser<'a> {37 fn new(code: &'a str, source: Source) -> Self {38 Self {39 lexemes: Lexer::new(code)40 .filter(|l| {41 !matches!(42 l.kind,43 SyntaxKind::WHITESPACE44 | SyntaxKind::SINGLE_LINE_SLASH_COMMENT45 | SyntaxKind::SINGLE_LINE_HASH_COMMENT46 | SyntaxKind::MULTI_LINE_COMMENT47 )48 })49 .collect(),50 offset: 0,51 source,52 }53 }5455 fn peek(&self) -> SyntaxKind {56 if self.at_eof() {57 SyntaxKind::EOF58 } else {59 self.lexemes[self.offset].kind60 }61 }6263 fn text(&self) -> &'a str {64 self.lexemes[self.offset].text65 }6667 fn at(&self, kind: SyntaxKind) -> bool {68 !self.at_eof() && self.peek() == kind69 }7071 fn eat_any(&mut self) {72 self.offset += 1;73 }7475 fn at_eof(&self) -> bool {76 self.offset >= self.lexemes.len()77 }7879 fn try_eat(&mut self, t: SyntaxKind) -> bool {80 if self.at(t) {81 self.eat_any();82 return true;83 }84 false85 }8687 fn current_desc(&self) -> String {88 if self.at_eof() {89 return "end of file".to_owned();90 }91 let kind = self.peek();92 let text = self.text();93 let name = kind.display_name();94 if matches!(kind, SyntaxKind::IDENT | SyntaxKind::FLOAT) {95 format!("{name} \"{text}\"")96 } else {97 name.to_owned()98 }99 }100101 fn eat(&mut self, t: SyntaxKind) -> Result<()> {102 if !self.at(t) {103 return Err(self.error(format!(104 "expected {}, got {}",105 t.display_name(),106 self.current_desc(),107 )));108 }109 self.eat_any();110 Ok(())111 }112113 fn span_start(&self) -> u32 {114 if self.at_eof() {115 if let Some(last) = self.lexemes.last() {116 return last.range.1;117 }118 return 0;119 }120 self.lexemes[self.offset].range.0121 }122123 fn span_end(&self) -> u32 {124 self.lexemes[self.offset - 1].range.1125 }126127 fn error(&self, message: String) -> ParseError {128 ParseError {129 location: self.lexemes[self.offset].range,130 message,131 }132 }133134 fn expect_ident(&mut self) -> Result<IStr> {135 if !self.at(SyntaxKind::IDENT) {136 return Err(self.error(format!("expected identifier, got {}", self.current_desc())));137 }138 let text = self.text();139 let s: IStr = text.into();140 self.eat_any();141 Ok(s)142 }143144 fn at_ident(&self) -> bool {145 self.at(SyntaxKind::IDENT) && !is_reserved(self.lexemes[self.offset].text)146 }147}148149fn spanned<T: Acyclic>(150 p: &mut Parser<'_>,151 cb: impl FnOnce(&mut Parser<'_>) -> Result<T>,152) -> Result<Spanned<T>> {153 let start = p.span_start();154 let v = cb(p)?;155 let end = p.span_end();156 Ok(Spanned::new(v, Span(p.source.clone(), start, end)))157}158159fn parse_string_content(p: &mut Parser<'_>) -> Result<IStr> {160 let kind = p.peek();161 let text = p.text();162 let s = match kind {163 SyntaxKind::STRING_DOUBLE => {164 let inner = &text[1..text.len() - 1];165 unescape::unescape(inner).ok_or_else(|| p.error("invalid string escape".into()))?166 }167 SyntaxKind::STRING_SINGLE => {168 let inner = &text[1..text.len() - 1];169 unescape::unescape(inner).ok_or_else(|| p.error("invalid string escape".into()))?170 }171 SyntaxKind::STRING_DOUBLE_VERBATIM => {172 let inner = &text[2..text.len() - 1];173 inner.replace("\"\"", "\"")174 }175 SyntaxKind::STRING_SINGLE_VERBATIM => {176 let inner = &text[2..text.len() - 1];177 inner.replace("''", "'")178 }179 SyntaxKind::STRING_BLOCK => {180 let inner = &text[3..];181 let collected = collect_lexed_str_block(inner)182 .map_err(|_| p.error("invalid string block".into()))?;183 let mut result = String::new();184 for (i, line) in collected.lines.iter().enumerate() {185 if i > 0 {186 result.push('\n');187 }188 result.push_str(line);189 }190 if !collected.truncate {191 result.push('\n');192 }193 result194 }195 _ => return Err(p.error(format!("expected string, got {}", p.current_desc()))),196 };197 p.eat_any();198 Ok(s.into())199}200201fn is_string_token(kind: SyntaxKind) -> bool {202 matches!(203 kind,204 SyntaxKind::STRING_DOUBLE205 | SyntaxKind::STRING_SINGLE206 | SyntaxKind::STRING_DOUBLE_VERBATIM207 | SyntaxKind::STRING_SINGLE_VERBATIM208 | SyntaxKind::STRING_BLOCK209 )210}211212fn parse_number(p: &mut Parser<'_>) -> Result<f64> {213 let text = p.text();214 let n: f64 = text215 .replace('_', "")216 .parse()217 .map_err(|_| p.error(format!("invalid number literal: {text}")))?;218 if !n.is_finite() {219 return Err(p.error("numbers are finite".into()));220 }221 p.eat_any();222 Ok(n)223}224225fn literal(p: &mut Parser<'_>) -> Option<LiteralType> {226 let t = match p.peek() {227 T![self] => LiteralType::This,228 T![super] => LiteralType::Super,229 T!['$'] => LiteralType::Dollar,230 T![null] => LiteralType::Null,231 T![true] => LiteralType::True,232 T![false] => LiteralType::False,233 _ => return None,234 };235 p.eat_any();236 Some(t)237}238239fn assert_stmt(p: &mut Parser<'_>) -> Result<AssertStmt> {240 p.eat(T![assert])?;241 let cond = spanned(p, expr)?;242 let msg = if p.try_eat(T![:]) {243 Some(spanned(p, expr)?)244 } else {245 None246 };247 Ok(AssertStmt(cond, msg))248}249250fn if_spec_data(p: &mut Parser<'_>) -> Result<IfSpecData> {251 let v = spanned(p, |p| p.eat(T![if]))?;252 let cond = expr(p)?;253 Ok(IfSpecData { span: v.span, cond })254}255256fn if_else(p: &mut Parser<'_>) -> Result<IfElse> {257 let cond = if_spec_data(p)?;258 p.eat(T![then])?;259 let cond_then = expr(p)?;260 let cond_else = if p.try_eat(T![else]) {261 Some(expr(p)?)262 } else {263 None264 };265 Ok(IfElse {266 cond,267 cond_then,268 cond_else,269 })270}271272fn slice_desc(p: &mut Parser<'_>, start: Option<Spanned<Expr>>) -> Result<SliceDesc> {273 p.eat(T![:])?;274 let end = if !p.at(T![:]) && !p.at(T![']']) {275 Some(spanned(p, expr)?)276 } else {277 None278 };279 let step = if p.try_eat(T![:]) {280 if p.at(T![']']) {281 None282 } else {283 Some(spanned(p, expr)?)284 }285 } else {286 None287 };288 Ok(SliceDesc { start, end, step })289}290291fn destruct(p: &mut Parser<'_>) -> Result<Destruct> {292 if p.at_ident() {293 return Ok(Destruct::Full(p.expect_ident()?));294 }295 #[cfg(not(feature = "exp-destruct"))]296 return Err(p.error(format!("expected identifier, got {}", p.current_desc())));297 #[cfg(feature = "exp-destruct")]298 {299 if p.try_eat(T![?]) {300 return Ok(Destruct::Skip);301 }302 if p.at(T!['[']) {303 return destruct_array(p);304 }305 if p.at(T!['{']) {306 return destruct_object(p);307 }308 Err(p.error(format!(309 "expected destructure pattern, got {}",310 p.current_desc()311 )))312 }313}314315#[cfg(feature = "exp-destruct")]316fn destruct_rest(p: &mut Parser<'_>) -> Result<jrsonnet_ir::DestructRest> {317 p.eat(T![...])?;318 if p.at_ident() {319 Ok(jrsonnet_ir::DestructRest::Keep(p.expect_ident()?))320 } else {321 Ok(jrsonnet_ir::DestructRest::Drop)322 }323}324325#[cfg(feature = "exp-destruct")]326fn destruct_array(p: &mut Parser<'_>) -> Result<Destruct> {327 p.eat(T!['['])?;328 let mut start = Vec::new();329 let mut rest = None;330 let mut end = Vec::new();331 if !p.at(T![']']) {332 loop {333 if p.at(T![...]) {334 rest = Some(destruct_rest(p)?);335 if p.try_eat(T![,]) {336 if !p.at(T![']']) {337 loop {338 end.push(destruct(p)?);339 if !p.try_eat(T![,]) {340 break;341 }342 if p.at(T![']']) {343 break;344 }345 }346 }347 }348 break;349 }350 start.push(destruct(p)?);351 if !p.try_eat(T![,]) {352 break;353 }354 if p.at(T![']']) {355 break;356 }357 }358 }359 p.eat(T![']'])?;360 Ok(Destruct::Array { start, rest, end })361}362363#[cfg(feature = "exp-destruct")]364fn destruct_object(p: &mut Parser<'_>) -> Result<Destruct> {365 p.eat(T!['{'])?;366 let mut fields = Vec::new();367 let mut rest = None;368 if !p.at(T!['}']) {369 loop {370 if p.at(T![...]) {371 rest = Some(destruct_rest(p)?);372 p.try_eat(T![,]);373 break;374 }375 let name = p.expect_ident()?;376 let into = if p.try_eat(T![:]) {377 Some(destruct(p)?)378 } else {379 None380 };381 let default = if p.try_eat(T![=]) {382 Some(Rc::new(spanned(p, expr)?))383 } else {384 None385 };386 fields.push((name, into, default));387 if !p.try_eat(T![,]) {388 break;389 }390 if p.at(T!['}']) {391 break;392 }393 }394 }395 p.eat(T!['}'])?;396 Ok(Destruct::Object { fields, rest })397}398399fn params(p: &mut Parser<'_>) -> Result<ExprParams> {400 if p.at(T![')']) {401 return Ok(ExprParams::new(Vec::new()));402 }403 let mut result = Vec::new();404 loop {405 let d = destruct(p)?;406 let default = if p.try_eat(T![=]) {407 Some(Rc::new(expr(p)?))408 } else {409 None410 };411 result.push(ExprParam {412 destruct: d,413 default,414 });415 if !p.try_eat(T![,]) {416 break;417 }418 if p.at(T![')']) {419 break;420 }421 }422 Ok(ExprParams::new(result))423}424425fn args(p: &mut Parser<'_>) -> Result<ArgsDesc> {426 if p.at(T![')']) {427 return Ok(ArgsDesc::new(Vec::new(), Vec::new()));428 }429 let mut unnamed = Vec::new();430 let mut named = Vec::new();431 let mut named_started = false;432 loop {433 let is_named = p.at_ident() && {434 let next_offset = p.offset + 1;435 next_offset < p.lexemes.len() && p.lexemes[next_offset].kind == T![=] && {436 let after_eq = next_offset + 1;437 after_eq >= p.lexemes.len() || p.lexemes[after_eq].kind != T![=]438 }439 };440 if is_named {441 let name: IStr = p.expect_ident()?;442 p.eat(T![=])?;443 let value = Rc::new(expr(p)?);444 named.push((name, value));445 named_started = true;446 } else {447 if named_started {448 return Err(p.error("positional argument after named argument".into()));449 }450 unnamed.push(Rc::new(expr(p)?));451 }452 if !p.try_eat(T![,]) {453 break;454 }455 if p.at(T![')']) {456 break;457 }458 }459 Ok(ArgsDesc::new(unnamed, named))460}461462fn bind(p: &mut Parser<'_>) -> Result<BindSpec> {463 #[cfg(feature = "exp-destruct")]464 {465 if !p.at_ident() {466 let d = destruct(p)?;467 p.eat(T![=])?;468 let value = Rc::new(expr(p)?);469 return Ok(BindSpec::Field { into: d, value });470 }471 }472 let name = p.expect_ident()?;473 if p.try_eat(T!['(']) {474 let ps = params(p)?;475 p.eat(T![')'])?;476 p.eat(T![=])?;477 let value = Rc::new(expr(p)?);478 Ok(BindSpec::Function {479 name,480 params: ps,481 value,482 })483 } else {484 p.eat(T![=])?;485 let value = Rc::new(expr(p)?);486 Ok(BindSpec::Field {487 into: Destruct::Full(name),488 value,489 })490 }491}492493fn visibility(p: &mut Parser<'_>) -> Result<Visibility> {494 p.eat(T![:])?;495 if p.try_eat(T![:]) {496 if p.try_eat(T![:]) {497 Ok(Visibility::Unhide)498 } else {499 Ok(Visibility::Hidden)500 }501 } else {502 Ok(Visibility::Normal)503 }504}505506fn field_name(p: &mut Parser<'_>) -> Result<FieldName> {507 if p.at_ident() {508 Ok(FieldName::Fixed(p.expect_ident()?))509 } else if is_string_token(p.peek()) {510 Ok(FieldName::Fixed(parse_string_content(p)?))511 } else if p.at(T!['[']) {512 p.eat(T!['['])?;513 let e = expr(p)?;514 p.eat(T![']'])?;515 Ok(FieldName::Dyn(e))516 } else {517 Err(p.error(format!("expected field name, got {}", p.current_desc())))518 }519}520521fn field(p: &mut Parser<'_>) -> Result<FieldMember> {522 let name = spanned(p, field_name)?;523524 if p.at(T!['(']) {525 p.eat(T!['('])?;526 let ps = params(p)?;527 p.eat(T![')'])?;528 let vis = visibility(p)?;529 let value = Rc::new(expr(p)?);530 Ok(FieldMember {531 name,532 plus: false,533 params: Some(ps),534 visibility: vis,535 value,536 })537 } else {538 let plus = p.try_eat(T![+]);539 let vis = visibility(p)?;540 let value = Rc::new(expr(p)?);541 Ok(FieldMember {542 name,543 plus,544 params: None,545 visibility: vis,546 value,547 })548 }549}550551fn member(p: &mut Parser<'_>) -> Result<Member> {552 if p.at(T![local]) {553 p.eat(T![local])?;554 Ok(Member::BindStmt(bind(p)?))555 } else if p.at(T![assert]) {556 Ok(Member::AssertStmt(assert_stmt(p)?))557 } else {558 Ok(Member::Field(field(p)?))559 }560}561562fn for_spec(p: &mut Parser<'_>) -> Result<ForSpecData> {563 p.eat(T![for])?;564 let d = destruct(p)?;565 p.eat(T![in])?;566 let over = expr(p)?;567 Ok(ForSpecData { destruct: d, over })568}569570fn compspecs(p: &mut Parser<'_>) -> Result<Vec<CompSpec>> {571 let mut specs = Vec::new();572 specs.push(CompSpec::ForSpec(for_spec(p)?));573 loop {574 if p.at(T![for]) {575 specs.push(CompSpec::ForSpec(for_spec(p)?));576 } else if p.at(T![if]) {577 let isd = if_spec_data(p)?;578 specs.push(CompSpec::IfSpec(isd));579 } else {580 break;581 }582 }583 Ok(specs)584}585586fn objinside(p: &mut Parser<'_>) -> Result<ObjBody> {587 if p.at(T!['}']) {588 return Ok(ObjBody::MemberList(ObjMembers {589 locals: Rc::new(Vec::new()),590 asserts: Rc::new(Vec::new()),591 fields: Vec::new(),592 }));593 }594595 let mut members = Vec::new();596 loop {597 members.push(member(p)?);598 if !p.try_eat(T![,]) {599 break;600 }601 if p.at(T!['}']) || p.at(T![for]) {602 break;603 }604 }605606 if p.at(T![for]) {607 let specs = compspecs(p)?;608 let mut locals = Vec::new();609 let mut field_member = None;610 for m in members {611 match m {612 Member::Field(f) => {613 if field_member.is_some() {614 return Err(615 p.error("object comprehension can only contain one field".into())616 );617 }618 field_member = Some(f);619 }620 Member::BindStmt(b) => locals.push(b),621 Member::AssertStmt(_) => {622 return Err(p.error("asserts are unsupported in object comprehension".into()));623 }624 }625 }626 Ok(ObjBody::ObjComp(ObjComp {627 locals: Rc::new(locals),628 field: Rc::new(629 field_member.ok_or_else(|| p.error("missing object comprehension field".into()))?,630 ),631 compspecs: specs,632 }))633 } else {634 let mut locals = Vec::new();635 let mut asserts = Vec::new();636 let mut fields = Vec::new();637 for m in members {638 match m {639 Member::Field(f) => fields.push(f),640 Member::BindStmt(b) => locals.push(b),641 Member::AssertStmt(a) => asserts.push(a),642 }643 }644 Ok(ObjBody::MemberList(ObjMembers {645 locals: Rc::new(locals),646 asserts: Rc::new(asserts),647 fields,648 }))649 }650}651652fn expr_basic(p: &mut Parser<'_>) -> Result<Expr> {653 if let Some(lit) = literal(p) {654 return Ok(Expr::Literal(lit));655 }656657 match p.peek() {658 SyntaxKind::STRING_DOUBLE659 | SyntaxKind::STRING_SINGLE660 | SyntaxKind::STRING_DOUBLE_VERBATIM661 | SyntaxKind::STRING_SINGLE_VERBATIM662 | SyntaxKind::STRING_BLOCK => Ok(Expr::Str(parse_string_content(p)?)),663664 SyntaxKind::FLOAT => Ok(Expr::Num(parse_number(p)?)),665666 T!['('] => {667 p.eat(T!['('])?;668 let e = expr(p)?;669 p.eat(T![')'])?;670 Ok(e)671 }672673 T!['['] => {674 p.eat(T!['['])?;675 if p.at(T![']']) {676 p.eat(T![']'])?;677 return Ok(Expr::Arr(Rc::new(Vec::new())));678 }679 let first = expr(p)?;680 if p.at(T![for]) {681 let specs = compspecs(p)?;682 p.eat(T![']'])?;683 Ok(Expr::ArrComp(Rc::new(first), specs))684 } else if p.at(T![,]) && {685 let next = p.offset + 1;686 next < p.lexemes.len() && p.lexemes[next].kind == T![for]687 } {688 p.eat(T![,])?;689 let specs = compspecs(p)?;690 p.eat(T![']'])?;691 Ok(Expr::ArrComp(Rc::new(first), specs))692 } else {693 let mut elems = vec![first];694 while p.try_eat(T![,]) {695 if p.at(T![']']) {696 break;697 }698 elems.push(expr(p)?);699 }700 p.eat(T![']'])?;701 Ok(Expr::Arr(Rc::new(elems)))702 }703 }704705 T!['{'] => {706 p.eat(T!['{'])?;707 let body = objinside(p)?;708 p.eat(T!['}'])?;709 Ok(Expr::Obj(body))710 }711712 T![local] => {713 p.eat(T![local])?;714 let mut binds = Vec::new();715 loop {716 binds.push(bind(p)?);717 if !p.try_eat(T![,]) {718 break;719 }720 }721 p.eat(T![;])?;722 let body = expr(p)?;723 Ok(Expr::LocalExpr(binds, Box::new(body)))724 }725726 T![if] => Ok(Expr::IfElse(Box::new(if_else(p)?))),727728 T![function] => {729 p.eat(T![function])?;730 p.eat(T!['('])?;731 let ps = params(p)?;732 p.eat(T![')'])?;733 let body = expr(p)?;734 Ok(Expr::Function(ps, Rc::new(body)))735 }736737 T![assert] => {738 let a = assert_stmt(p)?;739 p.eat(T![;])?;740 let rest = expr(p)?;741 Ok(Expr::AssertExpr(Rc::new(AssertExpr { assert: a, rest })))742 }743744 T![error] => {745 let span = spanned(p, |p| p.eat(T![error]))?;746 let e = expr(p)?;747 Ok(Expr::ErrorStmt(span.span, Box::new(e)))748 }749750 T![importstr] => {751 let kind = spanned(p, |p| {752 p.eat(T![importstr])?;753 Ok(ImportKind::Str)754 })?;755 let path = expr(p)?;756 Ok(Expr::Import(kind, Box::new(path)))757 }758759 T![importbin] => {760 let kind = spanned(p, |p| {761 p.eat(T![importbin])?;762 Ok(ImportKind::Bin)763 })?;764 let path = expr(p)?;765 Ok(Expr::Import(kind, Box::new(path)))766 }767768 T![import] => {769 let kind = spanned(p, |p| {770 p.eat(T![import])?;771 Ok(ImportKind::Normal)772 })?;773 let path = expr(p)?;774 Ok(Expr::Import(kind, Box::new(path)))775 }776777 SyntaxKind::IDENT => {778 let text = p.text();779 if is_reserved(text) {780 return Err(p.error(format!("unexpected reserved word '{text}'")));781 }782 let n = spanned(p, |p| {783 let s: IStr = p.text().into();784 p.eat_any();785 Ok(s)786 })?;787 Ok(Expr::Var(n))788 }789790 _ => Err(p.error(format!("unexpected {}", p.current_desc()))),791 }792}793794fn flush_index_parts(e: &mut Expr, parts: &mut Vec<IndexPart>) {795 if parts.is_empty() {796 return;797 }798 let old = std::mem::replace(e, Expr::Literal(LiteralType::Null));799 *e = Expr::Index {800 indexable: Box::new(old),801 parts: std::mem::take(parts),802 };803}804805fn expr_suffix(p: &mut Parser<'_>) -> Result<Expr> {806 let mut e = expr_basic(p)?;807 // Accumulate consecutive index parts (.field, [expr], ?.field, ?.[expr])808 // into a single Expr::Index. This is critical for null-coalesce semantics:809 // a?.b.c needs all parts in one Index so the evaluator can skip .c when .b is null.810 let mut parts: Vec<IndexPart> = Vec::new();811812 loop {813 #[cfg(feature = "exp-null-coaelse")]814 if p.at(T![?]) {815 p.eat_any();816 if p.try_eat(T![.]) {817 if p.at(T!['[']) {818 // ?.[expr]819 p.eat(T!['['])?;820 let idx = spanned(p, expr)?;821 p.eat(T![']'])?;822 parts.push(IndexPart {823 span: idx.span,824 value: idx.value,825 null_coaelse: true,826 });827 } else {828 // ?.field829 let id_spanned = spanned(p, |p| {830 let name = p.expect_ident()?;831 Ok(Expr::Str(name))832 })?;833 parts.push(IndexPart {834 span: id_spanned.span,835 value: id_spanned.value,836 null_coaelse: true,837 });838 }839 } else {840 return Err(p.error("expected '.' after '?'".into()));841 }842 continue;843 }844845 if p.at(T![.]) {846 p.eat(T![.])?;847 let id_spanned = spanned(p, |p| {848 let name = p.expect_ident()?;849 Ok(Expr::Str(name))850 })?;851 parts.push(IndexPart {852 span: id_spanned.span,853 value: id_spanned.value,854 #[cfg(feature = "exp-null-coaelse")]855 null_coaelse: false,856 });857 } else if p.at(T!['[']) {858 p.eat(T!['['])?;859860 if p.at(T![:]) {861 // Slice: flush index parts first, then handle slice862 flush_index_parts(&mut e, &mut parts);863 let slice = slice_desc(p, None)?;864 p.eat(T![']'])?;865 e = Expr::Slice(Box::new(Slice { value: e, slice }));866 } else {867 let idx = spanned(p, expr)?;868 if p.at(T![:]) {869 // Slice with start: flush index parts first870 flush_index_parts(&mut e, &mut parts);871 let slice = slice_desc(p, Some(idx))?;872 p.eat(T![']'])?;873 e = Expr::Slice(Box::new(Slice { value: e, slice }));874 } else {875 // Bracket index: add to parts876 p.eat(T![']'])?;877 parts.push(IndexPart {878 span: idx.span,879 value: idx.value,880 #[cfg(feature = "exp-null-coaelse")]881 null_coaelse: false,882 });883 }884 }885 } else if p.at(T!['(']) {886 flush_index_parts(&mut e, &mut parts);887 let args_spanned = spanned(p, |p| {888 p.eat(T!['('])?;889 let a = args(p)?;890 p.eat(T![')'])?;891 Ok(a)892 })?;893 let tailstrict = p.try_eat(T![tailstrict]);894 e = Expr::Apply(Box::new(e), args_spanned, tailstrict);895 } else if p.at(T!['{']) {896 flush_index_parts(&mut e, &mut parts);897 p.eat(T!['{'])?;898 let body = objinside(p)?;899 p.eat(T!['}'])?;900 e = Expr::ObjExtend(Rc::new(e), body);901 } else {902 break;903 }904 }905906 flush_index_parts(&mut e, &mut parts);907 Ok(e)908}909910fn prefix_binding_power(op: UnaryOpType) -> u8 {911 match op {912 UnaryOpType::Plus | UnaryOpType::Minus | UnaryOpType::Not | UnaryOpType::BitNot => 20,913 }914}915916fn infix_binding_power(op: BinaryOpType) -> (u8, u8) {917 match op {918 BinaryOpType::Or => (2, 3),919 #[cfg(feature = "exp-null-coaelse")]920 BinaryOpType::NullCoaelse => (2, 3),921 BinaryOpType::And => (4, 5),922 BinaryOpType::BitOr => (6, 7),923 BinaryOpType::BitXor => (8, 9),924 BinaryOpType::BitAnd => (10, 11),925 BinaryOpType::Eq | BinaryOpType::Neq => (12, 13),926 BinaryOpType::Lt927 | BinaryOpType::Gt928 | BinaryOpType::Lte929 | BinaryOpType::Gte930 | BinaryOpType::In => (14, 15),931 BinaryOpType::Lhs | BinaryOpType::Rhs => (16, 17),932 BinaryOpType::Add | BinaryOpType::Sub => (18, 19),933 BinaryOpType::Mul | BinaryOpType::Div | BinaryOpType::Mod => (20, 21),934 }935}936937fn unary_op(kind: SyntaxKind) -> Option<UnaryOpType> {938 match kind {939 T![+] => Some(UnaryOpType::Plus),940 T![-] => Some(UnaryOpType::Minus),941 T![!] => Some(UnaryOpType::Not),942 T![~] => Some(UnaryOpType::BitNot),943 _ => None,944 }945}946947fn binary_op(p: &Parser<'_>) -> Option<BinaryOpType> {948 match p.peek() {949 T![||] => Some(BinaryOpType::Or),950 T![&&] => Some(BinaryOpType::And),951 T![|] => Some(BinaryOpType::BitOr),952 T![^] => Some(BinaryOpType::BitXor),953 T![&] => Some(BinaryOpType::BitAnd),954 T![==] => Some(BinaryOpType::Eq),955 T![!=] => Some(BinaryOpType::Neq),956 T![<] => Some(BinaryOpType::Lt),957 T![>] => Some(BinaryOpType::Gt),958 T![<=] => Some(BinaryOpType::Lte),959 T![>=] => Some(BinaryOpType::Gte),960 T![<<] => Some(BinaryOpType::Lhs),961 T![>>] => Some(BinaryOpType::Rhs),962 T![+] => Some(BinaryOpType::Add),963 T![-] => Some(BinaryOpType::Sub),964 T![*] => Some(BinaryOpType::Mul),965 T![/] => Some(BinaryOpType::Div),966 T![%] => Some(BinaryOpType::Mod),967 T![in] => Some(BinaryOpType::In),968 #[cfg(feature = "exp-null-coaelse")]969 T![??] => Some(BinaryOpType::NullCoaelse),970 _ => None,971 }972}973974fn expr_bp(p: &mut Parser<'_>, min_bp: u8) -> Result<Expr> {975 let mut lhs = if let Some(op) = unary_op(p.peek()) {976 p.eat_any();977 let rbp = prefix_binding_power(op);978 let rhs = expr_bp(p, rbp)?;979 Expr::UnaryOp(op, Box::new(rhs))980 } else {981 expr_suffix(p)?982 };983984 loop {985 if p.at_eof() {986 break;987 }988989 let Some(op) = binary_op(p) else {990 break;991 };992993 let (lbp, rbp) = infix_binding_power(op);994 if lbp < min_bp {995 break;996 }997998 p.eat_any();999 let rhs = expr_bp(p, rbp)?;1000 lhs = Expr::BinaryOp(Box::new(BinaryOp { lhs, op, rhs }));1001 }10021003 Ok(lhs)1004}10051006fn expr(p: &mut Parser<'_>) -> Result<Expr> {1007 expr_bp(p, 0)1008}10091010pub fn parse(str: &str, settings: &ParserSettings) -> Result<Expr> {1011 let mut p = Parser::new(str, settings.source.clone());1012 for lexeme in &p.lexemes {1013 if let Some(desc) = lexeme.kind.error_description() {1014 return Err(ParseError {1015 message: desc.to_owned(),1016 location: lexeme.range,1017 });1018 }1019 }1020 let e = expr(&mut p)?;1021 if !p.at_eof() {1022 return Err(p.error(format!("expected end of file, got {}", p.current_desc(),)));1023 }1024 Ok(e)1025}10261027pub fn string_to_expr(s: IStr, settings: &ParserSettings) -> Spanned<Expr> {1028 let len = s.len();1029 Spanned::new(Expr::Str(s), Span(settings.source.clone(), 0, len as u32))1030}10311032#[cfg(test)]1033mod tests {1034 use std::fs;10351036 use insta::{assert_snapshot, glob};1037 use jrsonnet_ir::{IStr, Source};10381039 use super::*;10401041 fn parse_str(input: &str) -> Expr {1042 let source = Source::new_virtual("<test>".into(), input.into());1043 let settings = ParserSettings { source };1044 parse(input, &settings).unwrap()1045 }10461047 #[test]1048 #[cfg(not(feature = "exp-null-coaelse"))]1049 fn basic_test() {1050 let v = parse_str("assert true[false] : false ; true");1051 assert_snapshot!(format!("{v:#?}"));1052 }10531054 #[test]1055 fn literals() {1056 let v = parse_str("[null, true, false, self, super, $]");1057 assert_snapshot!(format!("{v:#?}"));1058 }10591060 #[test]1061 fn basic_math() {1062 let v = parse_str("2+2*2");1063 assert_snapshot!(format!("{v:#?}"));1064 }10651066 #[test]1067 fn underscore_numbers() {1068 let v = parse_str("[1_000, 1_000.000_1, 1_0e1_0]");1069 assert_snapshot!(format!("{v:#?}"));1070 }10711072 #[test]1073 fn strings() {1074 let v = parse_str(r#"["hello", 'world', @"raw""str", @'raw''str']"#);1075 assert_snapshot!(format!("{v:#?}"));1076 }10771078 #[test]1079 fn object() {1080 let v = parse_str("{a: 1, b:: 2, c::: 3}");1081 assert_snapshot!(format!("{v:#?}"));1082 }10831084 #[test]1085 fn function_and_call() {1086 let v = parse_str("local f(x, y=1) = x + y; f(2, y=3)");1087 assert_snapshot!(format!("{v:#?}"));1088 }10891090 #[test]1091 fn if_then_else() {1092 let v = parse_str("if true then 1 else 2");1093 assert_snapshot!(format!("{v:#?}"));1094 }10951096 #[test]1097 fn imports() {1098 let v = parse_str(r#"[import "a", importstr "b", importbin "c"]"#);1099 assert_snapshot!(format!("{v:#?}"));1100 }11011102 #[test]1103 fn array_comp() {1104 let v = parse_str("[x for x in arr]");1105 assert_snapshot!(format!("{v:#?}"));1106 }11071108 #[test]1109 #[cfg(not(feature = "exp-null-coaelse"))]1110 fn index_and_suffix() {1111 let v = parse_str("std.test(2).field[0]");1112 assert_snapshot!(format!("{v:#?}"));1113 }11141115 #[test]1116 fn obj_extend() {1117 let v = parse_str("{} { x: 1 }");1118 assert_snapshot!(format!("{v:#?}"));1119 }11201121 #[test]1122 fn unary_ops() {1123 let v = parse_str("!a && !b");1124 assert_snapshot!(format!("{v:#?}"));1125 }11261127 #[test]1128 fn error_expr() {1129 let v = parse_str("error \"bad\"");1130 assert_snapshot!(format!("{v:#?}"));1131 }11321133 #[test]1134 fn slice() {1135 let v = parse_str("[a[1:], a[1::], a[:1:], a[::1]]");1136 assert_snapshot!(format!("{v:#?}"));1137 }11381139 #[test]1140 #[cfg(not(feature = "exp-null-coaelse"))]1141 fn peg_snapshots() {1142 glob!("../../jrsonnet-peg-parser/src", "tests/*.jsonnet", |path| {1143 let input = fs::read_to_string(path).expect("read test file");1144 let source = Source::new_virtual("<test>".into(), IStr::empty());1145 let settings = ParserSettings { source };1146 let v = parse(&input, &settings).unwrap();1147 let v = format!("{v:#?}");1148 assert_snapshot!(v);1149 });1150 }1151}