greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Review comment: Find, not Bind.

Browse source
This commit is contained in:
Nick Alexander 2017-04-05 11:01:47 -07:00
parent c203046c16
commit 08cae4bc7c
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
query-parser/src/parse.rs
View file

@ -310,6 +310,8 @@ def_matches_plain_symbol!(Find, period, ".");
def_matches_plain_symbol!(Find, ellipsis, "..."); def_matches_plain_symbol!(Find, ellipsis, "...");
def_matches_plain_symbol!(Find, placeholder, "_");
def_parser!(Find, find_scalar, FindSpec, { def_parser!(Find, find_scalar, FindSpec, {
Query::variable() Query::variable()
.skip(Find::period()) .skip(Find::period())
@ -416,10 +418,6 @@ def_parser!(Find, query, FindQuery, {
pub struct Bind; pub struct Bind;
def_matches_plain_symbol!(Bind, placeholder, "_");
def_matches_plain_symbol!(Bind, ellipsis, "...");
def_parser!(Bind, bind_scalar, Binding, { def_parser!(Bind, bind_scalar, Binding, {
Query::variable() Query::variable()
.skip(eof()) .skip(eof())
@ -428,13 +426,13 @@ def_parser!(Bind, bind_scalar, Binding, {
def_parser!(Bind, variable_or_placeholder, VariableOrPlaceholder, { def_parser!(Bind, variable_or_placeholder, VariableOrPlaceholder, {
Query::variable().map(VariableOrPlaceholder::Variable) Query::variable().map(VariableOrPlaceholder::Variable)
.or(Bind::placeholder().map(|_| VariableOrPlaceholder::Placeholder)) .or(Find::placeholder().map(|_| VariableOrPlaceholder::Placeholder))
}); });
def_parser!(Bind, bind_coll, Binding, { def_parser!(Bind, bind_coll, Binding, {
vector() vector()
.of_exactly(Query::variable() .of_exactly(Query::variable()
.skip(Bind::ellipsis())) .skip(Find::ellipsis()))
.map(Binding::BindColl) .map(Binding::BindColl)
}); });