Ensure all operator keywords are one word only

This commit is contained in:
Tobie Morgan Hitchcock 2022-06-28 14:39:07 +01:00
parent 569182ee7b
commit d5a6f80460

View file

@ -98,15 +98,15 @@ impl fmt::Display for Operator {
Operator::MoreThan => write!(f, ">"),
Operator::MoreThanOrEqual => write!(f, ">="),
Operator::Contain => write!(f, "CONTAINS"),
Operator::NotContain => write!(f, "CONTAINS NOT"),
Operator::ContainAll => write!(f, "CONTAINS ALL"),
Operator::ContainAny => write!(f, "CONTAINS ANY"),
Operator::ContainNone => write!(f, "CONTAINS NONE"),
Operator::NotContain => write!(f, "CONTAINSNOT"),
Operator::ContainAll => write!(f, "CONTAINSALL"),
Operator::ContainAny => write!(f, "CONTAINSANY"),
Operator::ContainNone => write!(f, "CONTAINSNONE"),
Operator::Inside => write!(f, "INSIDE"),
Operator::NotInside => write!(f, "NOT INSIDE"),
Operator::AllInside => write!(f, "ALL INSIDE"),
Operator::AnyInside => write!(f, "ANY INSIDE"),
Operator::NoneInside => write!(f, "NONE INSIDE"),
Operator::NotInside => write!(f, "NOTINSIDE"),
Operator::AllInside => write!(f, "ALLINSIDE"),
Operator::AnyInside => write!(f, "ANYINSIDE"),
Operator::NoneInside => write!(f, "NONEINSIDE"),
Operator::Outside => write!(f, "OUTSIDE"),
Operator::Intersects => write!(f, "INTERSECTS"),
}
@ -187,15 +187,15 @@ pub fn phrases(i: &str) -> IResult<&str, Operator> {
map(tag_no_case("IS"), |_| Operator::Equal),
)),
alt((
map(tag_no_case("CONTAINS ALL"), |_| Operator::ContainAll),
map(tag_no_case("CONTAINS ANY"), |_| Operator::ContainAny),
map(tag_no_case("CONTAINS NONE"), |_| Operator::ContainNone),
map(tag_no_case("CONTAINS NOT"), |_| Operator::NotContain),
map(tag_no_case("CONTAINSALL"), |_| Operator::ContainAll),
map(tag_no_case("CONTAINSANY"), |_| Operator::ContainAny),
map(tag_no_case("CONTAINSNONE"), |_| Operator::ContainNone),
map(tag_no_case("CONTAINSNOT"), |_| Operator::NotContain),
map(tag_no_case("CONTAINS"), |_| Operator::Contain),
map(tag_no_case("ALL INSIDE"), |_| Operator::AllInside),
map(tag_no_case("ANY INSIDE"), |_| Operator::AnyInside),
map(tag_no_case("NONE INSIDE"), |_| Operator::NoneInside),
map(tag_no_case("NOT INSIDE"), |_| Operator::NotInside),
map(tag_no_case("ALLINSIDE"), |_| Operator::AllInside),
map(tag_no_case("ANYINSIDE"), |_| Operator::AnyInside),
map(tag_no_case("NONEINSIDE"), |_| Operator::NoneInside),
map(tag_no_case("NOTINSIDE"), |_| Operator::NotInside),
map(tag_no_case("INSIDE"), |_| Operator::Inside),
map(tag_no_case("OUTSIDE"), |_| Operator::Outside),
map(tag_no_case("INTERSECTS"), |_| Operator::Intersects),