From 84d00a1fb82e96483aaa09b1d4044b37f2a6bd2a Mon Sep 17 00:00:00 2001
From: William Ball <williampi103@gmail.com>
Date: Tue, 12 Nov 2024 00:00:51 -0800
Subject: [PATCH] improved error messages

---
 app/Check.hs | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/Check.hs b/app/Check.hs
index 5bc578e..8517c75 100644
--- a/app/Check.hs
+++ b/app/Check.hs
@@ -8,14 +8,20 @@ import Expr
 
 type Context = [Expr]
 
-data TypeCheckError = Err | SquareUntyped | UnboundVariable | NotASort Expr Int | ExpectedFunctionType Expr | NotEquivalent Expr Expr
-    deriving (Show)
+data TypeCheckError = SquareUntyped | UnboundVariable String | NotASort Expr Expr | ExpectedPiType Expr Expr | NotEquivalent Expr Expr Expr
+
+instance Show TypeCheckError where
+    show SquareUntyped = "□ does not have a type"
+    show (UnboundVariable x) = "Unbound variable: " ++ x
+    show (NotASort x t) = "Expected " ++ pretty x ++ " to have type * or □, instead found " ++ pretty t
+    show (ExpectedPiType m a) = pretty m ++ " : " ++ pretty a ++ " is not a function"
+    show (NotEquivalent a a' e) = "Cannot unify " ++ pretty a ++ " with " ++ pretty a' ++ " when evaluating " ++ pretty e
 
 type CheckResult = Either TypeCheckError
 
-matchPi :: Expr -> CheckResult (Expr, Expr)
-matchPi (Pi _ a b) = Right (a, b)
-matchPi e = Left $ ExpectedFunctionType e
+matchPi :: Expr -> Expr -> CheckResult (Expr, Expr)
+matchPi _ (Pi _ a b) = Right (a, b)
+matchPi m e = Left $ ExpectedPiType m e
 
 showContext :: Context -> String
 showContext g = "[" ++ intercalate ", " (map show g) ++ "]"
@@ -23,26 +29,26 @@ showContext g = "[" ++ intercalate ", " (map show g) ++ "]"
 findType :: Context -> Expr -> CheckResult Expr
 findType _ Star = Right Square
 findType _ Square = Left SquareUntyped
-findType g (Var n _) = do
-    t <- maybe (Left UnboundVariable) Right $ g !? fromInteger n
+findType g (Var n x) = do
+    t <- maybe (Left $ UnboundVariable x) Right $ g !? fromInteger n
     s <- findType g t
-    unless (isSort s) $ throwError $ NotASort s 32
+    unless (isSort s) $ throwError $ NotASort t s
     pure t
-findType g (App m n) = do
-    (a, b) <- findType g m >>= matchPi
+findType g e@(App m n) = do
+    (a, b) <- findType g m >>= matchPi m
     a' <- findType g n
-    unless (betaEquiv a a') $ throwError $ NotEquivalent a a'
+    unless (betaEquiv a a') $ throwError $ NotEquivalent a a' e
     pure $ subst 0 n b
 findType g (Abs x a m) = do
     s1 <- findType g a
-    unless (isSort s1) $ throwError $ NotASort s1 43
+    unless (isSort s1) $ throwError $ NotASort a s1
     b <- findType (incIndices a : map incIndices g) m
     s2 <- findType g (Pi x a b)
-    unless (isSort s2) $ throwError $ NotASort s2 46
+    unless (isSort s2) $ throwError $ NotASort (Pi x a b) s2
     pure $ if occursFree 0 b then Pi x a b else Pi "" a b
 findType g (Pi _ a b) = do
     s1 <- findType g a
-    unless (isSort s1) $ throwError $ NotASort s1 51
+    unless (isSort s1) $ throwError $ NotASort a s1
     s2 <- findType (incIndices a : map incIndices g) b
-    unless (isSort s2) $ throwError $ NotASort s2 53
+    unless (isSort s2) $ throwError $ NotASort b s2
     pure s2