difftreelog
fix(parser) move suffixes to expr_basic, function parsing BREAKING CHANGE: Renamed: Args => ArgsDesc Params => ParamsDesc
in: master
2 files changed
crates/jsonnet-parser/src/expr.rsdiffbeforeafterboth29 },29 },30 Function {30 Function {31 name: FieldName,31 name: FieldName,32 params: Params,32 params: ParamsDesc,33 visibility: Visibility,33 visibility: Visibility,34 value: Expr,34 value: Expr,35 },35 },747475 BitAnd,75 BitAnd,76 BitOr,76 BitOr,77 BitXor,7877 And,79 And,78 Or,80 Or,7980 BitXor,81}81}828283#[derive(Debug, Clone, PartialEq)]83#[derive(Debug, Clone, PartialEq)]87}87}888889#[derive(Debug, Clone, PartialEq)]89#[derive(Debug, Clone, PartialEq)]90pub struct Params(pub Vec<Param>);90pub struct ParamsDesc(pub Vec<Param>);919192#[derive(Debug, Clone, PartialEq)]92#[derive(Debug, Clone, PartialEq)]93pub enum Arg {93pub enum Arg {96}96}979798#[derive(Debug, Clone, PartialEq)]98#[derive(Debug, Clone, PartialEq)]99pub struct Args(pub Vec<Arg>);99pub struct ArgsDesc(pub Vec<Arg>);100100101#[derive(Debug, Clone, PartialEq)]101#[derive(Debug, Clone, PartialEq)]102pub enum Bind {102pub enum Bind {103 Value(String, Box<Expr>),103 Value(String, Box<Expr>),104 Function(String, Params, Box<Expr>),104 Function(String, ParamsDesc, Box<Expr>),105}105}106106107#[derive(Debug, Clone, PartialEq)]107#[derive(Debug, Clone, PartialEq)]179 /// (obj)179 /// (obj)180 Parened(Box<Expr>),180 Parened(Box<Expr>),181181182 Params(Params),182 Params(ParamsDesc),183 Args(Args),183 Args(ArgsDesc),184184185 UnaryOp(UnaryOpType, Box<Expr>),185 UnaryOp(UnaryOpType, Box<Expr>),186 BinaryOp(Box<Expr>, BinaryOpType, Box<Expr>),186 BinaryOp(Box<Expr>, BinaryOpType, Box<Expr>),191 Import(String),191 Import(String),192 ImportStr(String),192 ImportStr(String),193 Error(Box<Expr>),193 Error(Box<Expr>),194 Apply(Box<Expr>, Args),194 Apply(Box<Expr>, ArgsDesc),195 Select(Box<Expr>, String),195 Select(Box<Expr>, String),196 Index(Box<Expr>, Box<Expr>),196 Index(Box<Expr>, Box<Expr>),197 Slice {197 Slice {200 end: Option<Box<Expr>>,200 end: Option<Box<Expr>>,201 step: Option<Box<Expr>>,201 step: Option<Box<Expr>>,202 },202 },203 Function(Params, Box<Expr>),203 Function(ParamsDesc, Box<Expr>),204 IfElse {204 IfElse {205 cond: IfSpec,205 cond: IfSpec,206 cond_then: Box<Expr>,206 cond_then: Box<Expr>,crates/jsonnet-parser/src/lib.rsdiffbeforeafterboth--- a/crates/jsonnet-parser/src/lib.rs
+++ b/crates/jsonnet-parser/src/lib.rs
@@ -1,3 +1,5 @@
+#![feature(box_syntax)]
+
use peg::parser;
mod expr;
@@ -6,7 +8,7 @@
enum Suffix {
String(String),
Expression(Expr),
- Apply(expr::Args),
+ Apply(expr::ArgsDesc),
}
parser! {
@@ -18,27 +20,33 @@
rule digit() -> char = d:$(['0'..='9']) {d.chars().nth(0).unwrap()}
rule int() -> u32 = a:$(digit()+) { a.parse().unwrap() }
rule number() -> f64 = quiet!{a:$((['-'|'+'])? int() ("." int())? (['e'|'E'] (s:['+'|'-'])? int())?) { a.parse().unwrap() }} / expected!("<number>")
- rule id() -> String = quiet!{ !("local" / "super" / "self" / "true" / "false" / "null" / "$" / "if" / "then" / "else") s:$(alpha() (alpha() / digit())*) {s.to_owned()}} / expected!("<identifier>")
+ rule id() -> String = quiet!{ !("local" / "super" / "self" / "true" / "false" / "null" / "$" / "if" / "then" / "else" / "function") s:$(alpha() (alpha() / digit())*) {s.to_owned()}} / expected!("<identifier>")
pub rule positional_param() -> expr::Param = name:id() {expr::Param::Positional(name)}
pub rule named_param() -> expr::Param = name:id() __() "=" __() expr:boxed_expr() {expr::Param::Named(name, expr)}
- pub rule params() -> expr::Params
- = positionals:(positional_param() ** delimiter()) delimiter() named:(named_param() ** delimiter()) {
- expr::Params([&positionals[..], &named[..]].concat())
+ pub rule params() -> expr::ParamsDesc
+ = positionals:(positional_param() ** delimiter()) named: (delimiter() named:(named_param() ** delimiter()) {named})? {
+ if named.is_some() {
+ expr::ParamsDesc([&positionals[..], &named.unwrap()[..]].concat())
+ } else {
+ expr::ParamsDesc(positionals)
+ }
}
- / named:(named_param() ** delimiter()) {expr::Params(named)}
- / positionals:(positional_param() ** delimiter()) {expr::Params(positionals)}
- / {expr::Params(Vec::new())}
+ / named:(named_param() ** delimiter()) {expr::ParamsDesc(named)}
+ / {expr::ParamsDesc(Vec::new())}
pub rule positional_arg() -> expr::Arg = quiet!{name:boxed_expr() {expr::Arg::Positional(name)}}/expected!("<positional arg>")
pub rule named_arg() -> expr::Arg = quiet!{name:id() __() "=" __() expr:boxed_expr() {expr::Arg::Named(name, expr)}}/expected!("<named arg>")
- pub rule args() -> expr::Args
- = positionals:(positional_arg() ** delimiter()) delimiter() named:(named_arg() ** delimiter()) {
- expr::Args([&positionals[..], &named[..]].concat())
+ pub rule args() -> expr::ArgsDesc
+ = positionals:(positional_arg() ** delimiter()) named: (delimiter() named:(named_arg() ** delimiter()) {named})? {
+ if named.is_some() {
+ expr::ArgsDesc([&positionals[..], &named.unwrap()[..]].concat())
+ } else {
+ expr::ArgsDesc(positionals)
+ }
}
- / named:(named_arg() ** delimiter()) {expr::Args(named)}
- / positionals:(positional_arg() ** delimiter()) {expr::Args(positionals)}
- / {expr::Args(Vec::new())}
+ / named:(named_arg() ** delimiter()) {expr::ArgsDesc(named)}
+ / {expr::ArgsDesc(Vec::new())}
pub rule bind() -> expr::Bind
= name:id() __() "=" __() expr:boxed_expr() {expr::Bind::Value(name, expr)}
@@ -118,6 +126,27 @@
/ if_then_else_expr()
/ local_expr()
+ / "function" __() "(" __() params:params() __() ")" __() expr:boxed_expr() {Expr::Function(params, expr)}
+
+ rule expr_basic_with_suffix() -> Expr
+ = a:expr_basic() suffixes:(__() suffix:expr_suffix() {suffix})* {
+ let mut cur = a;
+ for suffix in suffixes {
+ match suffix {
+ Suffix::String(index) => {
+ cur = Expr::Index(Box::new(cur), Box::new(Expr::Str(index)))
+ },
+ Suffix::Expression(index) => {
+ cur = Expr::Index(Box::new(cur), Box::new(index))
+ },
+ Suffix::Apply(args) => {
+ cur = Expr::Apply(Box::new(cur), args)
+ }
+ }
+ }
+ cur
+ }
+
rule expr_suffix() -> Suffix
= "." __() s:id() { Suffix::String(s) }
/ "[" __() s:expr() __() "]" { Suffix::Expression(s) }
@@ -153,26 +182,10 @@
a:(@) __() "/" __() b:@ {Expr::BinaryOp(Box::new(a), expr::BinaryOpType::Div, Box::new(b))}
a:(@) __() "%" __() b:@ {Expr::BinaryOp(Box::new(a), expr::BinaryOpType::Mod, Box::new(b))}
--
- e:expr_basic() {e}
+ e:expr_basic_with_suffix() {e}
"(" __() e:boxed_expr() __() ")" {Expr::Parened(e)}
- } suffixes:(__() suffix:expr_suffix() {suffix})* {
- let mut cur = a;
- for suffix in suffixes {
- match suffix {
- Suffix::String(index) => {
- cur = Expr::Index(Box::new(cur), Box::new(Expr::Str(index)))
- },
- Suffix::Expression(index) => {
- cur = Expr::Index(Box::new(cur), Box::new(index))
- },
- Suffix::Apply(args) => {
- cur = Expr::Apply(Box::new(cur), args)
- }
- }
- }
- cur
}
- / e:expr_basic() {e}
+ / e:expr_basic_with_suffix() {e}
pub rule boxed_expr() -> Box<Expr> = e:expr() {Box::new(e)}
pub rule jsonnet() -> Expr = __() e:expr() __() {e}
@@ -206,4 +219,20 @@
)
);
}
+
+ #[test]
+ fn suffix_comparsion() {
+ use Expr::*;
+ assert_eq!(
+ parse("std.type(a) == \"string\"").unwrap(),
+ BinaryOp(
+ box Apply(
+ box Index(box Var("std".to_owned()), box Str("type".to_owned())),
+ ArgsDesc(vec![Arg::Positional(box Var("a".to_owned()))])
+ ),
+ BinaryOpType::Eq,
+ box Str("string".to_owned())
+ )
+ );
+ }
}