172844e · elk · git.iko.soy

src/Reporting/Error/Type.hs+1−1

@@ -4,7 +4,7 @@ module Reporting.Error.Type where

4import qualified Data.Map as Map

5import qualified Data.Maybe as Maybe

6import Text.PrettyPrint.ANSI.Leijen

7− ( Doc, (<>), (<+>), colon, dullyellow, equals

7+ ( Doc, (<>), (<+>), colon, dullyellow

8 , fillSep, hang, indent, text, underline, vcat

9 )

10

src/Type/Solve.hs−2

@@ -3,13 +3,11 @@ module Type.Solve (solve) where

3import Control.Monad

4import Control.Monad.State (execStateT, liftIO)

5import Control.Monad.Except (ExceptT, throwError)

6−import qualified Data.Foldable as F

7import qualified Data.List as List

6import qualified Data.List as List

8import qualified Data.Map as Map

7import qualified Data.Map as Map

9import qualified Data.Traversable as T

8import qualified Data.Traversable as T

10import qualified Data.UnionFind.IO as UF

9import qualified Data.UnionFind.IO as UF

11

10

12−import qualified AST.Type as Type

13import qualified Reporting.Annotation as A

11import qualified Reporting.Annotation as A

14import qualified Reporting.Error.Type as Error

12import qualified Reporting.Error.Type as Error

15import qualified Type.State as TS

13import qualified Type.State as TS

src/Type/Unify.hs+1−1

@@ -24,7 +24,7 @@ unify hint region expected actual =

24 Right state ->

25 return state

26

27− Left (Mismatch subExpected subActual maybeReason) ->

27+ Left (Mismatch _subExpected _subActual maybeReason) ->

28 let

29 mkError =

30 do expectedSrcType <- Type.toSrcType expected