git.delta.rocks / jrsonnet / refs/commits / ff23e408f240

difftreelog

feat(parser) in operator desugaring

Лач2020-06-10parent: #9fc7fc5.patch.diff
in: master

2 files changed

modifiedcrates/jsonnet-parser/src/expr.rsdiffbeforeafterboth
before · crates/jsonnet-parser/src/expr.rs
1use serde::{Deserialize, Serialize};2use std::{fmt::Debug, ops::Deref, 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 Deref for ParamsDesc {82	type Target = Vec<Param>;83	fn deref(&self) -> &Self::Target {84		&self.085	}86}8788#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]89pub struct Arg(pub Option<String>, pub LocExpr);90#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]91pub struct ArgsDesc(pub Vec<Arg>);92impl Deref for ArgsDesc {93	type Target = Vec<Arg>;94	fn deref(&self) -> &Self::Target {95		&self.096	}97}9899#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]100pub struct BindSpec {101	pub name: String,102	pub params: Option<ParamsDesc>,103	pub value: LocExpr,104}105106#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]107pub struct IfSpecData(pub LocExpr);108#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]109pub struct ForSpecData(pub String, pub LocExpr);110111#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]112pub enum CompSpec {113	IfSpec(IfSpecData),114	ForSpec(ForSpecData),115}116117#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]118pub enum ObjBody {119	MemberList(Vec<Member>),120	ObjComp {121		pre_locals: Vec<BindSpec>,122		key: LocExpr,123		value: LocExpr,124		post_locals: Vec<BindSpec>,125		rest: Vec<CompSpec>,126	},127}128129#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]130pub enum LiteralType {131	This,132	Super,133	Dollar,134	Null,135	True,136	False,137}138139#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]140pub struct SliceDesc {141	pub start: Option<LocExpr>,142	pub end: Option<LocExpr>,143	pub step: Option<LocExpr>,144}145146/// Syntax base147#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]148pub enum Expr {149	Literal(LiteralType),150151	/// String value: "hello"152	Str(String),153	/// Number: 1, 2.0, 2e+20154	Num(f64),155	/// Variable name: test156	Var(String),157158	/// Array of expressions: [1, 2, "Hello"]159	Arr(Vec<LocExpr>),160	/// Array comprehension:161	/// ```jsonnet162	///  ingredients: [163	///    { kind: kind, qty: 4 / 3 }164	///    for kind in [165	///      'Honey Syrup',166	///      'Lemon Juice',167	///      'Farmers Gin',168	///    ]169	///  ],170	/// ```171	ArrComp(LocExpr, Vec<CompSpec>),172173	/// Object: {a: 2}174	Obj(ObjBody),175	/// Object extension: var1 {b: 2}176	ObjExtend(LocExpr, ObjBody),177178	/// (obj)179	Parened(LocExpr),180181	/// Params in function definition182	/// hello, world, test = 2183	Params(ParamsDesc),184	/// Args in function call185	/// 2 + 2, 3, named = 6186	Args(ArgsDesc),187188	/// -2189	UnaryOp(UnaryOpType, LocExpr),190	/// 2 - 2191	BinaryOp(LocExpr, BinaryOpType, LocExpr),192	/// assert 2 == 2 : "Math is broken"193	AssertExpr(AssertStmt, LocExpr),194	/// local a = 2; { b: a }195	LocalExpr(Vec<BindSpec>, LocExpr),196197	/// a = 3198	Bind(BindSpec),199	/// import "hello"200	Import(PathBuf),201	/// importStr "file.txt"202	ImportStr(PathBuf),203	/// error "I'm broken"204	Error(LocExpr),205	/// a(b, c)206	Apply(LocExpr, ArgsDesc, bool),207	///208	Select(LocExpr, String),209	/// a[b]210	Index(LocExpr, LocExpr),211	/// a[1::2]212	Slice(LocExpr, SliceDesc),213	/// function(x) x214	Function(ParamsDesc, LocExpr),215	/// if true == false then 1 else 2216	IfElse {217		cond: IfSpecData,218		cond_then: LocExpr,219		cond_else: Option<LocExpr>,220	},221	/// if 2 = 3222	IfSpec(IfSpecData),223	/// for elem in array224	ForSpec(ForSpecData),225}226227/// file, begin offset, end offset228#[derive(Clone, PartialEq, Serialize, Deserialize)]229pub struct ExprLocation(pub PathBuf, pub usize, pub usize);230impl Debug for ExprLocation {231	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {232		write!(f, "{:?}:{:?}-{:?}", self.0, self.1, self.2)233	}234}235236/// Holds AST expression and its location in source file+237#[derive(Clone, PartialEq, Serialize, Deserialize)]238pub struct LocExpr(pub Rc<Expr>, pub Option<Rc<ExprLocation>>);239impl Debug for LocExpr {240	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {241		write!(f, "{:?} from {:?}", self.0, self.1)242	}243}244245/// Creates LocExpr from Expr and ExprLocation components246#[macro_export]247macro_rules! loc_expr {248	($expr:expr, $need_loc:expr,($name:expr, $start:expr, $end:expr)) => {249		LocExpr(250			std::rc::Rc::new($expr),251			if $need_loc {252				Some(std::rc::Rc::new(ExprLocation(253					$name.to_owned(),254					$start,255					$end,256				)))257			} else {258				None259				},260			)261	};262}263264/// Creates LocExpr without location info265#[macro_export]266macro_rules! loc_expr_todo {267	($expr:expr) => {268		LocExpr(Rc::new($expr), None)269	};270}
after · crates/jsonnet-parser/src/expr.rs
1use serde::{Deserialize, Serialize};2use std::{fmt::Debug, ops::Deref, 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	BitAnd,66	BitOr,67	BitXor,6869	And,70	Or,71}7273/// name, default value74#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]75pub struct Param(pub String, pub Option<LocExpr>);76/// Defined function parameters77#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]78pub struct ParamsDesc(pub Vec<Param>);79impl Deref for ParamsDesc {80	type Target = Vec<Param>;81	fn deref(&self) -> &Self::Target {82		&self.083	}84}8586#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]87pub struct Arg(pub Option<String>, pub LocExpr);88#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]89pub struct ArgsDesc(pub Vec<Arg>);90impl Deref for ArgsDesc {91	type Target = Vec<Arg>;92	fn deref(&self) -> &Self::Target {93		&self.094	}95}9697#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]98pub struct BindSpec {99	pub name: String,100	pub params: Option<ParamsDesc>,101	pub value: LocExpr,102}103104#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]105pub struct IfSpecData(pub LocExpr);106#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]107pub struct ForSpecData(pub String, pub LocExpr);108109#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]110pub enum CompSpec {111	IfSpec(IfSpecData),112	ForSpec(ForSpecData),113}114115#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]116pub enum ObjBody {117	MemberList(Vec<Member>),118	ObjComp {119		pre_locals: Vec<BindSpec>,120		key: LocExpr,121		value: LocExpr,122		post_locals: Vec<BindSpec>,123		rest: Vec<CompSpec>,124	},125}126127#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]128pub enum LiteralType {129	This,130	Super,131	Dollar,132	Null,133	True,134	False,135}136137#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]138pub struct SliceDesc {139	pub start: Option<LocExpr>,140	pub end: Option<LocExpr>,141	pub step: Option<LocExpr>,142}143144/// Syntax base145#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]146pub enum Expr {147	Literal(LiteralType),148149	/// String value: "hello"150	Str(String),151	/// Number: 1, 2.0, 2e+20152	Num(f64),153	/// Variable name: test154	Var(String),155156	/// Array of expressions: [1, 2, "Hello"]157	Arr(Vec<LocExpr>),158	/// Array comprehension:159	/// ```jsonnet160	///  ingredients: [161	///    { kind: kind, qty: 4 / 3 }162	///    for kind in [163	///      'Honey Syrup',164	///      'Lemon Juice',165	///      'Farmers Gin',166	///    ]167	///  ],168	/// ```169	ArrComp(LocExpr, Vec<CompSpec>),170171	/// Object: {a: 2}172	Obj(ObjBody),173	/// Object extension: var1 {b: 2}174	ObjExtend(LocExpr, ObjBody),175176	/// (obj)177	Parened(LocExpr),178179	/// Params in function definition180	/// hello, world, test = 2181	Params(ParamsDesc),182	/// Args in function call183	/// 2 + 2, 3, named = 6184	Args(ArgsDesc),185186	/// -2187	UnaryOp(UnaryOpType, LocExpr),188	/// 2 - 2189	BinaryOp(LocExpr, BinaryOpType, LocExpr),190	/// assert 2 == 2 : "Math is broken"191	AssertExpr(AssertStmt, LocExpr),192	/// local a = 2; { b: a }193	LocalExpr(Vec<BindSpec>, LocExpr),194195	/// a = 3196	Bind(BindSpec),197	/// import "hello"198	Import(PathBuf),199	/// importStr "file.txt"200	ImportStr(PathBuf),201	/// error "I'm broken"202	Error(LocExpr),203	/// a(b, c)204	Apply(LocExpr, ArgsDesc, bool),205	///206	Select(LocExpr, String),207	/// a[b]208	Index(LocExpr, LocExpr),209	/// a[1::2]210	Slice(LocExpr, SliceDesc),211	/// function(x) x212	Function(ParamsDesc, LocExpr),213	/// if true == false then 1 else 2214	IfElse {215		cond: IfSpecData,216		cond_then: LocExpr,217		cond_else: Option<LocExpr>,218	},219	/// if 2 = 3220	IfSpec(IfSpecData),221	/// for elem in array222	ForSpec(ForSpecData),223}224225/// file, begin offset, end offset226#[derive(Clone, PartialEq, Serialize, Deserialize)]227pub struct ExprLocation(pub PathBuf, pub usize, pub usize);228impl Debug for ExprLocation {229	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {230		write!(f, "{:?}:{:?}-{:?}", self.0, self.1, self.2)231	}232}233234/// Holds AST expression and its location in source file+235#[derive(Clone, PartialEq, Serialize, Deserialize)]236pub struct LocExpr(pub Rc<Expr>, pub Option<Rc<ExprLocation>>);237impl Debug for LocExpr {238	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {239		write!(f, "{:?} from {:?}", self.0, self.1)240	}241}242243/// Creates LocExpr from Expr and ExprLocation components244#[macro_export]245macro_rules! loc_expr {246	($expr:expr, $need_loc:expr,($name:expr, $start:expr, $end:expr)) => {247		LocExpr(248			std::rc::Rc::new($expr),249			if $need_loc {250				Some(std::rc::Rc::new(ExprLocation(251					$name.to_owned(),252					$start,253					$end,254				)))255			} else {256				None257				},258			)259	};260}261262/// Creates LocExpr without location info263#[macro_export]264macro_rules! loc_expr_todo {265	($expr:expr) => {266		LocExpr(Rc::new($expr), None)267	};268}
modifiedcrates/jsonnet-parser/src/lib.rsdiffbeforeafterboth
--- a/crates/jsonnet-parser/src/lib.rs
+++ b/crates/jsonnet-parser/src/lib.rs
@@ -242,6 +242,13 @@
 				a:(@) _ ">" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Gt, b))}
 				a:(@) _ "<=" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Lte, b))}
 				a:(@) _ ">=" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Gte, b))}
+				a:(@) _ keyword("in") _ b:@ {loc_expr_todo!(Expr::Apply(
+					el!(Expr::Index(
+						el!(Expr::Var("std".to_owned())),
+						el!(Expr::Str("objectHasEx".to_owned()))
+					)), ArgsDesc(vec![Arg(None, b), Arg(None, a), Arg(None, el!(Expr::Literal(LiteralType::True)))]),
+					true
+				))}
 				--
 				a:(@) _ "<<" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Lhs, b))}
 				a:(@) _ ">>" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Rhs, b))}