@@ -47,15 +47,11 @@ modifyPool f = modify $ \state -> state { sPool = f (sPool state) }
4747addError message t1 t2 =
4848 modify $ \state -> state { sErrors = err : sErrors state }
4949 where
50− wordify = P.fsep . map P.text . words
51− msg = wordify message
52− width = maximum . map length . lines $ render msg
53− spaces = List.replicate (width - 15 - 3) ' '
5450 err = makeError <$> extraPretty t1 <*> extraPretty t2
5551 makeError pt1 pt2 =
56− P.vcat [ P.text $ "Type error" ++ spaces ++ "line ???"
57− , P.text (List.replicate width '-')
58− , msg <> P.text "\n"
52+ P.vcat [ P.text $ "Type error on line ???"
53+ , if null message then empty else P.fsep . map P.text $ words message
54+ , P.text " "
5955 , P.text " Expected Type:" <+> pt1
6056 , P.text " Actual Type:" <+> pt2 <> P.text "\n"
6157 ]