From 82d50e8734e0caad0b34ae32493ab831e7ec7fae Mon Sep 17 00:00:00 2001 From: NanoTech Date: Thu, 8 Dec 2016 14:59:02 -0600 Subject: Seperate built-in types and functions from Expr --- src/grammar_util.rs | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'src/grammar_util.rs') diff --git a/src/grammar_util.rs b/src/grammar_util.rs index 6927d33..49b7fb8 100644 --- a/src/grammar_util.rs +++ b/src/grammar_util.rs @@ -8,23 +8,7 @@ pub type ExprListFn<'i> = fn(BoxExpr<'i>, Vec>) -> ParsedExpr<'i> pub fn builtin_expr<'i, S, A>(b: Builtin) -> Expr<'i, S, A> { match b { - Builtin::Natural => Expr::Natural, - Builtin::NaturalFold => Expr::NaturalFold, - Builtin::NaturalBuild => Expr::NaturalBuild, - Builtin::NaturalIsZero => Expr::NaturalIsZero, - Builtin::NaturalEven => Expr::NaturalEven, - Builtin::NaturalOdd => Expr::NaturalOdd, - Builtin::Integer => Expr::Integer, - Builtin::Double => Expr::Double, - Builtin::Text => Expr::Text, - Builtin::ListBuild => Expr::ListBuild, - Builtin::ListFold => Expr::ListFold, - Builtin::ListLength => Expr::ListLength, - Builtin::ListHead => Expr::ListHead, - Builtin::ListLast => Expr::ListLast, - Builtin::ListIndexed => Expr::ListIndexed, - Builtin::ListReverse => Expr::ListReverse, - Builtin::OptionalFold => Expr::OptionalFold, - Builtin::Bool => Expr::Bool, + Builtin::Type(t) => Expr::BuiltinType(t), + Builtin::Value(v) => Expr::BuiltinValue(v), } } -- cgit v1.2.3