From a5c2add97c11237b3f0a224b1ec90dcf447cc2b5 Mon Sep 17 00:00:00 2001 From: JJ Date: Thu, 6 Apr 2023 15:41:55 -0700 Subject: don't panic when parsing bad types (this is genuinely awful) --- src/parser.rs | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/parser.rs b/src/parser.rs index 719ee3f..ef7e28d 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -29,16 +29,18 @@ pub fn parse_str(input: &str) -> Result Type = k:"empty" {Type::Empty} + rule unit() -> Type = k:"unit" {Type::Unit} + rule boolean() -> Type = k:"bool" {Type::Boolean} + rule natural() -> Type = k:"nat" {Type::Natural} + rule integer() -> Type = k:"int" {Type::Integer} rule kind() -> Type - = k:identifier() { - match k.as_str() { - "empty" => Type::Empty, - "unit" => Type::Unit, - "bool" => Type::Boolean, - "nat" => Type::Natural, - "int" => Type::Integer, - _ => panic!("invalid type"), // fixme: raise an error - } + = k:(empty() / unit() / boolean() / natural() / integer()) { + k } rule annotation() -> Expression = e:(conditional() / abstraction() / application() / constant() / variable()) " "* ":" " "* k:kind() { -- cgit v1.2.3-70-g09d2