difftreelog
slop: implement ir parser
in: master
86 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -638,6 +638,7 @@
"jrsonnet-gcmodule",
"jrsonnet-interner",
"jrsonnet-ir",
+ "jrsonnet-ir-parser",
"jrsonnet-macros",
"jrsonnet-peg-parser",
"jrsonnet-types",
crates/jrsonnet-evaluator/Cargo.tomldiffbeforeafterboth--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -13,11 +13,13 @@
workspace = true
[features]
-default = ["explaining-traces"]
+default = ["explaining-traces", "ir-parser"]
# Rustc-like trace visualization
explaining-traces = ["annotate-snippets", "hi-doc"]
# Allows library authors to throw custom errors
anyhow-error = ["anyhow"]
+# Use hand-written recursive descent parser instead of PEG parser
+ir-parser = ["dep:jrsonnet-ir-parser"]
# Allows to preserve field order in objects
exp-preserve-order = []
@@ -28,12 +30,13 @@
# Bigint type
exp-bigint = ["num-bigint", "jrsonnet-types/exp-bigint"]
# obj?.field, obj?.['field']
-exp-null-coaelse = ["jrsonnet-peg-parser/exp-null-coaelse"]
+exp-null-coaelse = ["jrsonnet-peg-parser/exp-null-coaelse", "jrsonnet-ir-parser?/exp-null-coaelse"]
[dependencies]
jrsonnet-interner.workspace = true
jrsonnet-ir.workspace = true
jrsonnet-peg-parser.workspace = true
+jrsonnet-ir-parser = { workspace = true, optional = true }
jrsonnet-types.workspace = true
jrsonnet-macros.workspace = true
jrsonnet-gcmodule.workspace = true
crates/jrsonnet-evaluator/src/async_import.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/async_import.rs
+++ b/crates/jrsonnet-evaluator/src/async_import.rs
@@ -7,6 +7,9 @@
FieldMember, FieldName, ForSpecData, IfElse, IfSpecData, ImportKind, ObjBody, Slice, SliceDesc,
Source, SourcePath, Spanned,
};
+#[cfg(feature = "ir-parser")]
+use jrsonnet_ir_parser::ParserSettings;
+#[cfg(not(feature = "ir-parser"))]
use jrsonnet_peg_parser::ParserSettings;
use rustc_hash::FxHashMap;
@@ -323,7 +326,7 @@
};
let source = Source::new(path.clone(), code.clone());
// If failed - then skip import
- file.parsed = jrsonnet_peg_parser::parse(&code, &ParserSettings { source })
+ file.parsed = crate::parse_jsonnet(&code, &ParserSettings { source })
.map(Rc::new)
.ok();
if let Some(parsed) = &file.parsed {
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -154,6 +154,7 @@
ImportNotSupported(SourcePath, ResolvePathOwned),
#[error("can't import from virtual file")]
CantImportFromVirtualFile,
+ #[cfg(not(feature = "ir-parser"))]
#[error(
"syntax error: {}",
// Peg has no fancier way to handle critical parsing errors https://github.com/kevinmehall/rust-peg/issues/225
@@ -172,6 +173,14 @@
error: Box<jrsonnet_peg_parser::ParseError>,
},
+ #[cfg(feature = "ir-parser")]
+ #[error("syntax error: {error}")]
+ ImportSyntaxError {
+ path: Source,
+ #[trace(skip)]
+ error: Box<jrsonnet_ir_parser::ParseError>,
+ },
+
#[error("runtime error: {}", format_empty_str(.0))]
RuntimeError(IStr),
#[error("stack overflow, try to reduce recursion, or set --max-stack to bigger value")]
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -46,6 +46,9 @@
use jrsonnet_ir::{Expr, Source, SourcePath};
#[doc(hidden)]
pub use jrsonnet_macros;
+#[cfg(feature = "ir-parser")]
+use jrsonnet_ir_parser::ParserSettings;
+#[cfg(not(feature = "ir-parser"))]
use jrsonnet_peg_parser::ParserSettings;
pub use obj::*;
pub use rustc_hash;
@@ -56,6 +59,22 @@
use crate::gc::WithCapacityExt as _;
+#[cfg(feature = "ir-parser")]
+pub(crate) fn parse_jsonnet(
+ code: &str,
+ settings: &ParserSettings,
+) -> Result<Expr, jrsonnet_ir_parser::ParseError> {
+ jrsonnet_ir_parser::parse(code, settings)
+}
+
+#[cfg(not(feature = "ir-parser"))]
+pub(crate) fn parse_jsonnet(
+ code: &str,
+ settings: &ParserSettings,
+) -> Result<Expr, jrsonnet_peg_parser::ParseError> {
+ jrsonnet_peg_parser::parse(code, settings)
+}
+
cc_dyn!(
#[derive(Clone)]
CcUnbound<V>,
@@ -345,7 +364,7 @@
let file_name = Source::new(path.clone(), code.clone());
if file.parsed.is_none() {
file.parsed = Some(
- jrsonnet_peg_parser::parse(
+ parse_jsonnet(
&code,
&ParserSettings {
source: file_name.clone(),
@@ -461,7 +480,7 @@
pub fn evaluate_snippet(&self, name: impl Into<IStr>, code: impl Into<IStr>) -> Result<Val> {
let code = code.into();
let source = Source::new_virtual(name.into(), code.clone());
- let parsed = jrsonnet_peg_parser::parse(
+ let parsed = parse_jsonnet(
&code,
&ParserSettings {
source: source.clone(),
@@ -482,7 +501,7 @@
) -> Result<Val> {
let code = code.into();
let source = Source::new_virtual(name.into(), code.clone());
- let parsed = jrsonnet_peg_parser::parse(
+ let parsed = parse_jsonnet(
&code,
&ParserSettings {
source: source.clone(),
crates/jrsonnet-ir-parser/Cargo.tomldiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/Cargo.toml
+++ b/crates/jrsonnet-ir-parser/Cargo.toml
@@ -6,6 +6,9 @@
repository.workspace = true
version.workspace = true
+[features]
+exp-null-coaelse = ["jrsonnet-ir/exp-null-coaelse"]
+
[dependencies]
insta.workspace = true
jrsonnet-gcmodule.workspace = true
crates/jrsonnet-ir-parser/src/lib.rsdiffbeforeafterboth1use std::rc::Rc;23use insta::assert_snapshot;4use jrsonnet_gcmodule::Acyclic;5use jrsonnet_ir::{6 AssertExpr, AssertStmt, Expr, IfElse, IfSpecData, LiteralType, Slice, SliceDesc, Source,7 SourceVirtual, Span, Spanned,8};9use jrsonnet_lexer::{Lexeme, Lexer, SyntaxKind, T};1011struct Parser<'a> {12 lexemes: Vec<Lexeme<'a>>,13 offset: usize,14 source: Source,15}1617impl<'a> Parser<'a> {18 fn new(s: &'a str) -> Self {19 Self {20 lexemes: Lexer::new(s)21 .filter(|l| l.kind != SyntaxKind::WHITESPACE)22 .collect(),23 offset: 0,24 source: Source::new_virtual("<test>".into(), s.into()),25 }26 }27 fn peek(&self) -> SyntaxKind {28 self.lexemes[self.offset].kind29 }30 fn text(&self) -> &str {31 self.lexemes[self.offset].text32 }33 fn at(&self, kind: SyntaxKind) -> bool {34 !self.at_eof() && self.peek() == kind35 }36 fn eat_any(&mut self) {37 self.offset += 138 }3940 fn at_eof(&self) -> bool {41 self.offset == self.lexemes.len()42 }4344 fn try_eat(&mut self, t: SyntaxKind) -> bool {45 if self.at(t) {46 self.eat_any();47 return true;48 }49 false50 }51 fn eat(&mut self, t: SyntaxKind) {52 assert_eq!(self.peek(), t);53 self.eat_any();54 }5556 fn span_start(&self) -> u32 {57 self.lexemes[self.offset].range.058 }59 fn span_end(&self) -> u32 {60 self.lexemes[self.offset - 1].range.161 }62}6364fn literal(p: &mut Parser<'_>) -> Option<LiteralType> {65 let t = match p.peek() {66 T![self] => LiteralType::This,67 T![super] => LiteralType::Super,68 T!['$'] => LiteralType::Dollar,69 T![null] => LiteralType::Null,70 T![true] => LiteralType::True,71 T![false] => LiteralType::False,72 _ => return None,73 };74 p.eat_any();75 Some(t)76}7778fn spanned<T: Acyclic>(p: &mut Parser<'_>, cb: impl FnOnce(&mut Parser<'_>) -> T) -> Spanned<T> {79 let start = p.span_start();80 let v = cb(p);81 let end = p.span_end();8283 Spanned::new(v, Span(p.source.clone(), start, end))84}8586fn assert_stmt(p: &mut Parser<'_>) -> AssertStmt {87 p.eat(T![assert]);88 let cond = spanned(p, expr);89 dbg!(p.peek());90 let msg = if p.try_eat(T![:]) {91 Some(spanned(p, expr))92 } else {93 None94 };95 dbg!(AssertStmt(cond, msg))96}9798fn if_spec_data(p: &mut Parser<'_>) -> IfSpecData {99 let v = spanned(p, |p| p.eat(T![if]));100 let cond = expr(p);101 IfSpecData { span: v.span, cond }102}103104fn if_else(p: &mut Parser<'_>) -> IfElse {105 let cond = if_spec_data(p);106 p.eat(T![then]);107 let cond_then = expr(p);108 let cond_else = if p.at(T![else]) { Some(expr(p)) } else { None };109 IfElse {110 cond,111 cond_then,112 cond_else,113 }114}115116fn slice_desc(p: &mut Parser<'_>, start: Option<Spanned<Expr>>) -> SliceDesc {117 // start118 p.eat(T![:]);119 let end = if !p.at(T![:]) && !p.at(T![']']) {120 Some(spanned(p, expr))121 } else {122 None123 };124 let step = if p.try_eat(T![:]) && !p.at(T![']']) {125 Some(spanned(p, expr))126 } else {127 None128 };129 SliceDesc { start, end, step }130}131132fn expr_simple(p: &mut Parser<'_>) -> Expr {133 let mut e = if let Some(literal) = literal(p) {134 Expr::Literal(literal)135 } else if p.at(T![assert]) {136 let assert = assert_stmt(p);137 p.eat(T![;]);138 let rest = expr(p);139 Expr::AssertExpr(Rc::new(AssertExpr { assert, rest }))140 } else if p.at(T![if]) {141 Expr::IfElse(Box::new(if_else(p)))142 } else {143 panic!("unexpected token: {:?}", p.peek());144 };145146 dbg!(&e);147148 loop {149 if p.try_eat(T!['[']) {150 if p.at(T![:]) {151 let slice = slice_desc(p, None);152 e = Expr::Slice(Box::new(Slice { value: e, slice }));153 p.eat(T![']']);154 continue;155 }156157 let idx = spanned(p, expr);158 if p.at(T![:]) {159 let slice = slice_desc(p, Some(idx));160 e = Expr::Slice(Box::new(Slice { value: e, slice }));161 } else {162 }163 p.eat(T![']']);164 } else {165 break;166 }167 }168169 dbg!(e)170}171172fn expr(p: &mut Parser<'_>) -> Expr {173 expr_simple(p)174}175176#[test]177fn basic_test() {178 let mut parser = Parser::new(" assert true[false] : false ; true ");179 let e = expr(&mut parser);180 let l = &parser.lexemes;181182 assert_snapshot!(format!("{l:#?}\n\n---\n\n{e:#?}"));183}crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__array_comp.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__array_comp.snap
@@ -0,0 +1,21 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+ArrComp(
+ Var(
+ "x" from virtual:<test>:1-2,
+ ),
+ [
+ ForSpec(
+ ForSpecData {
+ destruct: Full(
+ "x",
+ ),
+ over: Var(
+ "arr" from virtual:<test>:12-15,
+ ),
+ },
+ ),
+ ],
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__basic_math.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__basic_math.snap
@@ -0,0 +1,23 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+BinaryOp(
+ BinaryOp {
+ lhs: Num(
+ 2.0,
+ ),
+ op: Add,
+ rhs: BinaryOp(
+ BinaryOp {
+ lhs: Num(
+ 2.0,
+ ),
+ op: Mul,
+ rhs: Num(
+ 2.0,
+ ),
+ },
+ ),
+ },
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__basic_test.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__basic_test.snap
@@ -0,0 +1,31 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+AssertExpr(
+ AssertExpr {
+ assert: AssertStmt(
+ Index {
+ indexable: Literal(
+ True,
+ ),
+ parts: [
+ IndexPart {
+ span: virtual:<test>:12-17,
+ value: Literal(
+ False,
+ ),
+ },
+ ],
+ } from virtual:<test>:7-18,
+ Some(
+ Literal(
+ False,
+ ) from virtual:<test>:21-26,
+ ),
+ ),
+ rest: Literal(
+ True,
+ ),
+ },
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__error_expr.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__error_expr.snap
@@ -0,0 +1,10 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+ErrorStmt(
+ virtual:<test>:0-5,
+ Str(
+ "bad",
+ ),
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__function_and_call.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__function_and_call.snap
@@ -0,0 +1,80 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+LocalExpr(
+ [
+ Function {
+ name: "f",
+ params: ExprParams {
+ exprs: [
+ ExprParam {
+ destruct: Full(
+ "x",
+ ),
+ default: None,
+ },
+ ExprParam {
+ destruct: Full(
+ "y",
+ ),
+ default: Some(
+ Num(
+ 1.0,
+ ),
+ ),
+ },
+ ],
+ signature: FunctionSignature(
+ [
+ ParamParse {
+ name: Named(
+ "x",
+ ),
+ default: None,
+ },
+ ParamParse {
+ name: Named(
+ "y",
+ ),
+ default: Exists,
+ },
+ ],
+ ),
+ binds_len: 2,
+ },
+ value: BinaryOp(
+ BinaryOp {
+ lhs: Var(
+ "x" from virtual:<test>:18-19,
+ ),
+ op: Add,
+ rhs: Var(
+ "y" from virtual:<test>:22-23,
+ ),
+ },
+ ),
+ },
+ ],
+ Apply(
+ Var(
+ "f" from virtual:<test>:25-26,
+ ),
+ ArgsDesc {
+ unnamed: [
+ Num(
+ 2.0,
+ ),
+ ],
+ named: [
+ (
+ "y",
+ Num(
+ 3.0,
+ ),
+ ),
+ ],
+ } from virtual:<test>:26-34,
+ false,
+ ),
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__if_then_else.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__if_then_else.snap
@@ -0,0 +1,22 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+IfElse(
+ IfElse {
+ cond: IfSpecData {
+ span: virtual:<test>:0-2,
+ cond: Literal(
+ True,
+ ),
+ },
+ cond_then: Num(
+ 1.0,
+ ),
+ cond_else: Some(
+ Num(
+ 2.0,
+ ),
+ ),
+ },
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__imports.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__imports.snap
@@ -0,0 +1,26 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+Arr(
+ [
+ Import(
+ Normal from virtual:<test>:1-7,
+ Str(
+ "a",
+ ),
+ ),
+ Import(
+ Str from virtual:<test>:13-22,
+ Str(
+ "b",
+ ),
+ ),
+ Import(
+ Bin from virtual:<test>:28-37,
+ Str(
+ "c",
+ ),
+ ),
+ ],
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__index_and_suffix.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__index_and_suffix.snap
@@ -0,0 +1,44 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+Index {
+ indexable: Apply(
+ Index {
+ indexable: Var(
+ "std" from virtual:<test>:0-3,
+ ),
+ parts: [
+ IndexPart {
+ span: virtual:<test>:4-8,
+ value: Str(
+ "test",
+ ),
+ },
+ ],
+ },
+ ArgsDesc {
+ unnamed: [
+ Num(
+ 2.0,
+ ),
+ ],
+ named: [],
+ } from virtual:<test>:8-11,
+ false,
+ ),
+ parts: [
+ IndexPart {
+ span: virtual:<test>:12-17,
+ value: Str(
+ "field",
+ ),
+ },
+ IndexPart {
+ span: virtual:<test>:18-19,
+ value: Num(
+ 0.0,
+ ),
+ },
+ ],
+}
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__literals.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__literals.snap
@@ -0,0 +1,26 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+Arr(
+ [
+ Literal(
+ Null,
+ ),
+ Literal(
+ True,
+ ),
+ Literal(
+ False,
+ ),
+ Literal(
+ This,
+ ),
+ Literal(
+ Super,
+ ),
+ Literal(
+ Dollar,
+ ),
+ ],
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__obj_extend.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__obj_extend.snap
@@ -0,0 +1,34 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+ObjExtend(
+ Obj(
+ MemberList(
+ ObjMembers {
+ locals: [],
+ asserts: [],
+ fields: [],
+ },
+ ),
+ ),
+ MemberList(
+ ObjMembers {
+ locals: [],
+ asserts: [],
+ fields: [
+ FieldMember {
+ name: Fixed(
+ "x",
+ ) from virtual:<test>:5-6,
+ plus: false,
+ params: None,
+ visibility: Normal,
+ value: Num(
+ 1.0,
+ ),
+ },
+ ],
+ },
+ ),
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__object.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__object.snap
@@ -0,0 +1,47 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+Obj(
+ MemberList(
+ ObjMembers {
+ locals: [],
+ asserts: [],
+ fields: [
+ FieldMember {
+ name: Fixed(
+ "a",
+ ) from virtual:<test>:1-2,
+ plus: false,
+ params: None,
+ visibility: Normal,
+ value: Num(
+ 1.0,
+ ),
+ },
+ FieldMember {
+ name: Fixed(
+ "b",
+ ) from virtual:<test>:7-8,
+ plus: false,
+ params: None,
+ visibility: Hidden,
+ value: Num(
+ 2.0,
+ ),
+ },
+ FieldMember {
+ name: Fixed(
+ "c",
+ ) from virtual:<test>:14-15,
+ plus: false,
+ params: None,
+ visibility: Unhide,
+ value: Num(
+ 3.0,
+ ),
+ },
+ ],
+ },
+ ),
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@array_comp.jsonnet.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@array_comp.jsonnet.snap
@@ -0,0 +1,82 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: v
+input_file: crates/jrsonnet-peg-parser/src/tests/array_comp.jsonnet
+---
+Arr(
+ [
+ ArrComp(
+ Apply(
+ Index {
+ indexable: Var(
+ "std" from virtual:<test>:3-6,
+ ),
+ parts: [
+ IndexPart {
+ span: virtual:<test>:7-15,
+ value: Str(
+ "deepJoin",
+ ),
+ },
+ ],
+ },
+ ArgsDesc {
+ unnamed: [
+ Var(
+ "x" from virtual:<test>:16-17,
+ ),
+ ],
+ named: [],
+ } from virtual:<test>:15-18,
+ false,
+ ),
+ [
+ ForSpec(
+ ForSpecData {
+ destruct: Full(
+ "x",
+ ),
+ over: Var(
+ "arr" from virtual:<test>:28-31,
+ ),
+ },
+ ),
+ ],
+ ),
+ ArrComp(
+ Var(
+ "a" from virtual:<test>:35-36,
+ ),
+ [
+ ForSpec(
+ ForSpecData {
+ destruct: Full(
+ "a",
+ ),
+ over: Var(
+ "b" from virtual:<test>:46-47,
+ ),
+ },
+ ),
+ IfSpec(
+ IfSpecData {
+ span: virtual:<test>:48-50,
+ cond: Var(
+ "c" from virtual:<test>:51-52,
+ ),
+ },
+ ),
+ ForSpec(
+ ForSpecData {
+ destruct: Full(
+ "e",
+ ),
+ over: Var(
+ "f" from virtual:<test>:62-63,
+ ),
+ },
+ ),
+ ],
+ ),
+ ],
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@basic_math.jsonnet.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@basic_math.jsonnet.snap
@@ -0,0 +1,120 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: v
+input_file: crates/jrsonnet-peg-parser/src/tests/basic_math.jsonnet
+---
+Arr(
+ [
+ BinaryOp(
+ BinaryOp {
+ lhs: Num(
+ 2.0,
+ ),
+ op: Add,
+ rhs: BinaryOp(
+ BinaryOp {
+ lhs: Num(
+ 2.0,
+ ),
+ op: Mul,
+ rhs: Num(
+ 2.0,
+ ),
+ },
+ ),
+ },
+ ),
+ BinaryOp(
+ BinaryOp {
+ lhs: Num(
+ 2.0,
+ ),
+ op: Add,
+ rhs: BinaryOp(
+ BinaryOp {
+ lhs: Num(
+ 2.0,
+ ),
+ op: Mul,
+ rhs: Num(
+ 2.0,
+ ),
+ },
+ ),
+ },
+ ),
+ BinaryOp(
+ BinaryOp {
+ lhs: BinaryOp(
+ BinaryOp {
+ lhs: Num(
+ 2.0,
+ ),
+ op: Add,
+ rhs: Num(
+ 2.0,
+ ),
+ },
+ ),
+ op: Add,
+ rhs: BinaryOp(
+ BinaryOp {
+ lhs: Num(
+ 2.0,
+ ),
+ op: Mul,
+ rhs: Num(
+ 2.0,
+ ),
+ },
+ ),
+ },
+ ),
+ BinaryOp(
+ BinaryOp {
+ lhs: Num(
+ 2.0,
+ ),
+ op: Add,
+ rhs: BinaryOp(
+ BinaryOp {
+ lhs: Num(
+ 2.0,
+ ),
+ op: Add,
+ rhs: BinaryOp(
+ BinaryOp {
+ lhs: Num(
+ 2.0,
+ ),
+ op: Mul,
+ rhs: Num(
+ 2.0,
+ ),
+ },
+ ),
+ },
+ ),
+ },
+ ),
+ BinaryOp(
+ BinaryOp {
+ lhs: Num(
+ 2.0,
+ ),
+ op: Add,
+ rhs: BinaryOp(
+ BinaryOp {
+ lhs: Num(
+ 3.0,
+ ),
+ op: Mul,
+ rhs: Num(
+ 4.0,
+ ),
+ },
+ ),
+ },
+ ),
+ ],
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@comment_eof.jsonnet.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@comment_eof.jsonnet.snap
@@ -0,0 +1,26 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: v
+input_file: crates/jrsonnet-peg-parser/src/tests/comment_eof.jsonnet
+---
+Obj(
+ MemberList(
+ ObjMembers {
+ locals: [],
+ asserts: [],
+ fields: [
+ FieldMember {
+ name: Fixed(
+ "a",
+ ) from virtual:<test>:1-2,
+ plus: false,
+ params: None,
+ visibility: Normal,
+ value: Num(
+ 1.0,
+ ),
+ },
+ ],
+ },
+ ),
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@default_nondefault.jsonnet.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@default_nondefault.jsonnet.snap
@@ -0,0 +1,55 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: v
+input_file: crates/jrsonnet-peg-parser/src/tests/default_nondefault.jsonnet
+---
+LocalExpr(
+ [
+ Function {
+ name: "x",
+ params: ExprParams {
+ exprs: [
+ ExprParam {
+ destruct: Full(
+ "foo",
+ ),
+ default: Some(
+ Str(
+ "foo",
+ ),
+ ),
+ },
+ ExprParam {
+ destruct: Full(
+ "bar",
+ ),
+ default: None,
+ },
+ ],
+ signature: FunctionSignature(
+ [
+ ParamParse {
+ name: Named(
+ "foo",
+ ),
+ default: Exists,
+ },
+ ParamParse {
+ name: Named(
+ "bar",
+ ),
+ default: None,
+ },
+ ],
+ ),
+ binds_len: 2,
+ },
+ value: Literal(
+ Null,
+ ),
+ },
+ ],
+ Literal(
+ Null,
+ ),
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@empty_object.jsonnet.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@empty_object.jsonnet.snap
@@ -0,0 +1,14 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: v
+input_file: crates/jrsonnet-peg-parser/src/tests/empty_object.jsonnet
+---
+Obj(
+ MemberList(
+ ObjMembers {
+ locals: [],
+ asserts: [],
+ fields: [],
+ },
+ ),
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@imports.jsonnet.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@imports.jsonnet.snap
@@ -0,0 +1,27 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: v
+input_file: crates/jrsonnet-peg-parser/src/tests/imports.jsonnet
+---
+Arr(
+ [
+ Import(
+ Normal from virtual:<test>:2-8,
+ Str(
+ "hello",
+ ),
+ ),
+ Import(
+ Str from virtual:<test>:18-27,
+ Str(
+ "garnish.txt",
+ ),
+ ),
+ Import(
+ Bin from virtual:<test>:43-52,
+ Str(
+ "garnish.bin",
+ ),
+ ),
+ ],
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@infix.jsonnet.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@infix.jsonnet.snap
@@ -0,0 +1,52 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: v
+input_file: crates/jrsonnet-peg-parser/src/tests/infix.jsonnet
+---
+Arr(
+ [
+ BinaryOp(
+ BinaryOp {
+ lhs: UnaryOp(
+ Not,
+ Var(
+ "a" from virtual:<test>:3-4,
+ ),
+ ),
+ op: And,
+ rhs: UnaryOp(
+ Not,
+ Var(
+ "b" from virtual:<test>:9-10,
+ ),
+ ),
+ },
+ ),
+ UnaryOp(
+ Not,
+ BinaryOp(
+ BinaryOp {
+ lhs: Var(
+ "a" from virtual:<test>:13-14,
+ ),
+ op: Div,
+ rhs: UnaryOp(
+ Not,
+ Var(
+ "b" from virtual:<test>:18-19,
+ ),
+ ),
+ },
+ ),
+ ),
+ UnaryOp(
+ Not,
+ UnaryOp(
+ Not,
+ Var(
+ "a" from virtual:<test>:23-24,
+ ),
+ ),
+ ),
+ ],
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@multiline.jsonnet.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@multiline.jsonnet.snap
@@ -0,0 +1,21 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: v
+input_file: crates/jrsonnet-peg-parser/src/tests/multiline.jsonnet
+---
+Arr(
+ [
+ Str(
+ "Hello world!\na\n",
+ ),
+ Str(
+ "Hello world!\na\n",
+ ),
+ Str(
+ "Hello world!\n\ta\n",
+ ),
+ Str(
+ "Hello world!\n a\n",
+ ),
+ ],
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@reserved.jsonnet.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@reserved.jsonnet.snap
@@ -0,0 +1,32 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: v
+input_file: crates/jrsonnet-peg-parser/src/tests/reserved.jsonnet
+---
+Arr(
+ [
+ Literal(
+ Null,
+ ),
+ Var(
+ "nulla" from virtual:<test>:8-13,
+ ),
+ Apply(
+ Var(
+ "a" from virtual:<test>:15-16,
+ ),
+ ArgsDesc {
+ unnamed: [
+ Var(
+ "b" from virtual:<test>:17-18,
+ ),
+ Var(
+ "null_fields" from virtual:<test>:20-31,
+ ),
+ ],
+ named: [],
+ } from virtual:<test>:16-32,
+ false,
+ ),
+ ],
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@slice.jsonnet.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@slice.jsonnet.snap
@@ -0,0 +1,97 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: v
+input_file: crates/jrsonnet-peg-parser/src/tests/slice.jsonnet
+---
+Arr(
+ [
+ Slice(
+ Slice {
+ value: Var(
+ "a" from virtual:<test>:2-3,
+ ),
+ slice: SliceDesc {
+ start: Some(
+ Num(
+ 1.0,
+ ) from virtual:<test>:4-5,
+ ),
+ end: None,
+ step: None,
+ },
+ },
+ ),
+ Slice(
+ Slice {
+ value: Var(
+ "a" from virtual:<test>:9-10,
+ ),
+ slice: SliceDesc {
+ start: Some(
+ Num(
+ 1.0,
+ ) from virtual:<test>:11-12,
+ ),
+ end: None,
+ step: None,
+ },
+ },
+ ),
+ Slice(
+ Slice {
+ value: Var(
+ "a" from virtual:<test>:17-18,
+ ),
+ slice: SliceDesc {
+ start: None,
+ end: Some(
+ Num(
+ 1.0,
+ ) from virtual:<test>:20-21,
+ ),
+ step: None,
+ },
+ },
+ ),
+ Slice(
+ Slice {
+ value: Var(
+ "a" from virtual:<test>:25-26,
+ ),
+ slice: SliceDesc {
+ start: None,
+ end: None,
+ step: Some(
+ Num(
+ 1.0,
+ ) from virtual:<test>:29-30,
+ ),
+ },
+ },
+ ),
+ Slice(
+ Slice {
+ value: Var(
+ "str" from virtual:<test>:33-36,
+ ),
+ slice: SliceDesc {
+ start: None,
+ end: Some(
+ BinaryOp(
+ BinaryOp {
+ lhs: Var(
+ "len" from virtual:<test>:38-41,
+ ),
+ op: Sub,
+ rhs: Num(
+ 1.0,
+ ),
+ },
+ ) from virtual:<test>:38-45,
+ ),
+ step: None,
+ },
+ },
+ ),
+ ],
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@string_escaping.jsonnet.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@string_escaping.jsonnet.snap
@@ -0,0 +1,24 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: v
+input_file: crates/jrsonnet-peg-parser/src/tests/string_escaping.jsonnet
+---
+Arr(
+ [
+ Str(
+ "Hello, \"world\"!",
+ ),
+ Str(
+ "Hello 'world'!",
+ ),
+ Str(
+ "\\\\",
+ ),
+ Str(
+ "Hello\nWorld",
+ ),
+ Str(
+ "Hello\\n\"World\"",
+ ),
+ ],
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@subexp.jsonnet.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@subexp.jsonnet.snap
@@ -0,0 +1,58 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: v
+input_file: crates/jrsonnet-peg-parser/src/tests/subexp.jsonnet
+---
+BinaryOp(
+ BinaryOp {
+ lhs: ObjExtend(
+ Obj(
+ MemberList(
+ ObjMembers {
+ locals: [],
+ asserts: [],
+ fields: [],
+ },
+ ),
+ ),
+ MemberList(
+ ObjMembers {
+ locals: [
+ Field {
+ into: Full(
+ "x",
+ ),
+ value: Num(
+ 1.0,
+ ),
+ },
+ ],
+ asserts: [],
+ fields: [
+ FieldMember {
+ name: Fixed(
+ "x",
+ ) from virtual:<test>:18-19,
+ plus: false,
+ params: None,
+ visibility: Normal,
+ value: Var(
+ "x" from virtual:<test>:21-22,
+ ),
+ },
+ ],
+ },
+ ),
+ ),
+ op: Add,
+ rhs: Obj(
+ MemberList(
+ ObjMembers {
+ locals: [],
+ asserts: [],
+ fields: [],
+ },
+ ),
+ ),
+ },
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@suffix.jsonnet.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@suffix.jsonnet.snap
@@ -0,0 +1,73 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: v
+input_file: crates/jrsonnet-peg-parser/src/tests/suffix.jsonnet
+---
+Arr(
+ [
+ Index {
+ indexable: Var(
+ "std" from virtual:<test>:2-5,
+ ),
+ parts: [
+ IndexPart {
+ span: virtual:<test>:6-10,
+ value: Str(
+ "test",
+ ),
+ },
+ ],
+ },
+ Apply(
+ Var(
+ "std" from virtual:<test>:12-15,
+ ),
+ ArgsDesc {
+ unnamed: [
+ Num(
+ 2.0,
+ ),
+ ],
+ named: [],
+ } from virtual:<test>:15-18,
+ false,
+ ),
+ Apply(
+ Index {
+ indexable: Var(
+ "std" from virtual:<test>:20-23,
+ ),
+ parts: [
+ IndexPart {
+ span: virtual:<test>:24-28,
+ value: Str(
+ "test",
+ ),
+ },
+ ],
+ },
+ ArgsDesc {
+ unnamed: [
+ Num(
+ 2.0,
+ ),
+ ],
+ named: [],
+ } from virtual:<test>:28-31,
+ false,
+ ),
+ Index {
+ indexable: Var(
+ "a" from virtual:<test>:33-34,
+ ),
+ parts: [
+ IndexPart {
+ span: virtual:<test>:35-36,
+ value: Var(
+ "b" from virtual:<test>:35-36,
+ ),
+ },
+ ],
+ },
+ ],
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__slice.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__slice.snap
@@ -0,0 +1,72 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+Arr(
+ [
+ Slice(
+ Slice {
+ value: Var(
+ "a" from virtual:<test>:1-2,
+ ),
+ slice: SliceDesc {
+ start: Some(
+ Num(
+ 1.0,
+ ) from virtual:<test>:3-4,
+ ),
+ end: None,
+ step: None,
+ },
+ },
+ ),
+ Slice(
+ Slice {
+ value: Var(
+ "a" from virtual:<test>:8-9,
+ ),
+ slice: SliceDesc {
+ start: Some(
+ Num(
+ 1.0,
+ ) from virtual:<test>:10-11,
+ ),
+ end: None,
+ step: None,
+ },
+ },
+ ),
+ Slice(
+ Slice {
+ value: Var(
+ "a" from virtual:<test>:16-17,
+ ),
+ slice: SliceDesc {
+ start: None,
+ end: Some(
+ Num(
+ 1.0,
+ ) from virtual:<test>:19-20,
+ ),
+ step: None,
+ },
+ },
+ ),
+ Slice(
+ Slice {
+ value: Var(
+ "a" from virtual:<test>:24-25,
+ ),
+ slice: SliceDesc {
+ start: None,
+ end: None,
+ step: Some(
+ Num(
+ 1.0,
+ ) from virtual:<test>:28-29,
+ ),
+ },
+ },
+ ),
+ ],
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__strings.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__strings.snap
@@ -0,0 +1,20 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+Arr(
+ [
+ Str(
+ "hello",
+ ),
+ Str(
+ "world",
+ ),
+ Str(
+ "raw\"str",
+ ),
+ Str(
+ "raw'str",
+ ),
+ ],
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__unary_ops.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__unary_ops.snap
@@ -0,0 +1,21 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+BinaryOp(
+ BinaryOp {
+ lhs: UnaryOp(
+ Not,
+ Var(
+ "a" from virtual:<test>:1-2,
+ ),
+ ),
+ op: And,
+ rhs: UnaryOp(
+ Not,
+ Var(
+ "b" from virtual:<test>:7-8,
+ ),
+ ),
+ },
+)
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__underscore_numbers.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__underscore_numbers.snap
@@ -0,0 +1,17 @@
+---
+source: crates/jrsonnet-ir-parser/src/lib.rs
+expression: "format!(\"{v:#?}\")"
+---
+Arr(
+ [
+ Num(
+ 1000.0,
+ ),
+ Num(
+ 1000.0001,
+ ),
+ Num(
+ 100000000000.0,
+ ),
+ ],
+)
tests/Cargo.tomldiffbeforeafterboth--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -4,6 +4,11 @@
edition = "2024"
publish = false
+[features]
+default = ["ir-parser"]
+ir-parser = ["jrsonnet-evaluator/ir-parser"]
+exp-null-coaelse = ["jrsonnet-evaluator/exp-null-coaelse"]
+
[lints]
workspace = true
tests/cpp_test_suite_golden_override/error.parse.array_comma.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.array_comma.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.array_comma.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected one of "(", ".", "?", "[", "]", "{", <binary op>, <comma>, got "3"
+syntax error: expected R_BRACK, got "3"
error.parse.array_comma.jsonnet:17:7
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.function_arg_positional_after_named.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.function_arg_positional_after_named.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.function_arg_positional_after_named.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected one of "(", ".", "?", "[", "{", <binary op>, <comma>, <named argument>, got ")"
- error.parse.function_arg_positional_after_named.jsonnet:19:11
\ No newline at end of file
+syntax error: positional argument after named argument
+ error.parse.function_arg_positional_after_named.jsonnet:19:10
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.index_unterminated.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.index_unterminated.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.index_unterminated.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected one of "(", ":", "[", "{", <identifier>, <number>, <string>, <unary op>, ['"'], ['\''], got "EOF"
- error.parse.index_unterminated.jsonnet:17:4
\ No newline at end of file
+syntax error: unexpected token in expression: EOF
+ error.parse.index_unterminated.jsonnet:17:3
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.method_plus.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.method_plus.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.method_plus.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected one of ":", "::", ":::", got "+"
+syntax error: expected COLON, got "+"
error.parse.method_plus.jsonnet:17:18
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.object_comma.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.object_comma.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.object_comma.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected one of "(", ".", "?", "[", "{", "}", <binary op>, got "z"
+syntax error: expected R_BRACE, got "z"
error.parse.object_comma.jsonnet:17:11
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.object_comprehension_local_clash.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.object_comprehension_local_clash.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.object_comprehension_local_clash.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected one of "(", ".", "?", "[", "{", "}", <binary op>, <comma>, got ":"
+syntax error: expected R_BRACE, got ":"
error.parse.object_comprehension_local_clash.jsonnet:17:29
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.self_in_computed_field.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.self_in_computed_field.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.self_in_computed_field.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected one of "[", "}", <identifier>, <string>, ['"'], ['\''], got "s"
+syntax error: expected field name, got SELF_KW
error.parse.self_in_computed_field.jsonnet:17:15
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.static_error_bad_number.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.static_error_bad_number.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.static_error_bad_number.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected one of "(", "[", "{", <identifier>, <number>, <string>, <unary op>, ['"'], ['\''], got "."
+syntax error: unexpected token in expression: DOT
error.parse.static_error_bad_number.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected <escape character>, got "o"
- error.parse.string.invalid_escape.jsonnet:17:3
\ No newline at end of file
+syntax error: invalid string escape
+ error.parse.string.invalid_escape.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape_unicode_non_hex.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape_unicode_non_hex.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape_unicode_non_hex.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected <hex char>, got "t"
- error.parse.string.invalid_escape_unicode_non_hex.jsonnet:17:7
\ No newline at end of file
+syntax error: invalid string escape
+ error.parse.string.invalid_escape_unicode_non_hex.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape_unicode_short.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape_unicode_short.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape_unicode_short.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected <hex char>, got "\n"
- error.parse.string.invalid_escape_unicode_short.jsonnet:17:7
\ No newline at end of file
+syntax error: unexpected token: ERROR_STRING_DOUBLE_UNTERMINATED
+ error.parse.string.invalid_escape_unicode_short.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape_unicode_short2.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape_unicode_short2.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape_unicode_short2.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected <hex char>, got "\""
- error.parse.string.invalid_escape_unicode_short2.jsonnet:17:7
\ No newline at end of file
+syntax error: invalid string escape
+ error.parse.string.invalid_escape_unicode_short2.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape_unicode_short3.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape_unicode_short3.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.string.invalid_escape_unicode_short3.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected <hex char>, got "\n"
- error.parse.string.invalid_escape_unicode_short3.jsonnet:17:7
\ No newline at end of file
+syntax error: unexpected token: ERROR_STRING_DOUBLE_UNTERMINATED
+ error.parse.string.invalid_escape_unicode_short3.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.string.unfinished.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.string.unfinished.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.string.unfinished.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected one of "\\\\", "\\u", "\\x", ['"'], ['\\'], [_], got "EOF"
- error.parse.string.unfinished.jsonnet:17:3
\ No newline at end of file
+syntax error: unexpected token: ERROR_STRING_DOUBLE_UNTERMINATED
+ error.parse.string.unfinished.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.string.unfinished2.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.string.unfinished2.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.string.unfinished2.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected one of "\\\\", "\\u", "\\x", ['\''], ['\\'], [_], got "EOF"
- error.parse.string.unfinished2.jsonnet:17:3
\ No newline at end of file
+syntax error: unexpected token: ERROR_STRING_SINGLE_UNTERMINATED
+ error.parse.string.unfinished2.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.string_multi_no_newline.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.string_multi_no_newline.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.string_multi_no_newline.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected one of "(", "[", "{", <identifier>, <number>, <string>, <unary op>, ['"'], ['\''], got "|"
+syntax error: unexpected token: ERROR_STRING_BLOCK_MISSING_NEW_LINE
error.parse.string_multi_no_newline.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.text_block_bad_whitespace.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.text_block_bad_whitespace.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.text_block_bad_whitespace.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected one of "(", "[", "{", <identifier>, <number>, <string>, <unary op>, ['"'], ['\''], got "|"
+syntax error: unexpected token: ERROR_STRING_BLOCK_MISSING_TERMINATION
error.parse.text_block_bad_whitespace.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.text_block_eof.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.text_block_eof.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.text_block_eof.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected one of "(", "[", "{", <identifier>, <number>, <string>, <unary op>, ['"'], ['\''], got "|"
+syntax error: unexpected token: ERROR_STRING_BLOCK_UNEXPECTED_END
error.parse.text_block_eof.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override/error.parse.text_block_not_terminated.jsonnet.goldendiffbeforeafterboth--- a/tests/cpp_test_suite_golden_override/error.parse.text_block_not_terminated.jsonnet.golden
+++ b/tests/cpp_test_suite_golden_override/error.parse.text_block_not_terminated.jsonnet.golden
@@ -1,2 +1,2 @@
-syntax error: expected one of "(", "[", "{", <identifier>, <number>, <string>, <unary op>, ['"'], ['\''], got "|"
+syntax error: unexpected token: ERROR_STRING_BLOCK_UNEXPECTED_END
error.parse.text_block_not_terminated.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.import_syntax-error.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.import_syntax-error.jsonnet.golden
@@ -0,0 +1,3 @@
+syntax error: unterminated double-quoted string
+ syntax_error.jsonnet:1:1
+ error.import_syntax-error.jsonnet:1:1-8: import "lib/syntax_error.jsonnet"
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.overflow.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.overflow.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: numbers are finite
+ error.overflow.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.overflow3.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.overflow3.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: numbers are finite
+ error.overflow3.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.array_comma.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.array_comma.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: expected ']', got number "3"
+ error.parse.array_comma.jsonnet:17:7
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.index_unterminated.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.index_unterminated.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: unexpected end of file
+ error.parse.index_unterminated.jsonnet:17:3
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.method_plus.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.method_plus.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: expected ':', got '+'
+ error.parse.method_plus.jsonnet:17:18
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.object_comma.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.object_comma.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: expected '}', got identifier "z"
+ error.parse.object_comma.jsonnet:17:11
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.object_comprehension_local_clash.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.object_comprehension_local_clash.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: expected '}', got ':'
+ error.parse.object_comprehension_local_clash.jsonnet:17:29
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.self_in_computed_field.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.self_in_computed_field.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: expected field name, got 'self'
+ error.parse.self_in_computed_field.jsonnet:17:15
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.static_error_bad_number.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.static_error_bad_number.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: unexpected '.'
+ error.parse.static_error_bad_number.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.string.invalid_escape_unicode_short.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.string.invalid_escape_unicode_short.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: unterminated double-quoted string
+ error.parse.string.invalid_escape_unicode_short.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.string.invalid_escape_unicode_short3.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.string.invalid_escape_unicode_short3.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: unterminated double-quoted string
+ error.parse.string.invalid_escape_unicode_short3.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.string.unfinished.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.string.unfinished.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: unterminated double-quoted string
+ error.parse.string.unfinished.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.string.unfinished2.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.string.unfinished2.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: unterminated single-quoted string
+ error.parse.string.unfinished2.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.string_multi_no_newline.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.string_multi_no_newline.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: text block requires new line after |||
+ error.parse.string_multi_no_newline.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.text_block_bad_whitespace.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.text_block_bad_whitespace.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: unterminated text block
+ error.parse.text_block_bad_whitespace.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.text_block_eof.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.text_block_eof.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: unexpected end of text block
+ error.parse.text_block_eof.jsonnet:17:1
\ No newline at end of file
tests/cpp_test_suite_golden_override_ir_parser/error.parse.text_block_not_terminated.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/cpp_test_suite_golden_override_ir_parser/error.parse.text_block_not_terminated.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: unexpected end of text block
+ error.parse.text_block_not_terminated.jsonnet:17:1
\ No newline at end of file
tests/go_testdata_golden_override_ir_parser/error_hexnumber.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/go_testdata_golden_override_ir_parser/error_hexnumber.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: expected end of file, got identifier "x42"
+ error_hexnumber.jsonnet:1:2
\ No newline at end of file
tests/go_testdata_golden_override_ir_parser/import_syntax_error.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/go_testdata_golden_override_ir_parser/import_syntax_error.jsonnet.golden
@@ -0,0 +1,3 @@
+syntax error: unexpected end of file
+ syntax_error.jsonnet:1:4
+ import_syntax_error.jsonnet:1:1-8: import "syntax_error.jsonnet"
\ No newline at end of file
tests/go_testdata_golden_override_ir_parser/object_comp_assert.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/go_testdata_golden_override_ir_parser/object_comp_assert.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: asserts are unsupported in object comprehension
+ object_comp_assert.jsonnet:1:46
\ No newline at end of file
tests/go_testdata_golden_override_ir_parser/object_comp_illegal.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/go_testdata_golden_override_ir_parser/object_comp_illegal.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: missing object comprehension field
+ object_comp_illegal.jsonnet:1:34
\ No newline at end of file
tests/go_testdata_golden_override_ir_parser/static_error_eof.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/go_testdata_golden_override_ir_parser/static_error_eof.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: expected ';', got end of file
+ static_error_eof.jsonnet:1:12
\ No newline at end of file
tests/go_testdata_golden_override_ir_parser/syntax_error.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/go_testdata_golden_override_ir_parser/syntax_error.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: unexpected end of file
+ syntax_error.jsonnet:1:4
\ No newline at end of file
tests/go_testdata_golden_override_ir_parser/unfinished_args.jsonnet.goldendiffbeforeafterboth--- /dev/null
+++ b/tests/go_testdata_golden_override_ir_parser/unfinished_args.jsonnet.golden
@@ -0,0 +1,2 @@
+syntax error: expected ')', got end of file
+ unfinished_args.jsonnet:1:17
\ No newline at end of file
tests/golden/null_coalesce_chain.jsonnetdiffbeforeafterboth--- /dev/null
+++ b/tests/golden/null_coalesce_chain.jsonnet
@@ -0,0 +1,10 @@
+// Regression test: chained index a.b.c.d should produce a single
+// Index { a, [b, c, d] } not nested Index nodes.
+// This matters for exp-null-coaelse where a?.b.c should skip .c if .b is null.
+
+local obj = { a: { b: { c: 42 } } };
+
+[
+ obj.a.b.c,
+ {a: {b: 1}}.a.b,
+]
tests/golden_null_coalesce/null_coalesce_access.jsonnetdiffbeforeafterboth--- /dev/null
+++ b/tests/golden_null_coalesce/null_coalesce_access.jsonnet
@@ -0,0 +1,18 @@
+// Test null-coalesce chained access: a?.b.c should return null when b is missing,
+// not fail with "field c not found on null".
+
+local obj = { a: { b: { c: 42 } } };
+
+[
+ // null-coalesce on missing field should return null, not error
+ obj?.missing.b.c,
+
+ // null-coalesce on present field continues
+ obj?.a.b.c,
+
+ // null-coalesce with bracket index
+ obj?.["missing"].b.c,
+
+ // chained null-coalesce
+ obj?.a?.missing.c,
+]
tests/tests/cpp_test_suite.rsdiffbeforeafterboth--- a/tests/tests/cpp_test_suite.rs
+++ b/tests/tests/cpp_test_suite.rs
@@ -241,9 +241,26 @@
golden = Some(golden_path);
}
+ // ir-parser has its own override layer
+ #[cfg(feature = "ir-parser")]
+ let ir_parser_override_path = {
+ let p = root_tests
+ .join(format!("{root_dir}_golden_override_ir_parser"))
+ .join(golden_path.file_name().expect("file has basename"));
+ if let Some(golden_path) = read_file(&p)? {
+ golden = Some(golden_path);
+ }
+ p
+ };
+
// Otherwise assume test should just not fail and return true.
let golden = golden.unwrap_or_else(|| "true".to_owned());
+ #[cfg(feature = "ir-parser")]
+ let update_golden_path = &ir_parser_override_path;
+ #[cfg(not(feature = "ir-parser"))]
+ let update_golden_path = &golden_override;
+
match (serde_json::from_str(&result), serde_json::from_str(&golden)) {
(Err(_), Ok(_)) => panic!(
"unexpected error for golden {}:\n<got>\n{result}\n</got>\n<golden>\n{golden}\n</golden>",
@@ -258,7 +275,7 @@
let diff = JsonDiff::diff_string(&golden, &result_v, false);
if let Some(diff) = diff {
if env::var_os("UPDATE_GOLDEN").is_some() {
- fs::write(golden_override, result)?;
+ fs::write(update_golden_path, result)?;
} else {
panic!(
"Result \n{result_v:#}\n\
@@ -273,7 +290,7 @@
(Err(_), Err(_)) => {
if result != golden.trim_end() {
if env::var_os("UPDATE_GOLDEN").is_some() {
- fs::write(golden_override, result)?;
+ fs::write(update_golden_path, result)?;
} else {
panic!(
"golden didn't match for {}:\n<got>\n{result}\n</got>\n<golden>\n{golden}\n</golden>",
tests/tests/golden.rsdiffbeforeafterboth--- a/tests/tests/golden.rs
+++ b/tests/tests/golden.rs
@@ -45,3 +45,13 @@
assert_snapshot!(result);
});
}
+
+#[test]
+#[cfg(feature = "exp-null-coaelse")]
+fn golden_null_coalesce() {
+ glob!("../", "golden_null_coalesce/*.jsonnet", |path| {
+ let result = run(path);
+
+ assert_snapshot!(result);
+ });
+}
tests/tests/snapshots/golden__golden@null_coalesce_chain.jsonnet.snapdiffbeforeafterboth--- /dev/null
+++ b/tests/tests/snapshots/golden__golden@null_coalesce_chain.jsonnet.snap
@@ -0,0 +1,9 @@
+---
+source: tests/tests/golden.rs
+expression: result
+input_file: tests/golden/null_coalesce_chain.jsonnet
+---
+[
+ 42,
+ 1
+]
tests/tests/snapshots/golden__golden_null_coalesce.snapdiffbeforeafterboth--- /dev/null
+++ b/tests/tests/snapshots/golden__golden_null_coalesce.snap
@@ -0,0 +1,11 @@
+---
+source: tests/tests/golden.rs
+expression: result
+input_file: tests/golden_null_coalesce/null_coalesce_access.jsonnet
+---
+[
+ null,
+ 42,
+ null,
+ null
+]