difftreelog
fix exp-destruct
in: master
7 files changed
crates/jrsonnet-evaluator/src/analyze.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/analyze.rs
+++ b/crates/jrsonnet-evaluator/src/analyze.rs
@@ -425,7 +425,7 @@
/// h = 1 => referenced += [], closures += 0, destructs += 1
/// And the result is
///
- /// ```
+ /// ```rust,ignore
/// Closures {
/// referenced: vec![d, e, f, a, b, c, h]
/// spec_shapes: vec![(3, 3), (4, 3), (0, 1)],
crates/jrsonnet-evaluator/src/evaluate/compspec.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/compspec.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/compspec.rs
@@ -195,7 +195,7 @@
) -> Result<()> {
if idx >= specs.len() {
collector.reserve(guaranteed_reserve);
- return collector.collect(ctx.clone());
+ return collector.collect(ctx);
}
match &specs[idx] {
LCompSpec::If(cond) => {
@@ -239,18 +239,20 @@
)?;
}
}
+ // TODO: Should not be eager? CoW won't work here
#[cfg(feature = "exp-destruct")]
_ => {
for (i, item) in arr.iter().enumerate() {
let item_val = item?;
let mut inner_builder = ContextBuilder::extend(ctx.clone(), 1);
+ let fctx = Pending::new();
destructure::destruct(
destruct,
Thunk::evaluated(item_val),
- None,
+ fctx.clone(),
&mut inner_builder,
);
- let inner_ctx = inner_builder.build();
+ let inner_ctx = inner_builder.build().into_future(fctx);
evaluate_compspecs_eager(
inner_ctx,
specs,
crates/jrsonnet-evaluator/src/evaluate/destructure.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
@@ -12,7 +12,7 @@
#[allow(dead_code, reason = "not dead in exp-destruct")]
fn destruct_array(
start: &[LDestruct],
- rest: Option<LDestructRest>,
+ rest: Option<&LDestructRest>,
end: &[LDestruct],
value: Thunk<Val>,
@@ -56,7 +56,7 @@
if let Some(crate::analyze::LDestructRest::Keep(id)) = rest {
let full = full.clone();
builder.bind(
- id,
+ *id,
Thunk!(move || {
let full = full.evaluate()?;
let to = full.len() - end_len;
@@ -88,7 +88,7 @@
#[allow(dead_code, reason = "not dead in exp-destruct")]
fn destruct_object(
fields: &[LDestructField],
- rest: Option<LDestructRest>,
+ rest: Option<&LDestructRest>,
value: Thunk<Val>,
fctx: Pending<Context>,
@@ -127,7 +127,7 @@
if let Some(crate::analyze::LDestructRest::Keep(id)) = rest {
let full = full.clone();
builder.bind(
- id,
+ *id,
Thunk!(move || {
let full = full.evaluate()?;
let mut out = ObjValueBuilder::new();
@@ -178,9 +178,13 @@
#[cfg(feature = "exp-destruct")]
LDestruct::Skip => {}
#[cfg(feature = "exp-destruct")]
- LDestruct::Array { start, rest, end } => destruct_array(start, rest, end, value, fctx, builder),
+ LDestruct::Array { start, rest, end } => {
+ destruct_array(start, rest.as_ref(), end, value, fctx, builder)
+ }
#[cfg(feature = "exp-destruct")]
- LDestruct::Object { fields, rest } => destruct_object(fields, rest, value, fctx, builder),
+ LDestruct::Object { fields, rest } => {
+ destruct_object(fields, rest.as_ref(), value, fctx, builder)
+ }
}
}
crates/jrsonnet-evaluator/src/snapshots/jrsonnet_evaluator__analyze__tests__snapshots@redeclared_local.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/snapshots/jrsonnet_evaluator__analyze__tests__snapshots@redeclared_local.jsonnet.snap
+++ b/crates/jrsonnet-evaluator/src/snapshots/jrsonnet_evaluator__analyze__tests__snapshots@redeclared_local.jsonnet.snap
@@ -1,7 +1,7 @@
---
source: crates/jrsonnet-evaluator/src/analyze.rs
expression: rendered
-input_file: crates/jrsonnet-evaluator/src/analyze_tests/redeclared_local.jsonnet
+input_file: crates/jrsonnet-evaluator/src/analysis_tests/redeclared_local.jsonnet
---
--- source ---
local x = 1, x = 2; x
@@ -10,7 +10,7 @@
local_dependent_depth: 0
errored: true
--- diagnostics ---
- · ╭── variable redeclared: x
+ · ╭── local is already defined in the current frame: x
1 │ local x = 1, x = 2; x
2 │
--- lir ---
crates/jrsonnet-ir-parser/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/lib.rs
+++ b/crates/jrsonnet-ir-parser/src/lib.rs
@@ -381,7 +381,7 @@
None
};
let default = if p.try_eat(T![=]) {
- Some(Rc::new(spanned(p, expr)?))
+ Some(spanned(p, expr)?)
} else {
None
};
@@ -466,8 +466,10 @@
if !p.at(SyntaxKind::IDENT) {
let d = destruct(p)?;
p.eat(T![=])?;
- let value = Rc::new(expr(p)?);
- return Ok(BindSpec::Field { into: d, value });
+ return Ok(BindSpec::Field {
+ into: d,
+ value: expr(p)?,
+ });
}
}
let name_spanned = spanned(p, ident)?;
crates/jrsonnet-ir/src/expr.rsdiffbeforeafterboth--- a/crates/jrsonnet-ir/src/expr.rs
+++ b/crates/jrsonnet-ir/src/expr.rs
@@ -211,7 +211,7 @@
}
}
-#[derive(Debug, Clone, PartialEq, Eq, Acyclic)]
+#[derive(Debug, PartialEq, Eq, Acyclic)]
pub enum DestructRest {
/// ...rest
Keep(IStr),
@@ -219,7 +219,7 @@
Drop,
}
-#[derive(Debug, Clone, PartialEq, Acyclic)]
+#[derive(Debug, PartialEq, Acyclic)]
pub enum Destruct {
Full(Spanned<IStr>),
#[cfg(feature = "exp-destruct")]
@@ -233,7 +233,7 @@
#[cfg(feature = "exp-destruct")]
Object {
#[allow(clippy::type_complexity)]
- fields: Vec<(IStr, Option<Destruct>, Option<Rc<Spanned<Expr>>>)>,
+ fields: Vec<(IStr, Option<Destruct>, Option<Spanned<Expr>>)>,
rest: Option<DestructRest>,
},
}
crates/jrsonnet-peg-parser/src/lib.rsdiffbeforeafterboth1use jrsonnet_gcmodule::Acyclic;2use jrsonnet_ir::{3 ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BindSpec, CompSpec, Destruct, DestructRest, Expr,4 ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IfElse, IfSpecData,5 ImportKind, IndexPart, LiteralType, Member, NumValue, ObjBody, ObjComp, ObjMembers, Slice,6 SliceDesc, Source, Span, Spanned, Visibility, unescape,7};8use peg::parser;910pub struct ParserSettings {11 pub source: Source,12}1314macro_rules! expr_bin {15 ($a:ident $op:ident $b:ident) => {16 Expr::BinaryOp(Box::new(BinaryOp {17 lhs: $a,18 op: $op,19 rhs: $b,20 }))21 };22}23macro_rules! expr_un {24 ($op:ident $a:ident) => {25 Expr::UnaryOp($op, Box::new($a))26 };27}2829parser! {30 pub grammar jsonnet_parser() for str {31 use peg::ParseLiteral;3233 rule eof() = quiet!{![_]} / expected!("<eof>")34 rule eol() = "\n" / eof()3536 /// Standard C-like comments37 rule comment()38 = "//" (!eol()[_])* eol()39 / "/*" (!("*/")[_])* "*/"40 / "#" (!eol()[_])* eol()4142 rule single_whitespace() = quiet!{([' ' | '\r' | '\n' | '\t'] / comment())} / expected!("<whitespace>")43 rule _() = quiet!{([' ' | '\r' | '\n' | '\t']+) / comment()}* / expected!("<whitespace>")4445 /// For comma-delimited elements46 rule comma() = quiet!{_ "," _} / expected!("<comma>")47 rule alpha() -> char = c:$(['_' | 'a'..='z' | 'A'..='Z']) {c.chars().next().unwrap()}48 rule digit() -> char = d:$(['0'..='9']) {d.chars().next().unwrap()}49 rule end_of_ident() = !['0'..='9' | '_' | 'a'..='z' | 'A'..='Z']50 /// Sequence of digits51 rule uint_str() -> &'input str = a:$(digit()+ ("_" digit()+)*) { a }52 /// Number in scientific notation format53 rule number() -> f64 = quiet!{a:$(uint_str() ("." uint_str())? (['e'|'E'] (s:['+'|'-'])? uint_str())?) {? a.replace('_',"").parse().map_err(|_| "<number>") }} / expected!("<number>")5455 /// Reserved word followed by any non-alphanumberic56 rule reserved() = ("assert" / "else" / "error" / "false" / "for" / "function" / "if" / "import" / "importstr" / "importbin" / "in" / "local" / "null" / "tailstrict" / "then" / "self" / "super" / "true") end_of_ident()57 rule id() -> IStr = v:$(quiet!{ !reserved() alpha() (alpha() / digit())*} / expected!("<identifier>")) { v.into() }5859 rule keyword(id: &'static str) -> ()60 = #{|input, pos| input.parse_string_literal(pos, id)} end_of_ident()6162 pub rule param(s: &ParserSettings) -> ExprParam = destruct:destruct(s) default:(_ "=" _ default:expr(s){default})? { ExprParam { destruct, default } }63 pub rule params(s: &ParserSettings) -> ExprParams64 = params:param(s) ** comma() comma()? { ExprParams::new(params) }65 / { ExprParams::new(Vec::new()) }6667 pub rule arg(s: &ParserSettings) -> (Option<IStr>, Expr)68 = name:(quiet! { (s:id() _ "=" !['='] _ {s})? } / expected!("<argument name>")) expr:expr(s) {(name, expr)}6970 pub rule args(s: &ParserSettings) -> ArgsDesc71 = args:arg(s)**comma() comma()? {?72 let unnamed_count = args.iter().take_while(|(n, _)| n.is_none()).count();73 let mut unnamed = Vec::with_capacity(unnamed_count);74 let mut names = Vec::with_capacity(args.len() - unnamed_count);75 let mut values = Vec::with_capacity(args.len() - unnamed_count);76 let mut named_started = false;77 for (name, value) in args {78 if let Some(name) = name {79 named_started = true;80 names.push(name);81 values.push(value);82 } else {83 if named_started {84 return Err("<named argument>")85 }86 unnamed.push(value);87 }88 }89 Ok(ArgsDesc{unnamed, names, values})90 }9192 pub rule destruct_rest() -> DestructRest93 = "..." into:(_ into:id() {into})? {into.map_or_else(|| DestructRest::Drop, DestructRest::Keep)}94 pub rule destruct_array(s: &ParserSettings) -> Destruct95 = "[" _ start:destruct(s)**comma() rest:(96 comma() _ rest:destruct_rest()? end:(97 comma() end:destruct(s)**comma() (_ comma())? {end}98 / comma()? {Vec::new()}99 ) {(rest, end)}100 / comma()? {(None, Vec::new())}101 ) _ "]" {?102 #[cfg(feature = "exp-destruct")] return Ok(Destruct::Array {103 start,104 rest: rest.0,105 end: rest.1,106 });107 #[cfg(not(feature = "exp-destruct"))] Err("!!!experimental destructuring was not enabled")108 }109 pub rule destruct_object(s: &ParserSettings) -> Destruct110 = "{" _111 fields:(name:id() into:(_ ":" _ into:destruct(s) {into})? default:(_ "=" _ v:spanned(<expr(s)>, s) {v})? {(name, into, default)})**comma()112 rest:(113 comma() rest:destruct_rest()? {rest}114 / comma()? {None}115 )116 _ "}" {?117 #[cfg(feature = "exp-destruct")] return Ok(Destruct::Object {118 fields,119 rest,120 });121 #[cfg(not(feature = "exp-destruct"))] Err("!!!experimental destructuring was not enabled")122 }123 pub rule destruct(s: &ParserSettings) -> Destruct124 = v:spanned(<id()>, s) {Destruct::Full(v)}125 / "?" {?126 #[cfg(feature = "exp-destruct")] return Ok(Destruct::Skip);127 #[cfg(not(feature = "exp-destruct"))] Err("!!!experimental destructuring was not enabled")128 }129 / arr:destruct_array(s) {arr}130 / obj:destruct_object(s) {obj}131132 pub rule bind(s: &ParserSettings) -> BindSpec133 = into:destruct(s) _ "=" _ value:expr(s) {BindSpec::Field{into, value}}134 / name:id() _ "(" _ params:params(s) _ ")" _ "=" _ value:expr(s) {BindSpec::Function{name, params, value}}135136 pub rule assertion(s: &ParserSettings) -> AssertStmt137 = keyword("assert") _ assertion:spanned(<expr(s)>, s) message:(_ ":" _ e:expr(s) {e})? { AssertStmt{assertion, message} }138139 pub rule whole_line() -> &'input str140 = str:$((!['\n'][_])* "\n") {str}141 pub rule string_block() -> String142 = "|||" chomped:"-"? (!['\n']single_whitespace())* "\n"143 empty_lines:$(['\n']*)144 prefix:[' ' | '\t']+ first_line:whole_line()145 lines:("\n" {"\n"} / [' ' | '\t']*<{prefix.len()}> s:whole_line() {s})*146 [' ' | '\t']*<, {prefix.len() - 1}> "|||"147 {148 let mut l = empty_lines.to_owned();149 l.push_str(first_line);150 l.extend(lines);151 if chomped.is_some() {152 debug_assert!(l.ends_with('\n'));153 l.truncate(l.len() - 1);154 }155 l156 }157158 rule hex_char()159 = quiet! { ['0'..='9' | 'a'..='f' | 'A'..='F'] } / expected!("<hex char>")160161 rule string_char(c: rule<()>)162 = (!['\\']!c()[_])+163 / "\\\\"164 / "\\u" hex_char() hex_char() hex_char() hex_char()165 / "\\x" hex_char() hex_char()166 / ['\\'] (quiet! { ['b' | 'f' | 'n' | 'r' | 't' | '"' | '\''] } / expected!("<escape character>"))167 pub rule string() -> String168 = ['"'] str:$(string_char(<"\"">)*) ['"'] {? unescape::unescape(str).ok_or("<escaped string>")}169 / ['\''] str:$(string_char(<"\'">)*) ['\''] {? unescape::unescape(str).ok_or("<escaped string>")}170 / quiet!{ "@'" str:$(("''" / (!['\''][_]))*) "'" {str.replace("''", "'")}171 / "@\"" str:$(("\"\"" / (!['"'][_]))*) "\"" {str.replace("\"\"", "\"")}172 / string_block() } / expected!("<string>")173174 pub rule field_name(s: &ParserSettings) -> FieldName175 = name:id() {FieldName::Fixed(name)}176 / name:string() {FieldName::Fixed(name.into())}177 / "[" _ expr:expr(s) _ "]" {FieldName::Dyn(expr)}178 pub rule visibility() -> Visibility179 = ":::" {Visibility::Unhide}180 / "::" {Visibility::Hidden}181 / ":" {Visibility::Normal}182 pub rule field(s: &ParserSettings) -> FieldMember183 = name:spanned(<field_name(s)>, s) _ plus:"+"? _ visibility:visibility() _ value:expr(s) {FieldMember{184 name,185 plus: plus.is_some(),186 params: None,187 visibility,188 value,189 }}190 / name:spanned(<field_name(s)>, s) _ "(" _ params:params(s) _ ")" _ visibility:visibility() _ value:expr(s) {FieldMember{191 name,192 plus: false,193 params: Some(params),194 visibility,195 value,196 }}197 pub rule obj_local(s: &ParserSettings) -> BindSpec198 = keyword("local") _ bind:bind(s) {bind}199 pub rule member(s: &ParserSettings) -> Member200 = bind:obj_local(s) {Member::BindStmt(bind)}201 / assertion:assertion(s) {Member::AssertStmt(assertion)}202 / field:field(s) {Member::Field(field)}203 pub rule objinside(s: &ParserSettings) -> ObjBody204 = members:(member(s) ** comma()) comma()? _ compspecs:compspecs(s)? {?205 Ok(if let Some(compspecs) = compspecs {206 let mut locals = Vec::new();207 let mut field = None;208 for member in members {209 match member {210 Member::Field(field_member) => if field.replace(field_member).is_some() {211 return Err("<object comprehension can only contain one field>")212 },213 Member::BindStmt(bind_spec) => locals.push(bind_spec),214 Member::AssertStmt(assert_stmt) => return Err("<asserts are unsupported in object comprehension>"),215 }216 }217 ObjBody::ObjComp(ObjComp {218 locals,219 field: Box::new(field.ok_or("<missing object comprehension field>")?),220 compspecs221 })222 } else {223 let mut locals = Vec::new();224 let mut asserts = Vec::new();225 let mut fields = Vec::new();226 for member in members {227 match member {228 Member::Field(field_member) => fields.push(field_member),229 Member::BindStmt(bind_spec) => locals.push(bind_spec),230 Member::AssertStmt(assert_stmt) => asserts.push(assert_stmt),231 }232 }233 ObjBody::MemberList(ObjMembers {234 locals,235 asserts,236 fields237 })238 })239 }240 pub rule ifspec(s: &ParserSettings) -> IfSpecData241 = i:spanned(<keyword("if")>, s) _ cond:expr(s) {IfSpecData { span: i.span, cond }}242 pub rule forspec(s: &ParserSettings) -> ForSpecData243 = keyword("for") _ destruct:destruct(s) _ keyword("in") _ over:expr(s) { ForSpecData { destruct, over } }244 rule compspec(s: &ParserSettings) -> CompSpec245 = i:ifspec(s) { CompSpec::IfSpec(i) } / f:forspec(s) {CompSpec::ForSpec(f)}246 pub rule compspecs(s: &ParserSettings) -> Vec<CompSpec>247 = specs:compspec(s) ++ _ {?248 if !matches!(specs[0], CompSpec::ForSpec(_)) {249 return Err("<first compspec should be for>")250 }251 Ok(specs)252 }253 pub rule local_expr(s: &ParserSettings) -> Expr254 = keyword("local") _ binds:bind(s) ** comma() (_ ",")? _ ";" _ expr:expr(s) { Expr::LocalExpr(binds, Box::new(expr)) }255 pub rule string_expr(s: &ParserSettings) -> Expr256 = s:string() {Expr::Str(s.into())}257 pub rule obj_expr(s: &ParserSettings) -> Expr258 = "{" _ body:objinside(s) _ "}" {Expr::Obj(body)}259 pub rule array_expr(s: &ParserSettings) -> Expr260 = "[" _ elems:(expr(s) ** comma()) _ comma()? "]" {Expr::Arr(elems)}261 pub rule array_comp_expr(s: &ParserSettings) -> Expr262 = "[" _ expr:expr(s) _ comma()? _ specs:(r: compspecs(s) _ {r}) "]" {263 Expr::ArrComp(Box::new(expr), specs)264 }265 pub rule number_expr(s: &ParserSettings) -> Expr266 = n:number() {? if let Some(n) = NumValue::new(n) {267 Ok(Expr::Num(n))268 } else {269 Err("!!!numbers are finite")270 }}271272 rule spanned<T: Acyclic>(x: rule<T>, s: &ParserSettings) -> Spanned<T>273 = a:position!() n:x() b:position!() { Spanned::new(n, Span(s.source.clone(), a as u32, b as u32)) }274275 pub rule var_expr(s: &ParserSettings) -> Expr276 = n:spanned(<id()>, s) { Expr::Var(n) }277 pub rule id_loc(s: &ParserSettings) -> Spanned<Expr>278 = a:position!() n:id() b:position!() { Spanned::new(Expr::Str(n), Span(s.source.clone(), a as u32,b as u32)) }279 pub rule if_then_else_expr(s: &ParserSettings) -> Expr280 = cond:ifspec(s) _ keyword("then") _ cond_then:expr(s) cond_else:(_ keyword("else") _ e:expr(s) {e})? {Expr::IfElse(Box::new(IfElse{281 cond,282 cond_then,283 cond_else,284 }))}285286 pub rule literal(s: &ParserSettings) -> Expr287 = v:(288 keyword("null") {LiteralType::Null}289 / keyword("true") {LiteralType::True}290 / keyword("false") {LiteralType::False}291 / keyword("self") {LiteralType::This}292 / keyword("$") {LiteralType::Dollar}293 / keyword("super") {LiteralType::Super}294 ) {Expr::Literal(v)}295296 rule import_kind() -> ImportKind297 = keyword("importstr") { ImportKind::Str }298 / keyword("importbin") { ImportKind::Bin }299 / keyword("import") { ImportKind::Normal }300301 pub rule expr_basic(s: &ParserSettings) -> Expr302 = literal(s)303304 / string_expr(s) / number_expr(s)305 / array_expr(s)306 / obj_expr(s)307 / array_expr(s)308 / array_comp_expr(s)309310 / kind:spanned(<import_kind()>, s) _ path:expr(s) {Expr::Import(kind, Box::new(path))}311312 / var_expr(s)313 / local_expr(s)314 / if_then_else_expr(s)315316 / keyword("function") _ "(" _ params:params(s) _ ")" _ expr:expr(s) {Expr::Function(params, Box::new(expr))}317 / assert:assertion(s) _ ";" _ rest:expr(s) { Expr::AssertExpr(Box::new(AssertExpr{318 assert, rest319 })) }320321 / err_kw:spanned(<keyword("error")>, s) _ expr:expr(s) { Expr::ErrorStmt(err_kw.span, Box::new(expr)) }322323 rule slice_part(s: &ParserSettings) -> Option<Spanned<Expr>>324 = _ e:(e:spanned(<expr(s)>, s) _{e})? {e}325 pub rule slice_desc(s: &ParserSettings) -> SliceDesc326 = start:slice_part(s) ":" pair:(end:slice_part(s) step:(":" e:slice_part(s){e})? {(end, step.flatten())})? {327 let (end, step) = if let Some((end, step)) = pair {328 (end, step)329 }else{330 (None, None)331 };332333 SliceDesc { start, end, step }334 }335336 rule binop(x: rule<()>) -> ()337 = quiet!{ x() } / expected!("<binary op>")338 rule unaryop(x: rule<()>) -> ()339 = quiet!{ x() } / expected!("<unary op>")340341 rule ensure_null_coaelse()342 = "" {?343 #[cfg(not(feature = "exp-null-coaelse"))] return Err("!!!experimental null coaelscing was not enabled");344 #[cfg(feature = "exp-null-coaelse")] Ok(())345 }346 use jrsonnet_ir::BinaryOpType::*;347 use jrsonnet_ir::UnaryOpType::*;348 rule expr(s: &ParserSettings) -> Expr349 = precedence! {350 a:(@) _ binop(<"||">) _ b:@ {expr_bin!(a Or b)}351 a:(@) _ binop(<"??">) _ ensure_null_coaelse() b:@ {352 #[cfg(feature = "exp-null-coaelse")] return expr_bin!(a NullCoaelse b);353 unreachable!("ensure_null_coaelse will fail if feature is not enabled")354 }355 --356 a:(@) _ binop(<"&&">) _ b:@ {expr_bin!(a And b)}357 --358 a:(@) _ binop(<"|">) _ b:@ {expr_bin!(a BitOr b)}359 --360 a:@ _ binop(<"^">) _ b:(@) {expr_bin!(a BitXor b)}361 --362 a:(@) _ binop(<"&">) _ b:@ {expr_bin!(a BitAnd b)}363 --364 a:(@) _ binop(<"==">) _ b:@ {expr_bin!(a Eq b)}365 a:(@) _ binop(<"!=">) _ b:@ {expr_bin!(a Neq b)}366 --367 a:(@) _ binop(<"<">) _ b:@ {expr_bin!(a Lt b)}368 a:(@) _ binop(<">">) _ b:@ {expr_bin!(a Gt b)}369 a:(@) _ binop(<"<=">) _ b:@ {expr_bin!(a Lte b)}370 a:(@) _ binop(<">=">) _ b:@ {expr_bin!(a Gte b)}371 a:(@) _ binop(<keyword("in")>) _ b:@ {expr_bin!(a In b)}372 --373 a:(@) _ binop(<"<<">) _ b:@ {expr_bin!(a Lhs b)}374 a:(@) _ binop(<">>">) _ b:@ {expr_bin!(a Rhs b)}375 --376 a:(@) _ binop(<"+">) _ b:@ {expr_bin!(a Add b)}377 a:(@) _ binop(<"-">) _ b:@ {expr_bin!(a Sub b)}378 --379 a:(@) _ binop(<"*">) _ b:@ {expr_bin!(a Mul b)}380 a:(@) _ binop(<"/">) _ b:@ {expr_bin!(a Div b)}381 a:(@) _ binop(<"%">) _ b:@ {expr_bin!(a Mod b)}382 --383 unaryop(<"+">) _ b:@ {expr_un!(Plus b)}384 unaryop(<"-">) _ b:@ {expr_un!(Minus b)}385 unaryop(<"!">) _ b:@ {expr_un!(Not b)}386 unaryop(<"~">) _ b:@ {expr_un!(BitNot b)}387 --388 value:(@) _ "[" _ slice:slice_desc(s) _ "]" {Expr::Slice(Box::new(Slice{value, slice}))}389 indexable:(@) _ parts:index_part(s)+ {Expr::Index{indexable: Box::new(indexable), parts}}390 a:(@) _ args:spanned(<"(" _ a:args(s) _ ")" {a}>, s) ts:(_ keyword("tailstrict"))? {Expr::Apply(Box::new(a), args, ts.is_some())}391 a:(@) _ "{" _ body:objinside(s) _ "}" {Expr::ObjExtend(Box::new(a), body)}392 --393 e:expr_basic(s) {e}394 "(" _ e:expr(s) _ ")" {e}395 }396 pub rule index_part(s: &ParserSettings) -> IndexPart397 = n:("?" _ ensure_null_coaelse())? "." _ value:id_loc(s) {IndexPart {398 span: value.span,399 value: value.value,400 #[cfg(feature = "exp-null-coaelse")]401 null_coaelse: n.is_some(),402 }}403 / n:("?" _ "." _ ensure_null_coaelse())? value:spanned(<"[" _ v:expr(s) _ "]" {v}>, s) {IndexPart {404 span: value.span,405 value: value.value,406 #[cfg(feature = "exp-null-coaelse")]407 null_coaelse: n.is_some(),408 }}409410 pub rule jsonnet(s: &ParserSettings) -> Expr = _ e:expr(s) _ {e}411 }412}413414pub type ParseError = peg::error::ParseError<peg::str::LineCol>;415pub fn parse(str: &str, settings: &ParserSettings) -> Result<Expr, ParseError> {416 jsonnet_parser::jsonnet(str, settings)417}418/// Used for importstr values419pub fn string_to_expr(str: IStr, settings: &ParserSettings) -> Spanned<Expr> {420 let len = str.len();421 Spanned::new(Expr::Str(str), Span(settings.source.clone(), 0, len as u32))422}423424#[cfg(test)]425mod tests {426 use std::fs;427428 use insta::{assert_snapshot, glob};429 use jrsonnet_ir::{IStr, Source};430431 use crate::{ParserSettings, parse};432433 #[test]434 fn snapshots() {435 glob!("tests/*.jsonnet", |path| {436 let input = fs::read_to_string(path).expect("read test file");437 let v = parse(438 &input,439 &ParserSettings {440 source: Source::new_virtual("<test>".into(), IStr::empty()),441 },442 )443 .unwrap();444 let v = format!("{v:#?}");445 assert_snapshot!(v);446 });447 }448}