Lists

1 files changed, 13 insertions, 4 deletions

diff --git a/src/Fun/Grammar.hs b/src/Fun/Grammar.hs
index 422a211..7ec9e42 100644
--- a/src/Fun/Grammar.hs
+++ b/src/Fun/Grammar.hs
@@ -77,12 +77,21 @@ functionTypes =
     <+> functionType
     >>> build
     <?> "function types"
-  where build (a, b) = (map resolveType a) ++ [resolveType b]
+  where build (a, b) = a ++ [b]
 
-functionType :: Parser String
+functionType :: Parser Type
 functionType =
-  (letter <=> isUpper) <+> oneOrMore alphanum >>> build <?> "function type"
-  where build (first, rest) = first : rest
+  (letter <=> isUpper)
+    <+>  oneOrMore alphanum
+    >>>  build
+    <|>  literal '['
+    <-+> functionType
+    <+-> literal ']'
+    >>>  buildList
+    <?>  "function type"
+ where
+  build (first, rest) = resolveType $ first : rest
+  buildList t = ListType t
 
 functionTypeDelimiter :: Parser Char
 functionTypeDelimiter = literal ':' <?> "function type delimiter"