Seperate built-in types and functions from Expr

1 files changed, 2 insertions, 18 deletions

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>>) -> 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),
     }
 }