Ensure values are parsed in the correct order

This commit is contained in:
Tobie Morgan Hitchcock 2022-07-08 10:19:01 +01:00
parent a242884871
commit a430e89c1f

View file

@ -1245,16 +1245,16 @@ pub fn single(i: &str) -> IResult<&str, Value> {
map(datetime, Value::from), map(datetime, Value::from),
map(duration, Value::from), map(duration, Value::from),
map(geometry, Value::from), map(geometry, Value::from),
map(thing, Value::from),
map(unique, Value::from), map(unique, Value::from),
map(number, Value::from), map(number, Value::from),
map(strand, Value::from),
map(object, Value::from), map(object, Value::from),
map(array, Value::from), map(array, Value::from),
map(param, Value::from), map(param, Value::from),
map(regex, Value::from), map(regex, Value::from),
map(model, Value::from), map(model, Value::from),
map(idiom, Value::from), map(idiom, Value::from),
map(thing, Value::from),
map(strand, Value::from),
))(i) ))(i)
} }
@ -1270,17 +1270,17 @@ pub fn select(i: &str) -> IResult<&str, Value> {
map(datetime, Value::from), map(datetime, Value::from),
map(duration, Value::from), map(duration, Value::from),
map(geometry, Value::from), map(geometry, Value::from),
map(edges, Value::from),
map(thing, Value::from),
map(unique, Value::from), map(unique, Value::from),
map(number, Value::from), map(number, Value::from),
map(strand, Value::from),
map(object, Value::from), map(object, Value::from),
map(array, Value::from), map(array, Value::from),
map(param, Value::from), map(param, Value::from),
map(regex, Value::from), map(regex, Value::from),
map(model, Value::from), map(model, Value::from),
map(edges, Value::from),
map(thing, Value::from),
map(table, Value::from), map(table, Value::from),
map(strand, Value::from),
))(i) ))(i)
} }
@ -1304,11 +1304,11 @@ pub fn json(i: &str) -> IResult<&str, Value> {
map(datetime, Value::from), map(datetime, Value::from),
map(duration, Value::from), map(duration, Value::from),
map(geometry, Value::from), map(geometry, Value::from),
map(thing, Value::from),
map(unique, Value::from), map(unique, Value::from),
map(number, Value::from), map(number, Value::from),
map(object, Value::from), map(object, Value::from),
map(array, Value::from), map(array, Value::from),
map(thing, Value::from),
map(strand, Value::from), map(strand, Value::from),
))(i) ))(i)
} }