noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure operator parsing works correctly

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2021-05-22 19:18:02 +01:00
parent ba60c4437f
commit 11df879fc0
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/sql/operator.rs
View file

@ -102,6 +102,25 @@ pub fn assigner(i: &str) -> IResult<&str, Operator> {
pub fn operator(i: &str) -> IResult<&str, Operator> { pub fn operator(i: &str) -> IResult<&str, Operator> {
alt(( alt((
alt((
map(tag("=="), |_| Operator::Exact),
map(tag("!="), |_| Operator::NotEqual),
map(tag("*="), |_| Operator::AllEqual),
map(tag("?="), |_| Operator::AnyEqual),
map(tag("="), |_| Operator::Equal),
)),
alt((
map(tag("!~"), |_| Operator::NotLike),
map(tag("*~"), |_| Operator::AllLike),
map(tag("?~"), |_| Operator::AnyLike),
map(tag("~"), |_| Operator::Like),
)),
alt((
map(tag("<="), |_| Operator::LessThanOrEqual),
map(tag("<"), |_| Operator::LessThan),
map(tag(">="), |_| Operator::MoreThanOrEqual),
map(tag(">"), |_| Operator::MoreThan),
)),
alt(( alt((
map(tag("+"), |_| Operator::Add), map(tag("+"), |_| Operator::Add),
map(tag("-"), |_| Operator::Sub), map(tag("-"), |_| Operator::Sub),
@ -111,25 +130,6 @@ pub fn operator(i: &str) -> IResult<&str, Operator> {
map(tag("/"), |_| Operator::Div), map(tag("/"), |_| Operator::Div),
map(tag("÷"), |_| Operator::Div), map(tag("÷"), |_| Operator::Div),
)), )),
alt((
map(tag("="), |_| Operator::Equal),
map(tag("=="), |_| Operator::Exact),
map(tag("!="), |_| Operator::NotEqual),
map(tag("*="), |_| Operator::AllEqual),
map(tag("?="), |_| Operator::AnyEqual),
)),
alt((
map(tag("~"), |_| Operator::Like),
map(tag("!~"), |_| Operator::NotLike),
map(tag("*~"), |_| Operator::AllLike),
map(tag("?~"), |_| Operator::AnyLike),
)),
alt((
map(tag("<="), |_| Operator::LessThanOrEqual),
map(tag("<"), |_| Operator::LessThan),
map(tag(">="), |_| Operator::MoreThanOrEqual),
map(tag(">"), |_| Operator::MoreThan),
)),
alt(( alt((
map(tag("∋"), |_| Operator::Contain), map(tag("∋"), |_| Operator::Contain),
map(tag("∌"), |_| Operator::NotContain), map(tag("∌"), |_| Operator::NotContain),
@ -141,8 +141,6 @@ pub fn operator(i: &str) -> IResult<&str, Operator> {
map(tag("⊆"), |_| Operator::AllInside), map(tag("⊆"), |_| Operator::AllInside),
map(tag("⊂"), |_| Operator::SomeInside), map(tag("⊂"), |_| Operator::SomeInside),
map(tag("⊄"), |_| Operator::NoneInside), map(tag("⊄"), |_| Operator::NoneInside),
map(tag("<•>"), |_| Operator::Inside),
map(tag("<|>"), |_| Operator::Intersects),
)), )),
alt(( alt((
map(tag_no_case("&&"), |_| Operator::And), map(tag_no_case("&&"), |_| Operator::And),