difftreelog
style fix clippy warnings
in: master
5 files changed
crates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/ctx.rs
+++ b/crates/jrsonnet-evaluator/src/ctx.rs
@@ -38,7 +38,7 @@
#[derive(Debug, Clone)]
pub struct Context(Rc<ContextInternals>);
impl Context {
- pub fn new_future() -> FutureWrapper<Context> {
+ pub fn new_future() -> FutureWrapper<Self> {
FutureWrapper::new()
}
@@ -71,7 +71,7 @@
.cloned()
.ok_or(VariableIsNotDefined(name))?)
}
- pub fn into_future(self, ctx: FutureWrapper<Context>) -> Self {
+ pub fn into_future(self, ctx: FutureWrapper<Self>) -> Self {
{
ctx.0.borrow_mut().replace(self);
}
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -1,6 +1,6 @@
#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]
-#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]
#![warn(clippy::all, clippy::nursery)]
+#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths, clippy::ptr_arg)]
mod builtin;
mod ctx;
@@ -429,7 +429,7 @@
}
pub fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {
- Ok(self.settings().import_resolver.resolve_file(from, path)?)
+ self.settings().import_resolver.resolve_file(from, path)
}
pub fn load_file_contents(&self, path: &PathBuf) -> Result<IStr> {
self.settings().import_resolver.load_file_contents(path)
crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -173,7 +173,7 @@
pub fn extend_with_field(self, key: IStr, value: ObjMember) -> Self {
let mut new = FxHashMap::with_capacity_and_hasher(1, BuildHasherDefault::default());
new.insert(key, value);
- ObjValue::new(Some(self), Rc::new(new))
+ Self::new(Some(self), Rc::new(new))
}
pub(crate) fn get_raw(&self, key: IStr, real_this: Option<&Self>) -> Result<Option<Val>> {
crates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth1use peg::parser;2use std::{path::PathBuf, rc::Rc};3mod expr;4pub use expr::*;5pub use peg;67#[derive(Default)]8pub struct ParserSettings {9 pub loc_data: bool,10 pub file_name: Rc<PathBuf>,11}1213parser! {14 grammar jsonnet_parser() for str {15 use peg::ParseLiteral;1617 /// Standard C-like comments18 rule comment()19 = "//" (!['\n'][_])* "\n"20 / "/*" ("\\*/" / "\\\\" / (!("*/")[_]))* "*/"21 / "#" (!['\n'][_])* "\n"2223 rule single_whitespace() = quiet!{([' ' | '\r' | '\n' | '\t'] / comment())} / expected!("<whitespace>")24 rule _() = single_whitespace()*2526 /// For comma-delimited elements27 rule comma() = quiet!{_ "," _} / expected!("<comma>")28 rule alpha() -> char = c:$(['_' | 'a'..='z' | 'A'..='Z']) {c.chars().next().unwrap()}29 rule digit() -> char = d:$(['0'..='9']) {d.chars().next().unwrap()}30 rule end_of_ident() = !['0'..='9' | '_' | 'a'..='z' | 'A'..='Z']31 /// Sequence of digits32 rule uint() -> u64 = a:$(digit()+) { a.parse().unwrap() }33 /// Number in scientific notation format34 rule number() -> f64 = quiet!{a:$(uint() ("." uint())? (['e'|'E'] (s:['+'|'-'])? uint())?) { a.parse().unwrap() }} / expected!("<number>")3536 /// Reserved word followed by any non-alphanumberic37 rule reserved() = ("assert" / "else" / "error" / "false" / "for" / "function" / "if" / "import" / "importstr" / "in" / "local" / "null" / "tailstrict" / "then" / "self" / "super" / "true") end_of_ident()38 rule id() = quiet!{ !reserved() alpha() (alpha() / digit())*} / expected!("<identifier>")3940 rule keyword(id: &'static str) -> ()41 = ##parse_string_literal(id) end_of_ident()42 // Adds location data information to existing expression43 rule l(s: &ParserSettings, x: rule<Expr>) -> LocExpr44 = start:position!() v:x() end:position!() {loc_expr!(v, s.loc_data, (s.file_name.clone(), start, end))}4546 pub rule param(s: &ParserSettings) -> expr::Param = name:$(id()) expr:(_ "=" _ expr:expr(s){expr})? { expr::Param(name.into(), expr) }47 pub rule params(s: &ParserSettings) -> expr::ParamsDesc48 = params:param(s) ** comma() comma()? {49 let mut defaults_started = false;50 for param in ¶ms {51 defaults_started = defaults_started || param.1.is_some();52 assert_eq!(defaults_started, param.1.is_some(), "defauld parameters should be used after all positionals");53 }54 expr::ParamsDesc(Rc::new(params))55 }56 / { expr::ParamsDesc(Rc::new(Vec::new())) }5758 pub rule arg(s: &ParserSettings) -> expr::Arg59 = name:$(id()) _ "=" _ expr:expr(s) {expr::Arg(Some(name.into()), expr)}60 / expr:expr(s) {expr::Arg(None, expr)}61 pub rule args(s: &ParserSettings) -> expr::ArgsDesc62 = args:arg(s) ** comma() comma()? {63 let mut named_started = false;64 for arg in &args {65 named_started = named_started || arg.0.is_some();66 assert_eq!(named_started, arg.0.is_some(), "named args should be used after all positionals");67 }68 expr::ArgsDesc(args)69 }70 / { expr::ArgsDesc(Vec::new()) }7172 pub rule bind(s: &ParserSettings) -> expr::BindSpec73 = name:$(id()) _ "=" _ expr:expr(s) {expr::BindSpec{name:name.into(), params: None, value: expr}}74 / name:$(id()) _ "(" _ params:params(s) _ ")" _ "=" _ expr:expr(s) {expr::BindSpec{name:name.into(), params: Some(params), value: expr}}75 pub rule assertion(s: &ParserSettings) -> expr::AssertStmt76 = keyword("assert") _ cond:expr(s) msg:(_ ":" _ e:expr(s) {e})? { expr::AssertStmt(cond, msg) }7778 pub rule whole_line() -> &'input str79 = str:$((!['\n'][_])* "\n") {str}80 pub rule string_block() -> String81 = "|||" (!['\n']single_whitespace())* "\n"82 empty_lines:$(['\n']*)83 prefix:[' ' | '\t']+ first_line:whole_line()84 lines:("\n" {"\n"} / [' ' | '\t']*<{prefix.len()}> s:whole_line() {s})*85 [' ' | '\t']*<, {prefix.len() - 1}> "|||"86 {let mut l = empty_lines.to_owned(); l.push_str(first_line); l.extend(lines); l}87 pub rule string() -> String88 = quiet!{ "\"" str:$(("\\\"" / "\\\\" / (!['"'][_]))*) "\"" {unescape::unescape(str).unwrap()}89 / "'" str:$(("\\'" / "\\\\" / (!['\''][_]))*) "'" {unescape::unescape(str).unwrap()}90 / "@'" str:$(("''" / (!['\''][_]))*) "'" {str.replace("''", "'")}91 / "@\"" str:$(("\"\"" / (!['"'][_]))*) "\"" {str.replace("\"\"", "\"")}92 / string_block() } / expected!("<string>")9394 pub rule field_name(s: &ParserSettings) -> expr::FieldName95 = name:$(id()) {expr::FieldName::Fixed(name.into())}96 / name:string() {expr::FieldName::Fixed(name.into())}97 / "[" _ expr:expr(s) _ "]" {expr::FieldName::Dyn(expr)}98 pub rule visibility() -> expr::Visibility99 = ":::" {expr::Visibility::Unhide}100 / "::" {expr::Visibility::Hidden}101 / ":" {expr::Visibility::Normal}102 pub rule field(s: &ParserSettings) -> expr::FieldMember103 = name:field_name(s) _ plus:"+"? _ visibility:visibility() _ value:expr(s) {expr::FieldMember{104 name,105 plus: plus.is_some(),106 params: None,107 visibility,108 value,109 }}110 / name:field_name(s) _ "(" _ params:params(s) _ ")" _ visibility:visibility() _ value:expr(s) {expr::FieldMember{111 name,112 plus: false,113 params: Some(params),114 visibility,115 value,116 }}117 pub rule obj_local(s: &ParserSettings) -> BindSpec118 = keyword("local") _ bind:bind(s) {bind}119 pub rule member(s: &ParserSettings) -> expr::Member120 = bind:obj_local(s) {expr::Member::BindStmt(bind)}121 / assertion:assertion(s) {expr::Member::AssertStmt(assertion)}122 / field:field(s) {expr::Member::Field(field)}123 pub rule objinside(s: &ParserSettings) -> expr::ObjBody124 = pre_locals:(b: obj_local(s) comma() {b})* "[" _ key:expr(s) _ "]" _ ":" _ value:expr(s) post_locals:(comma() b:obj_local(s) {b})* _ forspec:forspec(s) others:(_ rest:compspec(s) {rest})? {125 let mut compspecs = vec![CompSpec::ForSpec(forspec)];126 compspecs.extend(others.unwrap_or_default());127 expr::ObjBody::ObjComp(expr::ObjComp{128 pre_locals,129 key,130 value,131 post_locals,132 compspecs,133 })134 }135 / members:(member(s) ** comma()) comma()? {expr::ObjBody::MemberList(members)}136 pub rule ifspec(s: &ParserSettings) -> IfSpecData137 = keyword("if") _ expr:expr(s) {IfSpecData(expr)}138 pub rule forspec(s: &ParserSettings) -> ForSpecData139 = keyword("for") _ id:$(id()) _ keyword("in") _ cond:expr(s) {ForSpecData(id.into(), cond)}140 pub rule compspec(s: &ParserSettings) -> Vec<expr::CompSpec>141 = s:(i:ifspec(s) { expr::CompSpec::IfSpec(i) } / f:forspec(s) {expr::CompSpec::ForSpec(f)} ) ** _ {s}142 pub rule local_expr(s: &ParserSettings) -> LocExpr143 = l(s,<keyword("local") _ binds:bind(s) ** comma() _ ";" _ expr:expr(s) { Expr::LocalExpr(binds, expr) }>)144 pub rule string_expr(s: &ParserSettings) -> LocExpr145 = l(s, <s:string() {Expr::Str(s.into())}>)146 pub rule obj_expr(s: &ParserSettings) -> LocExpr147 = l(s,<"{" _ body:objinside(s) _ "}" {Expr::Obj(body)}>)148 pub rule array_expr(s: &ParserSettings) -> LocExpr149 = l(s,<"[" _ elems:(expr(s) ** comma()) _ comma()? "]" {Expr::Arr(elems)}>)150 pub rule array_comp_expr(s: &ParserSettings) -> LocExpr151 = l(s,<"[" _ expr:expr(s) _ comma()? _ forspec:forspec(s) _ others:(others: compspec(s) _ {others})? "]" {152 let mut specs = vec![CompSpec::ForSpec(forspec)];153 specs.extend(others.unwrap_or_default());154 Expr::ArrComp(expr, specs)155 }>)156 pub rule number_expr(s: &ParserSettings) -> LocExpr157 = l(s,<n:number() { expr::Expr::Num(n) }>)158 pub rule var_expr(s: &ParserSettings) -> LocExpr159 = l(s,<n:$(id()) { expr::Expr::Var(n.into()) }>)160 pub rule if_then_else_expr(s: &ParserSettings) -> LocExpr161 = l(s,<cond:ifspec(s) _ keyword("then") _ cond_then:expr(s) cond_else:(_ keyword("else") _ e:expr(s) {e})? {Expr::IfElse{162 cond,163 cond_then,164 cond_else,165 }}>)166167 pub rule literal(s: &ParserSettings) -> LocExpr168 = l(s,<v:(169 keyword("null") {LiteralType::Null}170 / keyword("true") {LiteralType::True}171 / keyword("false") {LiteralType::False}172 / keyword("self") {LiteralType::This}173 / keyword("$") {LiteralType::Dollar}174 / keyword("super") {LiteralType::Super}175 ) {Expr::Literal(v)}>)176177 pub rule expr_basic(s: &ParserSettings) -> LocExpr178 = literal(s)179180 / string_expr(s) / number_expr(s)181 / array_expr(s)182 / obj_expr(s)183 / array_expr(s)184 / array_comp_expr(s)185186 / l(s,<keyword("importstr") _ path:string() {Expr::ImportStr(PathBuf::from(path))}>)187 / l(s,<keyword("import") _ path:string() {Expr::Import(PathBuf::from(path))}>)188189 / var_expr(s)190 / local_expr(s)191 / if_then_else_expr(s)192193 / l(s,<keyword("function") _ "(" _ params:params(s) _ ")" _ expr:expr(s) {Expr::Function(params, expr)}>)194 / l(s,<assertion:assertion(s) _ ";" _ expr:expr(s) { Expr::AssertExpr(assertion, expr) }>)195196 / l(s,<keyword("error") _ expr:expr(s) { Expr::ErrorStmt(expr) }>)197198 rule slice_part(s: &ParserSettings) -> Option<LocExpr>199 = e:(_ e:expr(s) _{e})? {e}200 pub rule slice_desc(s: &ParserSettings) -> SliceDesc201 = start:slice_part(s) ":" pair:(end:slice_part(s) step:(":" e:slice_part(s){e})? {(end, step.flatten())})? {202 let (end, step) = if let Some((end, step)) = pair {203 (end, step)204 }else{205 (None, None)206 };207208 SliceDesc { start, end, step }209 }210211 rule binop(x: rule<()>) -> ()212 = quiet!{ x() } / expected!("<binary op>")213 rule unaryop(x: rule<()>) -> ()214 = quiet!{ x() } / expected!("<unary op>")215216 rule expr(s: &ParserSettings) -> LocExpr217 = start:position!() a:precedence! {218 a:(@) _ binop(<"||">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Or, b))}219 --220 a:(@) _ binop(<"&&">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::And, b))}221 --222 a:(@) _ binop(<"|">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::BitOr, b))}223 --224 a:@ _ binop(<"^">) _ b:(@) {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::BitXor, b))}225 --226 a:(@) _ binop(<"&">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::BitAnd, b))}227 --228 a:(@) _ binop(<"==">) _ b:@ {loc_expr_todo!(Expr::Apply(229 el!(Expr::Intrinsic("equals".into())),230 ArgsDesc(vec![Arg(None, a), Arg(None, b)]),231 true232 ))}233 a:(@) _ binop(<"!=">) _ b:@ {loc_expr_todo!(Expr::UnaryOp(UnaryOpType::Not, el!(Expr::Apply(234 el!(Expr::Intrinsic("equals".into())),235 ArgsDesc(vec![Arg(None, a), Arg(None, b)]),236 true237 ))))}238 --239 a:(@) _ binop(<"<">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Lt, b))}240 a:(@) _ binop(<">">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Gt, b))}241 a:(@) _ binop(<"<=">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Lte, b))}242 a:(@) _ binop(<">=">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Gte, b))}243 a:(@) _ binop(<keyword("in")>) _ b:@ {loc_expr_todo!(Expr::Apply(244 el!(Expr::Intrinsic("objectHasEx".into())), ArgsDesc(vec![Arg(None, b), Arg(None, a), Arg(None, el!(Expr::Literal(LiteralType::True)))]),245 true246 ))}247 --248 a:(@) _ binop(<"<<">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Lhs, b))}249 a:(@) _ binop(<">>">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Rhs, b))}250 --251 a:(@) _ binop(<"+">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Add, b))}252 a:(@) _ binop(<"-">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Sub, b))}253 --254 a:(@) _ binop(<"*">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Mul, b))}255 a:(@) _ binop(<"/">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Div, b))}256 a:(@) _ binop(<"%">) _ b:@ {loc_expr_todo!(Expr::Apply(257 el!(Expr::Intrinsic("mod".into())), ArgsDesc(vec![Arg(None, a), Arg(None, b)]),258 false259 ))}260 --261 unaryop(<"-">) _ b:@ {loc_expr_todo!(Expr::UnaryOp(UnaryOpType::Minus, b))}262 unaryop(<"!">) _ b:@ {loc_expr_todo!(Expr::UnaryOp(UnaryOpType::Not, b))}263 unaryop(<"~">) _ b:@ { loc_expr_todo!(Expr::UnaryOp(UnaryOpType::BitNot, b)) }264 --265 a:(@) _ "[" _ s:slice_desc(s) _ "]" {loc_expr_todo!(Expr::Apply(266 el!(Expr::Intrinsic("slice".into())),267 ArgsDesc(vec![268 Arg(None, a),269 Arg(None, s.start.unwrap_or_else(||el!(Expr::Literal(LiteralType::Null)))),270 Arg(None, s.end.unwrap_or_else(||el!(Expr::Literal(LiteralType::Null)))),271 Arg(None, s.step.unwrap_or_else(||el!(Expr::Literal(LiteralType::Null)))),272 ]),273 true,274 ))}275 a:(@) _ "." _ s:$(id()) {loc_expr_todo!(Expr::Index(a, el!(Expr::Str(s.into()))))}276 a:(@) _ "[" _ s:expr(s) _ "]" {loc_expr_todo!(Expr::Index(a, s))}277 a:(@) _ "(" _ args:args(s) _ ")" ts:(_ keyword("tailstrict"))? {loc_expr_todo!(Expr::Apply(a, args, ts.is_some()))}278 a:(@) _ "{" _ body:objinside(s) _ "}" {loc_expr_todo!(Expr::ObjExtend(a, body))}279 --280 e:expr_basic(s) {e}281 "(" _ e:expr(s) _ ")" {loc_expr_todo!(Expr::Parened(e))}282 } end:position!() {283 let LocExpr(e, _) = a;284 LocExpr(e, if s.loc_data {285 Some(ExprLocation(s.file_name.clone(), start, end))286 } else {287 None288 })289 }290 / e:expr_basic(s) {e}291292 pub rule jsonnet(s: &ParserSettings) -> LocExpr = _ e:expr(s) _ {e}293 }294}295296pub type ParseError = peg::error::ParseError<peg::str::LineCol>;297pub fn parse(str: &str, settings: &ParserSettings) -> Result<LocExpr, ParseError> {298 jsonnet_parser::jsonnet(str, settings)299}300301#[macro_export]302macro_rules! el {303 ($expr:expr) => {304 LocExpr(std::rc::Rc::new($expr), None)305 };306}307308#[cfg(test)]309pub mod tests {310 use super::{expr::*, parse};311 use crate::ParserSettings;312 use std::path::PathBuf;313 use std::rc::Rc;314315 macro_rules! parse {316 ($s:expr) => {317 parse(318 $s,319 &ParserSettings {320 loc_data: false,321 file_name: Rc::new(PathBuf::from("/test.jsonnet")),322 },323 )324 .unwrap()325 };326 }327328 mod expressions {329 use super::*;330331 pub fn basic_math() -> LocExpr {332 el!(Expr::BinaryOp(333 el!(Expr::Num(2.0)),334 BinaryOpType::Add,335 el!(Expr::BinaryOp(336 el!(Expr::Num(2.0)),337 BinaryOpType::Mul,338 el!(Expr::Num(2.0)),339 )),340 ))341 }342 }343344 #[test]345 fn multiline_string() {346 assert_eq!(347 parse!("|||\n Hello world!\n a\n|||"),348 el!(Expr::Str("Hello world!\n a\n".into())),349 );350 assert_eq!(351 parse!("|||\n Hello world!\n a\n|||"),352 el!(Expr::Str("Hello world!\n a\n".into())),353 );354 assert_eq!(355 parse!("|||\n\t\tHello world!\n\t\t\ta\n|||"),356 el!(Expr::Str("Hello world!\n\ta\n".into())),357 );358 assert_eq!(359 parse!("|||\n Hello world!\n a\n |||"),360 el!(Expr::Str("Hello world!\n a\n".into())),361 );362 }363364 #[test]365 fn slice() {366 parse!("a[1:]");367 parse!("a[1::]");368 parse!("a[:1:]");369 parse!("a[::1]");370 parse!("str[:len - 1]");371 }372373 #[test]374 fn string_escaping() {375 assert_eq!(376 parse!(r#""Hello, \"world\"!""#),377 el!(Expr::Str(r#"Hello, "world"!"#.into())),378 );379 assert_eq!(380 parse!(r#"'Hello \'world\'!'"#),381 el!(Expr::Str("Hello 'world'!".into())),382 );383 assert_eq!(parse!(r#"'\\\\'"#), el!(Expr::Str("\\\\".into())),);384 }385386 #[test]387 fn string_unescaping() {388 assert_eq!(389 parse!(r#""Hello\nWorld""#),390 el!(Expr::Str("Hello\nWorld".into())),391 );392 }393394 #[test]395 fn string_verbantim() {396 assert_eq!(397 parse!(r#"@"Hello\n""World""""#),398 el!(Expr::Str("Hello\\n\"World\"".into())),399 );400 }401402 #[test]403 fn imports() {404 assert_eq!(405 parse!("import \"hello\""),406 el!(Expr::Import(PathBuf::from("hello"))),407 );408 assert_eq!(409 parse!("importstr \"garnish.txt\""),410 el!(Expr::ImportStr(PathBuf::from("garnish.txt")))411 );412 }413414 #[test]415 fn empty_object() {416 assert_eq!(parse!("{}"), el!(Expr::Obj(ObjBody::MemberList(vec![]))));417 }418419 #[test]420 fn basic_math() {421 assert_eq!(422 parse!("2+2*2"),423 el!(Expr::BinaryOp(424 el!(Expr::Num(2.0)),425 BinaryOpType::Add,426 el!(Expr::BinaryOp(427 el!(Expr::Num(2.0)),428 BinaryOpType::Mul,429 el!(Expr::Num(2.0))430 ))431 ))432 );433 }434435 #[test]436 fn basic_math_with_indents() {437 assert_eq!(parse!("2 + 2 * 2 "), expressions::basic_math());438 }439440 #[test]441 fn basic_math_parened() {442 assert_eq!(443 parse!("2+(2+2*2)"),444 el!(Expr::BinaryOp(445 el!(Expr::Num(2.0)),446 BinaryOpType::Add,447 el!(Expr::Parened(expressions::basic_math())),448 ))449 );450 }451452 /// Comments should not affect parsing453 #[test]454 fn comments() {455 assert_eq!(456 parse!("2//comment\n+//comment\n3/*test*/*/*test*/4"),457 el!(Expr::BinaryOp(458 el!(Expr::Num(2.0)),459 BinaryOpType::Add,460 el!(Expr::BinaryOp(461 el!(Expr::Num(3.0)),462 BinaryOpType::Mul,463 el!(Expr::Num(4.0))464 ))465 ))466 );467 }468469 /// Comments should be able to be escaped470 #[test]471 fn comment_escaping() {472 assert_eq!(473 parse!("2/*\\*/+*/ - 22"),474 el!(Expr::BinaryOp(475 el!(Expr::Num(2.0)),476 BinaryOpType::Sub,477 el!(Expr::Num(22.0))478 ))479 );480 }481482 #[test]483 fn suffix() {484 // assert_eq!(parse!("std.test"), el!(Expr::Num(2.2)));485 // assert_eq!(parse!("std(2)"), el!(Expr::Num(2.2)));486 // assert_eq!(parse!("std.test(2)"), el!(Expr::Num(2.2)));487 // assert_eq!(parse!("a[b]"), el!(Expr::Num(2.2)))488 }489490 #[test]491 fn array_comp() {492 use Expr::*;493 assert_eq!(494 parse!("[std.deepJoin(x) for x in arr]"),495 el!(ArrComp(496 el!(Apply(497 el!(Index(el!(Var("std".into())), el!(Str("deepJoin".into())))),498 ArgsDesc(vec![Arg(None, el!(Var("x".into())))]),499 false,500 )),501 vec![CompSpec::ForSpec(ForSpecData(502 "x".into(),503 el!(Var("arr".into()))504 ))]505 )),506 )507 }508509 #[test]510 fn reserved() {511 use Expr::*;512 assert_eq!(parse!("null"), el!(Literal(LiteralType::Null)));513 assert_eq!(parse!("nulla"), el!(Var("nulla".into())));514 }515516 #[test]517 fn multiple_args_buf() {518 parse!("a(b, null_fields)");519 }520521 #[test]522 fn infix_precedence() {523 use Expr::*;524 assert_eq!(525 parse!("!a && !b"),526 el!(BinaryOp(527 el!(UnaryOp(UnaryOpType::Not, el!(Var("a".into())))),528 BinaryOpType::And,529 el!(UnaryOp(UnaryOpType::Not, el!(Var("b".into()))))530 ))531 );532 }533534 #[test]535 fn infix_precedence_division() {536 use Expr::*;537 assert_eq!(538 parse!("!a / !b"),539 el!(BinaryOp(540 el!(UnaryOp(UnaryOpType::Not, el!(Var("a".into())))),541 BinaryOpType::Div,542 el!(UnaryOp(UnaryOpType::Not, el!(Var("b".into()))))543 ))544 );545 }546547 #[test]548 fn double_negation() {549 use Expr::*;550 assert_eq!(551 parse!("!!a"),552 el!(UnaryOp(553 UnaryOpType::Not,554 el!(UnaryOp(UnaryOpType::Not, el!(Var("a".into()))))555 ))556 )557 }558559 #[test]560 fn array_test_error() {561 parse!("[a for a in b if c for e in f]");562 // ^^^^ failed code563 }564565 #[test]566 fn can_parse_stdlib() {567 parse!(jrsonnet_stdlib::STDLIB_STR);568 }569570 // From source code571 /*572 #[bench]573 fn bench_parse_peg(b: &mut Bencher) {574 b.iter(|| parse!(jrsonnet_stdlib::STDLIB_STR))575 }576 */577}1#![allow(clippy::redundant_closure_call)]23use peg::parser;4use std::{path::PathBuf, rc::Rc};5mod expr;6pub use expr::*;7pub use peg;89#[derive(Default)]10pub struct ParserSettings {11 pub loc_data: bool,12 pub file_name: Rc<PathBuf>,13}1415parser! {16 grammar jsonnet_parser() for str {17 use peg::ParseLiteral;1819 /// Standard C-like comments20 rule comment()21 = "//" (!['\n'][_])* "\n"22 / "/*" ("\\*/" / "\\\\" / (!("*/")[_]))* "*/"23 / "#" (!['\n'][_])* "\n"2425 rule single_whitespace() = quiet!{([' ' | '\r' | '\n' | '\t'] / comment())} / expected!("<whitespace>")26 rule _() = single_whitespace()*2728 /// For comma-delimited elements29 rule comma() = quiet!{_ "," _} / expected!("<comma>")30 rule alpha() -> char = c:$(['_' | 'a'..='z' | 'A'..='Z']) {c.chars().next().unwrap()}31 rule digit() -> char = d:$(['0'..='9']) {d.chars().next().unwrap()}32 rule end_of_ident() = !['0'..='9' | '_' | 'a'..='z' | 'A'..='Z']33 /// Sequence of digits34 rule uint() -> u64 = a:$(digit()+) { a.parse().unwrap() }35 /// Number in scientific notation format36 rule number() -> f64 = quiet!{a:$(uint() ("." uint())? (['e'|'E'] (s:['+'|'-'])? uint())?) { a.parse().unwrap() }} / expected!("<number>")3738 /// Reserved word followed by any non-alphanumberic39 rule reserved() = ("assert" / "else" / "error" / "false" / "for" / "function" / "if" / "import" / "importstr" / "in" / "local" / "null" / "tailstrict" / "then" / "self" / "super" / "true") end_of_ident()40 rule id() = quiet!{ !reserved() alpha() (alpha() / digit())*} / expected!("<identifier>")4142 rule keyword(id: &'static str) -> ()43 = ##parse_string_literal(id) end_of_ident()44 // Adds location data information to existing expression45 rule l(s: &ParserSettings, x: rule<Expr>) -> LocExpr46 = start:position!() v:x() end:position!() {loc_expr!(v, s.loc_data, (s.file_name.clone(), start, end))}4748 pub rule param(s: &ParserSettings) -> expr::Param = name:$(id()) expr:(_ "=" _ expr:expr(s){expr})? { expr::Param(name.into(), expr) }49 pub rule params(s: &ParserSettings) -> expr::ParamsDesc50 = params:param(s) ** comma() comma()? {51 let mut defaults_started = false;52 for param in ¶ms {53 defaults_started = defaults_started || param.1.is_some();54 assert_eq!(defaults_started, param.1.is_some(), "defauld parameters should be used after all positionals");55 }56 expr::ParamsDesc(Rc::new(params))57 }58 / { expr::ParamsDesc(Rc::new(Vec::new())) }5960 pub rule arg(s: &ParserSettings) -> expr::Arg61 = name:$(id()) _ "=" _ expr:expr(s) {expr::Arg(Some(name.into()), expr)}62 / expr:expr(s) {expr::Arg(None, expr)}63 pub rule args(s: &ParserSettings) -> expr::ArgsDesc64 = args:arg(s) ** comma() comma()? {65 let mut named_started = false;66 for arg in &args {67 named_started = named_started || arg.0.is_some();68 assert_eq!(named_started, arg.0.is_some(), "named args should be used after all positionals");69 }70 expr::ArgsDesc(args)71 }72 / { expr::ArgsDesc(Vec::new()) }7374 pub rule bind(s: &ParserSettings) -> expr::BindSpec75 = name:$(id()) _ "=" _ expr:expr(s) {expr::BindSpec{name:name.into(), params: None, value: expr}}76 / name:$(id()) _ "(" _ params:params(s) _ ")" _ "=" _ expr:expr(s) {expr::BindSpec{name:name.into(), params: Some(params), value: expr}}77 pub rule assertion(s: &ParserSettings) -> expr::AssertStmt78 = keyword("assert") _ cond:expr(s) msg:(_ ":" _ e:expr(s) {e})? { expr::AssertStmt(cond, msg) }7980 pub rule whole_line() -> &'input str81 = str:$((!['\n'][_])* "\n") {str}82 pub rule string_block() -> String83 = "|||" (!['\n']single_whitespace())* "\n"84 empty_lines:$(['\n']*)85 prefix:[' ' | '\t']+ first_line:whole_line()86 lines:("\n" {"\n"} / [' ' | '\t']*<{prefix.len()}> s:whole_line() {s})*87 [' ' | '\t']*<, {prefix.len() - 1}> "|||"88 {let mut l = empty_lines.to_owned(); l.push_str(first_line); l.extend(lines); l}89 pub rule string() -> String90 = quiet!{ "\"" str:$(("\\\"" / "\\\\" / (!['"'][_]))*) "\"" {unescape::unescape(str).unwrap()}91 / "'" str:$(("\\'" / "\\\\" / (!['\''][_]))*) "'" {unescape::unescape(str).unwrap()}92 / "@'" str:$(("''" / (!['\''][_]))*) "'" {str.replace("''", "'")}93 / "@\"" str:$(("\"\"" / (!['"'][_]))*) "\"" {str.replace("\"\"", "\"")}94 / string_block() } / expected!("<string>")9596 pub rule field_name(s: &ParserSettings) -> expr::FieldName97 = name:$(id()) {expr::FieldName::Fixed(name.into())}98 / name:string() {expr::FieldName::Fixed(name.into())}99 / "[" _ expr:expr(s) _ "]" {expr::FieldName::Dyn(expr)}100 pub rule visibility() -> expr::Visibility101 = ":::" {expr::Visibility::Unhide}102 / "::" {expr::Visibility::Hidden}103 / ":" {expr::Visibility::Normal}104 pub rule field(s: &ParserSettings) -> expr::FieldMember105 = name:field_name(s) _ plus:"+"? _ visibility:visibility() _ value:expr(s) {expr::FieldMember{106 name,107 plus: plus.is_some(),108 params: None,109 visibility,110 value,111 }}112 / name:field_name(s) _ "(" _ params:params(s) _ ")" _ visibility:visibility() _ value:expr(s) {expr::FieldMember{113 name,114 plus: false,115 params: Some(params),116 visibility,117 value,118 }}119 pub rule obj_local(s: &ParserSettings) -> BindSpec120 = keyword("local") _ bind:bind(s) {bind}121 pub rule member(s: &ParserSettings) -> expr::Member122 = bind:obj_local(s) {expr::Member::BindStmt(bind)}123 / assertion:assertion(s) {expr::Member::AssertStmt(assertion)}124 / field:field(s) {expr::Member::Field(field)}125 pub rule objinside(s: &ParserSettings) -> expr::ObjBody126 = pre_locals:(b: obj_local(s) comma() {b})* "[" _ key:expr(s) _ "]" _ ":" _ value:expr(s) post_locals:(comma() b:obj_local(s) {b})* _ forspec:forspec(s) others:(_ rest:compspec(s) {rest})? {127 let mut compspecs = vec![CompSpec::ForSpec(forspec)];128 compspecs.extend(others.unwrap_or_default());129 expr::ObjBody::ObjComp(expr::ObjComp{130 pre_locals,131 key,132 value,133 post_locals,134 compspecs,135 })136 }137 / members:(member(s) ** comma()) comma()? {expr::ObjBody::MemberList(members)}138 pub rule ifspec(s: &ParserSettings) -> IfSpecData139 = keyword("if") _ expr:expr(s) {IfSpecData(expr)}140 pub rule forspec(s: &ParserSettings) -> ForSpecData141 = keyword("for") _ id:$(id()) _ keyword("in") _ cond:expr(s) {ForSpecData(id.into(), cond)}142 pub rule compspec(s: &ParserSettings) -> Vec<expr::CompSpec>143 = s:(i:ifspec(s) { expr::CompSpec::IfSpec(i) } / f:forspec(s) {expr::CompSpec::ForSpec(f)} ) ** _ {s}144 pub rule local_expr(s: &ParserSettings) -> LocExpr145 = l(s,<keyword("local") _ binds:bind(s) ** comma() _ ";" _ expr:expr(s) { Expr::LocalExpr(binds, expr) }>)146 pub rule string_expr(s: &ParserSettings) -> LocExpr147 = l(s, <s:string() {Expr::Str(s.into())}>)148 pub rule obj_expr(s: &ParserSettings) -> LocExpr149 = l(s,<"{" _ body:objinside(s) _ "}" {Expr::Obj(body)}>)150 pub rule array_expr(s: &ParserSettings) -> LocExpr151 = l(s,<"[" _ elems:(expr(s) ** comma()) _ comma()? "]" {Expr::Arr(elems)}>)152 pub rule array_comp_expr(s: &ParserSettings) -> LocExpr153 = l(s,<"[" _ expr:expr(s) _ comma()? _ forspec:forspec(s) _ others:(others: compspec(s) _ {others})? "]" {154 let mut specs = vec![CompSpec::ForSpec(forspec)];155 specs.extend(others.unwrap_or_default());156 Expr::ArrComp(expr, specs)157 }>)158 pub rule number_expr(s: &ParserSettings) -> LocExpr159 = l(s,<n:number() { expr::Expr::Num(n) }>)160 pub rule var_expr(s: &ParserSettings) -> LocExpr161 = l(s,<n:$(id()) { expr::Expr::Var(n.into()) }>)162 pub rule if_then_else_expr(s: &ParserSettings) -> LocExpr163 = l(s,<cond:ifspec(s) _ keyword("then") _ cond_then:expr(s) cond_else:(_ keyword("else") _ e:expr(s) {e})? {Expr::IfElse{164 cond,165 cond_then,166 cond_else,167 }}>)168169 pub rule literal(s: &ParserSettings) -> LocExpr170 = l(s,<v:(171 keyword("null") {LiteralType::Null}172 / keyword("true") {LiteralType::True}173 / keyword("false") {LiteralType::False}174 / keyword("self") {LiteralType::This}175 / keyword("$") {LiteralType::Dollar}176 / keyword("super") {LiteralType::Super}177 ) {Expr::Literal(v)}>)178179 pub rule expr_basic(s: &ParserSettings) -> LocExpr180 = literal(s)181182 / string_expr(s) / number_expr(s)183 / array_expr(s)184 / obj_expr(s)185 / array_expr(s)186 / array_comp_expr(s)187188 / l(s,<keyword("importstr") _ path:string() {Expr::ImportStr(PathBuf::from(path))}>)189 / l(s,<keyword("import") _ path:string() {Expr::Import(PathBuf::from(path))}>)190191 / var_expr(s)192 / local_expr(s)193 / if_then_else_expr(s)194195 / l(s,<keyword("function") _ "(" _ params:params(s) _ ")" _ expr:expr(s) {Expr::Function(params, expr)}>)196 / l(s,<assertion:assertion(s) _ ";" _ expr:expr(s) { Expr::AssertExpr(assertion, expr) }>)197198 / l(s,<keyword("error") _ expr:expr(s) { Expr::ErrorStmt(expr) }>)199200 rule slice_part(s: &ParserSettings) -> Option<LocExpr>201 = e:(_ e:expr(s) _{e})? {e}202 pub rule slice_desc(s: &ParserSettings) -> SliceDesc203 = start:slice_part(s) ":" pair:(end:slice_part(s) step:(":" e:slice_part(s){e})? {(end, step.flatten())})? {204 let (end, step) = if let Some((end, step)) = pair {205 (end, step)206 }else{207 (None, None)208 };209210 SliceDesc { start, end, step }211 }212213 rule binop(x: rule<()>) -> ()214 = quiet!{ x() } / expected!("<binary op>")215 rule unaryop(x: rule<()>) -> ()216 = quiet!{ x() } / expected!("<unary op>")217218 rule expr(s: &ParserSettings) -> LocExpr219 = start:position!() a:precedence! {220 a:(@) _ binop(<"||">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Or, b))}221 --222 a:(@) _ binop(<"&&">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::And, b))}223 --224 a:(@) _ binop(<"|">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::BitOr, b))}225 --226 a:@ _ binop(<"^">) _ b:(@) {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::BitXor, b))}227 --228 a:(@) _ binop(<"&">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::BitAnd, b))}229 --230 a:(@) _ binop(<"==">) _ b:@ {loc_expr_todo!(Expr::Apply(231 el!(Expr::Intrinsic("equals".into())),232 ArgsDesc(vec![Arg(None, a), Arg(None, b)]),233 true234 ))}235 a:(@) _ binop(<"!=">) _ b:@ {loc_expr_todo!(Expr::UnaryOp(UnaryOpType::Not, el!(Expr::Apply(236 el!(Expr::Intrinsic("equals".into())),237 ArgsDesc(vec![Arg(None, a), Arg(None, b)]),238 true239 ))))}240 --241 a:(@) _ binop(<"<">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Lt, b))}242 a:(@) _ binop(<">">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Gt, b))}243 a:(@) _ binop(<"<=">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Lte, b))}244 a:(@) _ binop(<">=">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Gte, b))}245 a:(@) _ binop(<keyword("in")>) _ b:@ {loc_expr_todo!(Expr::Apply(246 el!(Expr::Intrinsic("objectHasEx".into())), ArgsDesc(vec![Arg(None, b), Arg(None, a), Arg(None, el!(Expr::Literal(LiteralType::True)))]),247 true248 ))}249 --250 a:(@) _ binop(<"<<">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Lhs, b))}251 a:(@) _ binop(<">>">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Rhs, b))}252 --253 a:(@) _ binop(<"+">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Add, b))}254 a:(@) _ binop(<"-">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Sub, b))}255 --256 a:(@) _ binop(<"*">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Mul, b))}257 a:(@) _ binop(<"/">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Div, b))}258 a:(@) _ binop(<"%">) _ b:@ {loc_expr_todo!(Expr::Apply(259 el!(Expr::Intrinsic("mod".into())), ArgsDesc(vec![Arg(None, a), Arg(None, b)]),260 false261 ))}262 --263 unaryop(<"-">) _ b:@ {loc_expr_todo!(Expr::UnaryOp(UnaryOpType::Minus, b))}264 unaryop(<"!">) _ b:@ {loc_expr_todo!(Expr::UnaryOp(UnaryOpType::Not, b))}265 unaryop(<"~">) _ b:@ { loc_expr_todo!(Expr::UnaryOp(UnaryOpType::BitNot, b)) }266 --267 a:(@) _ "[" _ s:slice_desc(s) _ "]" {loc_expr_todo!(Expr::Apply(268 el!(Expr::Intrinsic("slice".into())),269 ArgsDesc(vec![270 Arg(None, a),271 Arg(None, s.start.unwrap_or_else(||el!(Expr::Literal(LiteralType::Null)))),272 Arg(None, s.end.unwrap_or_else(||el!(Expr::Literal(LiteralType::Null)))),273 Arg(None, s.step.unwrap_or_else(||el!(Expr::Literal(LiteralType::Null)))),274 ]),275 true,276 ))}277 a:(@) _ "." _ s:$(id()) {loc_expr_todo!(Expr::Index(a, el!(Expr::Str(s.into()))))}278 a:(@) _ "[" _ s:expr(s) _ "]" {loc_expr_todo!(Expr::Index(a, s))}279 a:(@) _ "(" _ args:args(s) _ ")" ts:(_ keyword("tailstrict"))? {loc_expr_todo!(Expr::Apply(a, args, ts.is_some()))}280 a:(@) _ "{" _ body:objinside(s) _ "}" {loc_expr_todo!(Expr::ObjExtend(a, body))}281 --282 e:expr_basic(s) {e}283 "(" _ e:expr(s) _ ")" {loc_expr_todo!(Expr::Parened(e))}284 } end:position!() {285 let LocExpr(e, _) = a;286 LocExpr(e, if s.loc_data {287 Some(ExprLocation(s.file_name.clone(), start, end))288 } else {289 None290 })291 }292 / e:expr_basic(s) {e}293294 pub rule jsonnet(s: &ParserSettings) -> LocExpr = _ e:expr(s) _ {e}295 }296}297298pub type ParseError = peg::error::ParseError<peg::str::LineCol>;299pub fn parse(str: &str, settings: &ParserSettings) -> Result<LocExpr, ParseError> {300 jsonnet_parser::jsonnet(str, settings)301}302303#[macro_export]304macro_rules! el {305 ($expr:expr) => {306 LocExpr(std::rc::Rc::new($expr), None)307 };308}309310#[cfg(test)]311pub mod tests {312 use super::{expr::*, parse};313 use crate::ParserSettings;314 use std::path::PathBuf;315 use std::rc::Rc;316317 macro_rules! parse {318 ($s:expr) => {319 parse(320 $s,321 &ParserSettings {322 loc_data: false,323 file_name: Rc::new(PathBuf::from("/test.jsonnet")),324 },325 )326 .unwrap()327 };328 }329330 mod expressions {331 use super::*;332333 pub fn basic_math() -> LocExpr {334 el!(Expr::BinaryOp(335 el!(Expr::Num(2.0)),336 BinaryOpType::Add,337 el!(Expr::BinaryOp(338 el!(Expr::Num(2.0)),339 BinaryOpType::Mul,340 el!(Expr::Num(2.0)),341 )),342 ))343 }344 }345346 #[test]347 fn multiline_string() {348 assert_eq!(349 parse!("|||\n Hello world!\n a\n|||"),350 el!(Expr::Str("Hello world!\n a\n".into())),351 );352 assert_eq!(353 parse!("|||\n Hello world!\n a\n|||"),354 el!(Expr::Str("Hello world!\n a\n".into())),355 );356 assert_eq!(357 parse!("|||\n\t\tHello world!\n\t\t\ta\n|||"),358 el!(Expr::Str("Hello world!\n\ta\n".into())),359 );360 assert_eq!(361 parse!("|||\n Hello world!\n a\n |||"),362 el!(Expr::Str("Hello world!\n a\n".into())),363 );364 }365366 #[test]367 fn slice() {368 parse!("a[1:]");369 parse!("a[1::]");370 parse!("a[:1:]");371 parse!("a[::1]");372 parse!("str[:len - 1]");373 }374375 #[test]376 fn string_escaping() {377 assert_eq!(378 parse!(r#""Hello, \"world\"!""#),379 el!(Expr::Str(r#"Hello, "world"!"#.into())),380 );381 assert_eq!(382 parse!(r#"'Hello \'world\'!'"#),383 el!(Expr::Str("Hello 'world'!".into())),384 );385 assert_eq!(parse!(r#"'\\\\'"#), el!(Expr::Str("\\\\".into())),);386 }387388 #[test]389 fn string_unescaping() {390 assert_eq!(391 parse!(r#""Hello\nWorld""#),392 el!(Expr::Str("Hello\nWorld".into())),393 );394 }395396 #[test]397 fn string_verbantim() {398 assert_eq!(399 parse!(r#"@"Hello\n""World""""#),400 el!(Expr::Str("Hello\\n\"World\"".into())),401 );402 }403404 #[test]405 fn imports() {406 assert_eq!(407 parse!("import \"hello\""),408 el!(Expr::Import(PathBuf::from("hello"))),409 );410 assert_eq!(411 parse!("importstr \"garnish.txt\""),412 el!(Expr::ImportStr(PathBuf::from("garnish.txt")))413 );414 }415416 #[test]417 fn empty_object() {418 assert_eq!(parse!("{}"), el!(Expr::Obj(ObjBody::MemberList(vec![]))));419 }420421 #[test]422 fn basic_math() {423 assert_eq!(424 parse!("2+2*2"),425 el!(Expr::BinaryOp(426 el!(Expr::Num(2.0)),427 BinaryOpType::Add,428 el!(Expr::BinaryOp(429 el!(Expr::Num(2.0)),430 BinaryOpType::Mul,431 el!(Expr::Num(2.0))432 ))433 ))434 );435 }436437 #[test]438 fn basic_math_with_indents() {439 assert_eq!(parse!("2 + 2 * 2 "), expressions::basic_math());440 }441442 #[test]443 fn basic_math_parened() {444 assert_eq!(445 parse!("2+(2+2*2)"),446 el!(Expr::BinaryOp(447 el!(Expr::Num(2.0)),448 BinaryOpType::Add,449 el!(Expr::Parened(expressions::basic_math())),450 ))451 );452 }453454 /// Comments should not affect parsing455 #[test]456 fn comments() {457 assert_eq!(458 parse!("2//comment\n+//comment\n3/*test*/*/*test*/4"),459 el!(Expr::BinaryOp(460 el!(Expr::Num(2.0)),461 BinaryOpType::Add,462 el!(Expr::BinaryOp(463 el!(Expr::Num(3.0)),464 BinaryOpType::Mul,465 el!(Expr::Num(4.0))466 ))467 ))468 );469 }470471 /// Comments should be able to be escaped472 #[test]473 fn comment_escaping() {474 assert_eq!(475 parse!("2/*\\*/+*/ - 22"),476 el!(Expr::BinaryOp(477 el!(Expr::Num(2.0)),478 BinaryOpType::Sub,479 el!(Expr::Num(22.0))480 ))481 );482 }483484 #[test]485 fn suffix() {486 // assert_eq!(parse!("std.test"), el!(Expr::Num(2.2)));487 // assert_eq!(parse!("std(2)"), el!(Expr::Num(2.2)));488 // assert_eq!(parse!("std.test(2)"), el!(Expr::Num(2.2)));489 // assert_eq!(parse!("a[b]"), el!(Expr::Num(2.2)))490 }491492 #[test]493 fn array_comp() {494 use Expr::*;495 assert_eq!(496 parse!("[std.deepJoin(x) for x in arr]"),497 el!(ArrComp(498 el!(Apply(499 el!(Index(el!(Var("std".into())), el!(Str("deepJoin".into())))),500 ArgsDesc(vec![Arg(None, el!(Var("x".into())))]),501 false,502 )),503 vec![CompSpec::ForSpec(ForSpecData(504 "x".into(),505 el!(Var("arr".into()))506 ))]507 )),508 )509 }510511 #[test]512 fn reserved() {513 use Expr::*;514 assert_eq!(parse!("null"), el!(Literal(LiteralType::Null)));515 assert_eq!(parse!("nulla"), el!(Var("nulla".into())));516 }517518 #[test]519 fn multiple_args_buf() {520 parse!("a(b, null_fields)");521 }522523 #[test]524 fn infix_precedence() {525 use Expr::*;526 assert_eq!(527 parse!("!a && !b"),528 el!(BinaryOp(529 el!(UnaryOp(UnaryOpType::Not, el!(Var("a".into())))),530 BinaryOpType::And,531 el!(UnaryOp(UnaryOpType::Not, el!(Var("b".into()))))532 ))533 );534 }535536 #[test]537 fn infix_precedence_division() {538 use Expr::*;539 assert_eq!(540 parse!("!a / !b"),541 el!(BinaryOp(542 el!(UnaryOp(UnaryOpType::Not, el!(Var("a".into())))),543 BinaryOpType::Div,544 el!(UnaryOp(UnaryOpType::Not, el!(Var("b".into()))))545 ))546 );547 }548549 #[test]550 fn double_negation() {551 use Expr::*;552 assert_eq!(553 parse!("!!a"),554 el!(UnaryOp(555 UnaryOpType::Not,556 el!(UnaryOp(UnaryOpType::Not, el!(Var("a".into()))))557 ))558 )559 }560561 #[test]562 fn array_test_error() {563 parse!("[a for a in b if c for e in f]");564 // ^^^^ failed code565 }566567 #[test]568 fn can_parse_stdlib() {569 parse!(jrsonnet_stdlib::STDLIB_STR);570 }571572 // From source code573 /*574 #[bench]575 fn bench_parse_peg(b: &mut Bencher) {576 b.iter(|| parse!(jrsonnet_stdlib::STDLIB_STR))577 }578 */579}crates/jrsonnet-types/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-types/src/lib.rs
+++ b/crates/jrsonnet-types/src/lib.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::redundant_closure_call)]
+
use std::fmt::Display;
#[macro_export]