diff options
Diffstat (limited to 'src/grammar_util.rs')
-rw-r--r-- | src/grammar_util.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/grammar_util.rs b/src/grammar_util.rs index cf0ee59..6927d33 100644 --- a/src/grammar_util.rs +++ b/src/grammar_util.rs @@ -1,15 +1,11 @@ -use core::Expr; +use core::{Expr, X}; use lexer::Builtin; -pub type ParsedExpr<'i> = Expr<'i, (), ()>; +pub type ParsedExpr<'i> = Expr<'i, X, X>; // FIXME Parse paths and replace the second X with Path pub type BoxExpr<'i> = Box<ParsedExpr<'i>>; pub type ExprOpFn<'i> = fn(BoxExpr<'i>, BoxExpr<'i>) -> ParsedExpr<'i>; pub type ExprListFn<'i> = fn(BoxExpr<'i>, Vec<ParsedExpr<'i>>) -> ParsedExpr<'i>; -pub fn bx<T>(x: T) -> Box<T> { - Box::new(x) -} - pub fn builtin_expr<'i, S, A>(b: Builtin) -> Expr<'i, S, A> { match b { Builtin::Natural => Expr::Natural, |