add: higher order functions without typedef

Jabolol · Jan 9, 2025 · e29d5d4 · e29d5d4
1 parent 570c7cb
commit e29d5d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/lib/Ast/Parser/Type.hs b/lib/Ast/Parser/Type.hs
@@ -75,7 +75,7 @@ arrayType = do
 -- TODO: find a way to do it without the parenthesis and avoid the infinite loop of parseType
 functionType :: PU.Parser AT.Type
 functionType = do
-  paramTypes <- M.some $ PU.lexeme parseTermType
+  paramTypes <- M.some $ PU.lexeme (M.between (PU.symbol "(") (PU.symbol ")") functionType M.<|> parseTermType)
   returnType <- PU.symbol "->" *> PU.lexeme parseTermType
   return $ AT.TFunction {AT.returnType = returnType, AT.paramTypes = paramTypes, AT.isVariadic = False}
 

diff --git a/test/Ast/Parser/ExprSpec.hs b/test/Ast/Parser/ExprSpec.hs
@@ -384,11 +384,10 @@ spec = do
                 (AT.Lit normalizeLoc $ AT.LInt 1)
       result `shouldBe` expected
 
-    it "parses a function that takes a function" $ do
-      let input = "map: Func int -> char = f x { f(x) }"
+    it "parses a higher order function" $ do
+      let input = "map: (int -> char) int -> char = f x { f(x) }"
       let functionType = AT.TFunction AT.TChar [AT.TInt 32] False
-      let env = E.insertType "Func" functionType initialEnv
-      let result = normalizeExpr <$> fst (S.runState (M.runParserT PE.parseExpr "" input) env)
+      let result = normalizeExpr <$> parseWithEnv input
       let expected =
             Right $
               AT.Function