Made binds keep args instead of lambda converting

language.cabal

@@ -33,6 +33,8 @@ executable language
       Auxiliary
       TypeChecker.TypeChecker
       TypeChecker.TypeCheckerIr
+      Monomorphizer.Monomorphizer
+      Monomorphizer.MonomorphizerIr
       Renamer.Renamer
       Codegen.Codegen
       Codegen.LlvmIr

src/TypeChecker/TypeChecker.hs

@@ -106,18 +106,20 @@ checkPrg (Program bs) = do
 
 checkBind :: Bind -> Infer T.Bind
 checkBind (Bind name args e) = do
-    let lambda = makeLambda e (reverse $ coerce args)
+    -- let lambda = makeLambda e (reverse $ coerce args)
-    e@(_, t') <- inferExp lambda
+    args <- zip args <$> mapM (const fresh) args
-    s <- gets sigs
+    withBindings (map coerce args) $ do
-    case M.lookup (coerce name) s of
+        e@(_, t') <- inferExp e
-        Just (Just t) -> do
+        s <- gets sigs
-            sub <- unify t t'
+        case M.lookup (coerce name) s of
-            let newT = apply sub t
+            Just (Just t) -> do
-            insertSig (coerce name) (Just newT)
+                sub <- unify t t'
-            return $ T.Bind (coerce name, newT) [] e
+                let newT = apply sub t
-        _ -> do
+                insertSig (coerce name) (Just newT)
-            insertSig (coerce name) (Just t')
+                return $ T.Bind (coerce name, newT) (map coerce args) e
-            return (T.Bind (coerce name, t') [] e) -- (apply s e)
+            _ -> do
+                insertSig (coerce name) (Just t')
+                return (T.Bind (coerce name, t') (map coerce args) e) -- (apply s e)
   where
     makeLambda :: Exp -> [Ident] -> Exp
     makeLambda = foldl (flip (EAbs . coerce))

src/TypeChecker/TypeCheckerIr.hs

@@ -93,7 +93,7 @@ instance Print Program where
     prt i (Program sc) = prPrec i 0 $ prt 0 sc
 
 instance Print Bind where
-    prt i (Bind (name, t) _ rhs) =
+    prt i (Bind (name, t) args rhs) =
         prPrec i 0 $
             concatD
                 [ prt 0 name
@@ -101,6 +101,7 @@ instance Print Bind where
                 , prt 0 t
                 , doc $ showString "\n"
                 , prt 0 name
+                , prtIdPs 0 args
                 , doc $ showString "="
                 , prt 0 rhs
                 ]