difftreelog
feat(parser) tailstrict call, multiline
in: master
3 files changed
crates/jsonnet-parser/src/expr.rsdiffbeforeafterboth1use serde::{Deserialize, Serialize};2use std::{fmt::Debug, path::PathBuf, rc::Rc};34#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]5pub enum FieldName {6 /// {fixed: 2}7 Fixed(String),8 /// {["dyn"+"amic"]: 3}9 Dyn(LocExpr),10}1112#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]13pub enum Visibility {14 /// :15 Normal,16 /// ::17 Hidden,18 /// :::19 Unhide,20}2122#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]23pub struct AssertStmt(pub LocExpr, pub Option<LocExpr>);2425#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]26pub struct FieldMember {27 pub name: FieldName,28 pub plus: bool,29 pub params: Option<ParamsDesc>,30 pub visibility: Visibility,31 pub value: LocExpr,32}3334#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]35pub enum Member {36 Field(FieldMember),37 BindStmt(BindSpec),38 AssertStmt(AssertStmt),39}4041#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]42pub enum UnaryOpType {43 Plus,44 Minus,45 BitNot,46 Not,47}4849#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]50pub enum BinaryOpType {51 Mul,52 Div,5354 Add,55 Sub,5657 Lhs,58 Rhs,5960 Lt,61 Gt,62 Lte,63 Gte,6465 In,6667 BitAnd,68 BitOr,69 BitXor,7071 And,72 Or,73}7475/// name, default value76#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]77pub struct Param(pub String, pub Option<LocExpr>);78/// Defined function parameters79#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]80pub struct ParamsDesc(pub Vec<Param>);81impl ParamsDesc {82 pub fn with_defaults(&self) -> Vec<Param> {83 self.0.iter().filter(|e| e.1.is_some()).cloned().collect()84 }85}8687#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]88pub struct Arg(pub Option<String>, pub LocExpr);89#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]90pub struct ArgsDesc(pub Vec<Arg>);9192#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]93pub struct BindSpec {94 pub name: String,95 pub params: Option<ParamsDesc>,96 pub value: LocExpr,97}9899#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]100pub struct IfSpecData(pub LocExpr);101#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]102pub struct ForSpecData(pub String, pub LocExpr);103104#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]105pub enum CompSpec {106 IfSpec(IfSpecData),107 ForSpec(ForSpecData),108}109110#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]111pub enum ObjBody {112 MemberList(Vec<Member>),113 ObjComp {114 pre_locals: Vec<BindSpec>,115 key: LocExpr,116 value: LocExpr,117 post_locals: Vec<BindSpec>,118 rest: Vec<CompSpec>,119 },120}121122#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]123pub enum LiteralType {124 This,125 Super,126 Dollar,127 Null,128 True,129 False,130}131132#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]133pub struct SliceDesc {134 pub start: Option<LocExpr>,135 pub end: Option<LocExpr>,136 pub step: Option<LocExpr>,137}138139/// Syntax base140#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]141pub enum Expr {142 Literal(LiteralType),143144 /// String value: "hello"145 Str(String),146 /// Number: 1, 2.0, 2e+20147 Num(f64),148 /// Variable name: test149 Var(String),150151 /// Array of expressions: [1, 2, "Hello"]152 Arr(Vec<LocExpr>),153 /// Array comprehension:154 /// ```jsonnet155 /// ingredients: [156 /// { kind: kind, qty: 4 / 3 }157 /// for kind in [158 /// 'Honey Syrup',159 /// 'Lemon Juice',160 /// 'Farmers Gin',161 /// ]162 /// ],163 /// ```164 ArrComp(LocExpr, Vec<CompSpec>),165166 /// Object: {a: 2}167 Obj(ObjBody),168 /// Object extension: var1 {b: 2}169 ObjExtend(LocExpr, ObjBody),170171 /// (obj)172 Parened(LocExpr),173174 /// Params in function definition175 /// hello, world, test = 2176 Params(ParamsDesc),177 /// Args in function call178 /// 2 + 2, 3, named = 6179 Args(ArgsDesc),180181 /// -2182 UnaryOp(UnaryOpType, LocExpr),183 /// 2 - 2184 BinaryOp(LocExpr, BinaryOpType, LocExpr),185 /// assert 2 == 2 : "Math is broken"186 AssertExpr(AssertStmt, LocExpr),187 /// local a = 2; { b: a }188 LocalExpr(Vec<BindSpec>, LocExpr),189190 /// a = 3191 Bind(BindSpec),192 /// import "hello"193 Import(String),194 /// importStr "file.txt"195 ImportStr(String),196 /// error "I'm broken"197 Error(LocExpr),198 /// a(b, c)199 Apply(LocExpr, ArgsDesc),200 ///201 Select(LocExpr, String),202 /// a[b]203 Index(LocExpr, LocExpr),204 /// a[1::2]205 Slice(LocExpr, SliceDesc),206 /// function(x) x207 Function(ParamsDesc, LocExpr),208 /// if true == false then 1 else 2209 IfElse {210 cond: IfSpecData,211 cond_then: LocExpr,212 cond_else: Option<LocExpr>,213 },214 /// if 2 = 3215 IfSpec(IfSpecData),216 /// for elem in array217 ForSpec(ForSpecData),218}219220/// file, begin offset, end offset221#[derive(Clone, PartialEq, Serialize, Deserialize)]222pub struct ExprLocation(pub PathBuf, pub usize, pub usize);223impl Debug for ExprLocation {224 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {225 write!(f, "{:?}:{:?}-{:?}", self.0, self.1, self.2)226 }227}228229/// Holds AST expression and its location in source file+230#[derive(Clone, PartialEq, Serialize, Deserialize)]231pub struct LocExpr(pub Rc<Expr>, pub Option<Rc<ExprLocation>>);232impl Debug for LocExpr {233 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {234 write!(f, "{:?} from {:?}", self.0, self.1)235 }236}237238/// Creates LocExpr from Expr and ExprLocation components239#[macro_export]240macro_rules! loc_expr {241 ($expr:expr, $need_loc:expr,($name:expr, $start:expr, $end:expr)) => {242 LocExpr(243 std::rc::Rc::new($expr),244 if $need_loc {245 Some(std::rc::Rc::new(ExprLocation(246 $name.to_owned(),247 $start,248 $end,249 )))250 } else {251 None252 },253 )254 };255}256257/// Creates LocExpr without location info258#[macro_export]259macro_rules! loc_expr_todo {260 ($expr:expr) => {261 LocExpr(Rc::new($expr), None)262 };263}crates/jsonnet-parser/src/lib.rsdiffbeforeafterboth--- a/crates/jsonnet-parser/src/lib.rs
+++ b/crates/jsonnet-parser/src/lib.rs
@@ -6,8 +6,10 @@
use peg::parser;
use std::{path::PathBuf, rc::Rc};
mod expr;
+mod string_processing;
pub use expr::*;
pub use peg;
+use string_processing::deent;
pub struct ParserSettings {
pub loc_data: bool,
@@ -77,9 +79,26 @@
/ name:id() _ "(" _ params:params(s) _ ")" _ "=" _ expr:expr(s) {expr::BindSpec{name, params: Some(params), value: expr}}
pub rule assertion(s: &ParserSettings) -> expr::AssertStmt
= keyword("assert") _ cond:expr(s) msg:(_ ":" _ e:expr(s) {e})? { expr::AssertStmt(cond, msg) }
+
+ pub rule whole_line() -> String
+ = str:$((!['\n'][_])* "\n") {str.to_owned()}
pub rule string() -> String
- = v:("\"" str:$(("\\\"" / !['"'][_])*) "\"" {str.to_owned()}
- / "'" str:$((!['\''][_])*) "'" {str.to_owned()}) {v.replace("\\n", "\n")}
+ = "\"" str:$(("\\\"" / !['"'][_])*) "\"" {str.to_owned()}
+ / "'" str:$((!['\''][_])*) "'" {str.to_owned()}
+ // TODO: This is temporary workaround, i still dont know how to write this correctly btw.
+ / "|||" "\n" str:$((" "*<1, 1> whole_line())+) " "*<0, 0> "|||" {deent(str)}
+ / "|||" "\n" str:$((" "*<2, 2> whole_line())+) " "*<1, 1> "|||" {deent(str)}
+ / "|||" "\n" str:$((" "*<3, 3> whole_line())+) " "*<2, 2> "|||" {deent(str)}
+ / "|||" "\n" str:$((" "*<4, 4> whole_line())+) " "*<3, 3> "|||" {deent(str)}
+ / "|||" "\n" str:$((" "*<5, 5> whole_line())+) " "*<4, 4> "|||" {deent(str)}
+ / "|||" "\n" str:$((" "*<6, 6> whole_line())+) " "*<5, 5> "|||" {deent(str)}
+ / "|||" "\n" str:$((" "*<7, 7> whole_line())+) " "*<6, 6> "|||" {deent(str)}
+ / "|||" "\n" str:$((" "*<8, 8> whole_line())+) " "*<7, 7> "|||" {deent(str)}
+ / "|||" "\n" str:$((" "*<9, 9> whole_line())+) " "*<8, 8> "|||" {deent(str)}
+ / "|||" "\n" str:$((" "*<10, 10> whole_line())+) " "*<9, 9> "|||" {deent(str)}
+ / "|||" "\n" str:$((" "*<11, 11> whole_line())+) " "*<10, 10> "|||" {deent(str)}
+ / "|||" "\n" str:$((" "*<12, 12> whole_line())+) " "*<11, 10> "|||" {deent(str)}
+
pub rule field_name(s: &ParserSettings) -> expr::FieldName
= name:id() {expr::FieldName::Fixed(name)}
/ name:string() {expr::FieldName::Fixed(name)}
@@ -200,13 +219,17 @@
el!(Expr::Index(
el!(Expr::Var("std".to_owned())),
el!(Expr::Str("equals".to_owned()))
- )), ArgsDesc(vec![Arg(None, a), Arg(None, b)])
+ )),
+ ArgsDesc(vec![Arg(None, a), Arg(None, b)]),
+ true
))}
a:(@) _ "!=" _ b:@ {loc_expr_todo!(Expr::UnaryOp(UnaryOpType::Not, el!(Expr::Apply(
el!(Expr::Index(
el!(Expr::Var("std".to_owned())),
el!(Expr::Str("equals".to_owned()))
- )), ArgsDesc(vec![Arg(None, a), Arg(None, b)])
+ )),
+ ArgsDesc(vec![Arg(None, a), Arg(None, b)]),
+ true
))))}
--
a:(@) _ "<" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Lt, b))}
@@ -226,7 +249,8 @@
el!(Expr::Index(
el!(Expr::Var("std".to_owned())),
el!(Expr::Str("mod".to_owned()))
- )), ArgsDesc(vec![Arg(None, a), Arg(None, b)])
+ )), ArgsDesc(vec![Arg(None, a), Arg(None, b)]),
+ true
))}
--
"-" _ b:@ {loc_expr_todo!(Expr::UnaryOp(UnaryOpType::Minus, b))}
@@ -236,7 +260,7 @@
a:(@) _ "[" _ s:slice_desc(s) _ "]" {loc_expr_todo!(Expr::Slice(a, s))}
a:(@) _ "." _ s:id() {loc_expr_todo!(Expr::Index(a, el!(Expr::Str(s))))}
a:(@) _ "[" _ s:expr(s) _ "]" {loc_expr_todo!(Expr::Index(a, s))}
- a:(@) _ "(" _ args:args(s) _ ")" (_ keyword("tailstrict"))? {loc_expr_todo!(Expr::Apply(a, args))}
+ a:(@) _ "(" _ args:args(s) _ ")" ts:(_ keyword("tailstrict"))? {loc_expr_todo!(Expr::Apply(a, args, ts.is_some()))}
a:(@) _ "{" _ body:objinside(s) _ "}" {loc_expr_todo!(Expr::ObjExtend(a, body))}
--
e:expr_basic(s) {e}
@@ -303,6 +327,14 @@
}
#[test]
+ fn multiline_string() {
+ assert_eq!(
+ parse!("|||\n Hello world!\n a\n|||"),
+ el!(Expr::Str(" Hello world!\na\n".to_owned())),
+ )
+ }
+
+ #[test]
fn empty_object() {
assert_eq!(parse!("{}"), el!(Expr::Obj(ObjBody::MemberList(vec![]))));
}
@@ -389,7 +421,8 @@
el!(Var("std".to_owned())),
el!(Str("deepJoin".to_owned()))
)),
- ArgsDesc(vec![Arg(None, el!(Var("x".to_owned())))])
+ ArgsDesc(vec![Arg(None, el!(Var("x".to_owned())))]),
+ false,
)),
vec![CompSpec::ForSpec(ForSpecData(
"x".to_owned(),
crates/jsonnet-parser/src/string_processing.rsdiffbeforeafterboth--- /dev/null
+++ b/crates/jsonnet-parser/src/string_processing.rs
@@ -0,0 +1,29 @@
+/// Returns string with stripped line padding characters
+pub fn deent(input: &str) -> String {
+ if input.is_empty() {
+ return "".to_owned();
+ }
+ let min_ident = input
+ .split('\n')
+ .filter(|s| !s.is_empty())
+ .map(|ss| ss.chars().take_while(|c| *c == ' ').count())
+ .min()
+ .unwrap();
+ input
+ .split('\n')
+ .map(|s| s.chars().skip(min_ident).collect::<String>())
+ .collect::<Vec<String>>()
+ .join("\n")
+}
+
+#[cfg(test)]
+pub mod tests {
+ use super::*;
+ #[test]
+ fn deent_tests() {
+ assert_eq!(deent(" aaa"), "aaa");
+ assert_eq!(deent(" aaa\n bbb"), " aaa\nbbb");
+ assert_eq!(deent(" aaa\n bbb"), "aaa\n bbb");
+ assert_eq!(deent(" aaa\n\n bbb"), "aaa\n\n bbb");
+ }
+}