1 files changed, 39 insertions, 21 deletions
diff --git a/src/Fun/Grammar.hs b/src/Fun/Grammar.hs
index 47191de..c9cd034 100644
--- a/src/Fun/Grammar.hs
+++ b/src/Fun/Grammar.hs
@@ -4,10 +4,6 @@ import           Fun.Parser
 import           Fun.Tree
 import           Fun.Typer
 
--- TODO: Multiple programs (= files) in tree
-tree :: Parser Tree
-tree = program >>> build >>> Tree <?> "tree" where build p = [p]
-
 program :: Parser Program
 program = iterFull block >>> Program <?> "program"
 
@@ -68,12 +64,25 @@ internalFunctions = ["_start", "_asm"]
 
 functionName :: Parser String
 functionName =
+  letter
+    <+>  iter (special <|> alphanum)
+    >>>  build
+    <|>  internalWord
+    <=>  (`elem` internalFunctions)
+    <|>  literal '('
+    <-+> functionInfixName
+    <+-> literal ')'
+    <?>  "function name"
+  where build (first, rest) = first : rest
+
+functionInfixName :: Parser String
+functionInfixName =
   (special <|> letter)
     <+> iter (special <|> alphanum)
     >>> build
     <|> internalWord
     <=> (`elem` internalFunctions)
-    <?> "function name"
+    <?> "infix function name"
   where build (first, rest) = first : rest
 
 functionTypes :: Parser [Type]
@@ -140,7 +149,6 @@ functionPatternElement :: Parser FunctionPatternElement
 functionPatternElement =
   (functionParameter >>> FunctionPatternParameter)
     <|> (literal '_' >>> const FunctionPatternWildcard)
-    <|> (literal '_' <+-> literal '*' >>> const FunctionPatternSuperWildcard)
     <|> (number >>> FunctionPatternNumber)
     <|> (string >>> FunctionPatternString)
     <?> "function pattern element"
@@ -150,21 +158,31 @@ functionParameter =
   letters <|> (letter <+> oneOrMore alphanum) >>> build <?> "function parameter"
   where build (a, b) = a : b
 
+functionArgument :: Parser FunctionArgument
+functionArgument =
+  (functionName >>> FunctionName)
+    <|> (functionParameter >>> FunctionParameter)
+    <|> (string >>> FunctionString)
+    <|> (number >>> FunctionNumber)
+    <?> "function argument"
+
+functionBodyExpression :: Parser FunctionBody
+functionBodyExpression =
+  (functionName <+> iter (space <-+> functionArgument) >>> buildCall)
+    <|> (    functionArgument -- TODO: Fixity precedence in parser? Hmmm
+        <+-> space
+        <+>  functionInfixName
+        <+-> space
+        <+>  functionArgument
+        >>>  buildInfixCall
+        )
+    <|> (literal '(' <-+> functionBody <+-> literal ')' >>> FunctionBodySub)
+ where
+  buildCall (name, args) = FunctionBodyCall name args
+  buildInfixCall ((arg1, name), arg2) = FunctionBodyInfixCall name [arg1, arg2]
+
 functionBody :: Parser FunctionBody
 functionBody =
-  iter (space <-+> functionBodyElement)
+  space
+    <-+> (functionBodyExpression <|> functionArgument >>> FunctionBodyValue)
     <+-> newline
-    >>>  FunctionBody
-    <?>  "function body"
-
-functionBodyElement :: Parser FunctionBodyElement
-functionBodyElement =
-  statement
-    <|> (functionName >>> FunctionBodyIdentifier)
-    <|> (functionParameter >>> FunctionBodyIdentifier)
-    <|> (string >>> FunctionBodyString)
-    <|> (number >>> FunctionBodyNumber)
-    <?> "function body element"
-
-statement :: Parser FunctionBodyElement --  TODO
-statement = acceptSpecial "if" >>> Statement