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

difftreelog

feat(parser) Defer ArgsDesc to Vec

Лач2020-06-09parent: #6820e6d.patch.diff
in: master

1 file changed

modifiedcrates/jsonnet-parser/src/expr.rsdiffbeforeafterboth
before · crates/jsonnet-parser/src/expr.rs
1use 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, bool),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}
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	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(String),201	/// importStr "file.txt"202	ImportStr(String),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}