tweag/nickel
1
1
Fork 0
mirror of https://github.com/tweag/nickel.git synced 2024-09-20 16:08:14 +03:00
Code Issues Projects Releases Wiki Activity

Change the merge operator syntax to &

Browse Source
This commit is contained in:
Yann Hamdaoui 2020-11-17 17:20:34 +01:00
parent 92fa2e1cd3
commit 7808083643
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/grammar.lalrpop
View File

@ -285,37 +285,37 @@ PrefixExpr5: RichTerm = {
} }
BinOp6: BinaryOp<RichTerm> = { BinOp6: BinaryOp<RichTerm> = {
"&" => BinaryOp::Merge(),
}
PrefixExpr6: RichTerm = {
PrefixExpr5,
LeftOp<BinOp6, PrefixExpr6, PrefixExpr5> => <>,
}
BinOp7: BinaryOp<RichTerm> = {
"<" => BinaryOp::LessThan(), "<" => BinaryOp::LessThan(),
"<=" => BinaryOp::LessOrEq(), "<=" => BinaryOp::LessOrEq(),
">" => BinaryOp::GreaterThan(), ">" => BinaryOp::GreaterThan(),
">=" => BinaryOp::GreaterOrEq(), ">=" => BinaryOp::GreaterOrEq(),
} }
InfixExpr6: RichTerm = {
PrefixExpr5,
LeftOp<BinOp6, InfixExpr6, PrefixExpr5> => <>,
}
BinOp7: BinaryOp<RichTerm> = {
"==" => BinaryOp::Eq(),
}
InfixExpr7: RichTerm = { InfixExpr7: RichTerm = {
InfixExpr6, PrefixExpr6,
LeftOp<BinOp7, InfixExpr7, InfixExpr6> => <>, LeftOp<BinOp7, InfixExpr7, PrefixExpr6> => <>,
} }
LazyBinOp8: UnaryOp<RichTerm> = { BinOp8: BinaryOp<RichTerm> = {
"&&" => UnaryOp::BoolAnd(), "==" => BinaryOp::Eq(),
} }
InfixExpr8: RichTerm = { InfixExpr8: RichTerm = {
InfixExpr7, InfixExpr7,
LeftOpLazy<LazyBinOp8, InfixExpr8, InfixExpr7> => <> LeftOp<BinOp8, InfixExpr8, InfixExpr7> => <>,
} }
LazyBinOp9: UnaryOp<RichTerm> = { LazyBinOp9: UnaryOp<RichTerm> = {
"||" => UnaryOp::BoolOr(), "&&" => UnaryOp::BoolAnd(),
} }
InfixExpr9: RichTerm = { InfixExpr9: RichTerm = {
@ -323,10 +323,19 @@ InfixExpr9: RichTerm = {
LeftOpLazy<LazyBinOp9, InfixExpr9, InfixExpr8> => <> LeftOpLazy<LazyBinOp9, InfixExpr9, InfixExpr8> => <>
} }
LazyBinOp10: UnaryOp<RichTerm> = {
"||" => UnaryOp::BoolOr(),
}
InfixExpr10: RichTerm = {
InfixExpr9,
LeftOpLazy<LazyBinOp10, InfixExpr10, InfixExpr9> => <>
}
// TODO: convenience for adding precedence levels during development. Once // TODO: convenience for adding precedence levels during development. Once
// operators are fixed, we should turn the last level into `InfixExpr` directly // operators are fixed, we should turn the last level into `InfixExpr` directly
InfixExpr: RichTerm = { InfixExpr: RichTerm = {
InfixExpr9, InfixExpr10,
} }
BOpPre: BinaryOp<RichTerm> = { BOpPre: BinaryOp<RichTerm> = {
@ -335,7 +344,6 @@ BOpPre: BinaryOp<RichTerm> = {
"hasField" => BinaryOp::HasField(), "hasField" => BinaryOp::HasField(),
"map" => BinaryOp::ListMap(), "map" => BinaryOp::ListMap(),
"elemAt" => BinaryOp::ListElemAt(), "elemAt" => BinaryOp::ListElemAt(),
"merge" => BinaryOp::Merge(),
} }
Types: Types = { Types: Types = {
@ -443,6 +451,7 @@ extern {
"$" => Token::Normal(NormalToken::Dollar), "$" => Token::Normal(NormalToken::Dollar),
"=" => Token::Normal(NormalToken::Equals), "=" => Token::Normal(NormalToken::Equals),
";" => Token::Normal(NormalToken::SemiCol), ";" => Token::Normal(NormalToken::SemiCol),
"&" => Token::Normal(NormalToken::Ampersand),
"." => Token::Normal(NormalToken::Dot), "." => Token::Normal(NormalToken::Dot),
".$" => Token::Normal(NormalToken::DotDollar), ".$" => Token::Normal(NormalToken::DotDollar),
"$[" => Token::Normal(NormalToken::DollarBracket), "$[" => Token::Normal(NormalToken::DollarBracket),

2
src/parser/lexer.rs
View File

@ -84,6 +84,8 @@ pub enum NormalToken<'input> {
Equals, Equals,
#[token(";")] #[token(";")]
SemiCol, SemiCol,
#[token("&")]
Ampersand,
#[token(".")] #[token(".")]
Dot, Dot,
#[token(".$")] #[token(".$")]