Parse variable expressions
This commit is contained in:
parent
13413702ed
commit
27bc69806a
1 changed files with 17 additions and 1 deletions
|
|
@ -194,13 +194,29 @@ fn table_constr(
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn expr_var(
|
||||||
|
expr: impl Parser<char, Expr, Error = Error> + Clone,
|
||||||
|
) -> impl Parser<char, Expr, Error = Error> {
|
||||||
|
just("[")
|
||||||
|
.ignore_then(space())
|
||||||
|
.then(expr)
|
||||||
|
.then(space())
|
||||||
|
.then_ignore(just("]"))
|
||||||
|
.map_with_span(|((s0, index), s1), span| Expr::Var {
|
||||||
|
s0,
|
||||||
|
index: Box::new(index),
|
||||||
|
s1,
|
||||||
|
span,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
fn expr(
|
fn expr(
|
||||||
expr: impl Parser<char, Expr, Error = Error> + Clone,
|
expr: impl Parser<char, Expr, Error = Error> + Clone,
|
||||||
) -> impl Parser<char, Expr, Error = Error> {
|
) -> impl Parser<char, Expr, Error = Error> {
|
||||||
let lit = lit(expr.clone()).map(Expr::Lit);
|
let lit = lit(expr.clone()).map(Expr::Lit);
|
||||||
let table_constr = table_constr(expr.clone()).map(Expr::TableConstr);
|
let table_constr = table_constr(expr.clone()).map(Expr::TableConstr);
|
||||||
|
|
||||||
lit.or(table_constr)
|
lit.or(table_constr).or(expr_var(expr))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn parser() -> impl Parser<char, Expr, Error = Error> {
|
pub fn parser() -> impl Parser<char, Expr, Error = Error> {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue