Seperate built-in types and functions from Expr

1 files changed, 3 insertions, 2 deletions

diff --git a/src/grammar.lalrpop b/src/grammar.lalrpop
index 63c17ad..0a103d1 100644
--- a/src/grammar.lalrpop
+++ b/src/grammar.lalrpop
@@ -1,6 +1,7 @@
 use core;
 use core::bx;
 use core::Expr::*;
+use core::BuiltinType::*;
 use grammar_util::*;
 use lexer::*;
 
@@ -119,8 +120,8 @@ ExprF: BoxExpr<'input> = {
     Text => bx(TextLit(<>)),
     Label => bx(Var(core::V(<>, 0))), // FIXME support var@n syntax
     Const => bx(Const(<>)),
-    List => bx(List),
-    Optional => bx(Optional),
+    List => bx(BuiltinType(List)),
+    Optional => bx(BuiltinType(Optional)),
     Builtin => bx(builtin_expr(<>)),
     Bool => bx(BoolLit(<>)),
     Record,