Parens removed on types and infix symbols work almost, just need to adapt in LLVM

src/Desugar/Desugar.hs

@@ -1,9 +1,12 @@
 {-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE OverloadedStrings #-}
 
-module Desugar.Desugar where
+module Desugar.Desugar (desugar) where
 
 import Data.Function (on)
+import Debug.Trace (traceShow)
 import Grammar.Abs
+import Grammar.Print
 
 {-
 
@@ -37,7 +40,25 @@ desugarData :: Data -> Data
 desugarData (Data typ injs) = Data (desugarType typ) (map desugarInj injs)
 
 desugarType :: Type -> Type
-desugarType t = t
+desugarType = \case
+    TIdent (UIdent "Int") -> TLit "Int"
+    TIdent (UIdent "Char") -> TLit "Char"
+    TIdent ident -> TData ident []
+    TApp t1 t2 ->
+        let (name : tvars) = flatten t1 ++ [t2]
+         in case name of
+                TIdent ident -> TData ident (map desugarType tvars)
+                _ -> error "desugarType in Desugar.hs is not implemented correctly"
+    TLit l -> TLit l
+    TVar v -> TVar v
+    (TAll i t) -> TAll i (desugarType t)
+    TFun t1 t2 -> TFun (desugarType t1) (desugarType t2)
+    TEVar v -> TEVar v
+    TData ident typ -> TData ident (map desugarType typ)
+  where
+    flatten :: Type -> [Type]
+    flatten (TApp a b) = flatten a <> flatten b
+    flatten a = [a]
 
 desugarInj :: Inj -> Inj
 desugarInj (Inj ident typ) = Inj ident (desugarType typ)

src/Main.hs

@@ -2,38 +2,47 @@
 
 module Main where
 
-import           AnnForall                   (annotateForall)
-import           Codegen.Codegen             (generateCode)
-import           Compiler                    (compile)
-import           Control.Monad               (when, (<=<))
-import           Data.List.Extra             (isSuffixOf)
-import           Data.Maybe                  (fromJust, isNothing)
-import           Desugar.Desugar             (desugar)
-import           GHC.IO.Handle.Text          (hPutStrLn)
-import           Grammar.ErrM                (Err)
-import           Grammar.Layout              (resolveLayout)
-import           Grammar.Par                 (myLexer, pProgram)
-import           Grammar.Print               (Print, printTree)
-import           LambdaLifter                (lambdaLift)
-import           Monomorphizer.Monomorphizer (monomorphize)
-import           OrderDefs                   (orderDefs)
-import           Renamer.Renamer             (rename)
-import           ReportForall                (reportForall)
-import           System.Console.GetOpt       (ArgDescr (NoArg, ReqArg),
-                                              ArgOrder (RequireOrder),
-                                              OptDescr (Option), getOpt,
-                                              usageInfo)
-import           System.Directory            (createDirectory, doesPathExist,
-                                              getDirectoryContents,
-                                              removeDirectoryRecursive,
-                                              setCurrentDirectory)
-import           System.Environment          (getArgs)
-import           System.Exit                 (ExitCode (ExitFailure),
-                                              exitFailure, exitSuccess,
-                                              exitWith)
-import           System.IO                   (stderr)
-import           System.Process              (spawnCommand, waitForProcess)
-import           TypeChecker.TypeChecker     (TypeChecker (Bi, Hm), typecheck)
+import AnnForall (annotateForall)
+import Codegen.Codegen (generateCode)
+import Compiler (compile)
+import Control.Monad (when, (<=<))
+import Data.List.Extra (isSuffixOf)
+import Data.Maybe (fromJust, isNothing)
+import Desugar.Desugar (desugar)
+import GHC.IO.Handle.Text (hPutStrLn)
+import Grammar.ErrM (Err)
+import Grammar.Layout (resolveLayout)
+import Grammar.Par (myLexer, pProgram)
+import Grammar.Print (Print, printTree)
+import LambdaLifter (lambdaLift)
+import Monomorphizer.Monomorphizer (monomorphize)
+import OrderDefs (orderDefs)
+import Renamer.Renamer (rename)
+import ReportForall (reportForall)
+import System.Console.GetOpt (
+    ArgDescr (NoArg, ReqArg),
+    ArgOrder (RequireOrder),
+    OptDescr (Option),
+    getOpt,
+    usageInfo,
+ )
+import System.Directory (
+    createDirectory,
+    doesPathExist,
+    getDirectoryContents,
+    removeDirectoryRecursive,
+    setCurrentDirectory,
+ )
+import System.Environment (getArgs)
+import System.Exit (
+    ExitCode (ExitFailure),
+    exitFailure,
+    exitSuccess,
+    exitWith,
+ )
+import System.IO (stderr)
+import System.Process (spawnCommand, waitForProcess)
+import TypeChecker.TypeChecker (TypeChecker (Bi, Hm), typecheck)
 
 main :: IO ()
 main = getArgs >>= parseArgs >>= uncurry main'
@@ -85,12 +94,12 @@ chooseTypechecker s options = options{typechecker = tc}
     tc = case s of
         "hm" -> pure Hm
         "bi" -> pure Bi
-        _    -> Nothing
+        _ -> Nothing
 
 data Options = Options
-    { help        :: Bool
-    , debug       :: Bool
-    , gc          :: Bool
+    { help :: Bool
+    , debug :: Bool
+    , gc :: Bool
     , typechecker :: Maybe TypeChecker
     }
 
@@ -169,12 +178,12 @@ prelude :: String
 prelude =
     unlines
         [ "\n"
-        --, "customHelperFunctionCuzPoorImplementation : Bool () -> Int -> Bool ()"
-        --, "customHelperFunctionCuzPoorImplementation x y = x"
-        , "data Bool () where"
-        , "    False : Bool ()"
-        , "    True  : Bool ()"
-        , "lt : Int -> Int -> Bool ()"
+        , -- , "customHelperFunctionCuzPoorImplementation : Bool () -> Int -> Bool ()"
+          -- , "customHelperFunctionCuzPoorImplementation x y = x"
+          "data Bool where"
+        , "    False : Bool"
+        , "    True  : Bool"
+        , "lt : Int -> Int -> Bool"
         , "lt x y = True"
         , "\n"
         ]