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.lalrpop | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/grammar.lalrpop') 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, -- cgit v1.2.3