git.iko.soy/elk
on master help sign in
Stop threading type localizer through canonicalization error code

Going to do things differently in different phases

commit99ef42e1fa6fabaac31a119cb3ec00b447b6bf9c authorEvan Czaplicki <evancz@users.noreply.github.com> dateTue 6 Feb 2018, 14:14 (9 years ago) parent8403665
1 file changed+6−7
compare with master
unifiedsplit
src/Reporting/Error/Canonicalize.hs+6−7
src/Reporting/Error/Canonicalize.hs+6−7
@@ -25,7 +25,6 @@ import qualified Elm.Name as N
2525import qualified Reporting.Annotation as A
2626import qualified Reporting.Region as R
2727import qualified Reporting.Render.Code as Code
28−import qualified Reporting.Render.Type as Type
2928import qualified Reporting.Report as Report
3029import qualified Reporting.Helpers as H
3130import Reporting.Helpers ( Doc, (<>) )
@@ -142,8 +141,8 @@ toKindInfo kind name =
142141-- TO REPORT
143142
144143
145−toReport :: Code.Source -> Type.Localizer -> Error -> Report.Report
146−toReport source localizer err =
144+toReport :: Code.Source -> Error -> Report.Report
145+toReport source err =
147146 case err of
148147 AnnotationTooShort region name index leftovers ->
149148 let
@@ -630,7 +629,7 @@ toReport source localizer err =
630629 )
631630
632631 RecursiveAlias region name args tipe others ->
633− aliasRecursionReport source localizer region name args tipe others
632+ aliasRecursionReport source region name args tipe others
634633
635634 RecursiveDecl cyclicValueDefs ->
636635 error "TODO" cyclicValueDefs
@@ -1016,8 +1015,8 @@ _argMismatchReport source region kind name expected actual =
10161015-- BAD ALIAS RECURSION
10171016
10181017
1019−aliasRecursionReport :: Code.Source -> Type.Localizer -> R.Region -> N.Name -> [N.Name] -> Src.Type -> [N.Name] -> Report.Report
1020−aliasRecursionReport source localizer region name args tipe others =
1018+aliasRecursionReport :: Code.Source -> R.Region -> N.Name -> [N.Name] -> Src.Type -> [N.Name] -> Report.Report
1019+aliasRecursionReport source region name args tipe others =
10211020 case others of
10221021 [] ->
10231022 Report.Report "ALIAS PROBLEM" region [] $
@@ -1030,7 +1029,7 @@ aliasRecursionReport source localizer region name args tipe others =
10301029 "When I expand a recursive type alias, it just keeps getting bigger and bigger.\
10311030 \ So dealiasing results in an infinitely large type! Try this instead:"
10321031 , H.indent 4 $
1033− Type.decl localizer name args [(name, [error "TODO" tipe])]
1032+ error "TODO alias to doc" name args tipe
10341033 , H.link "Hint"
10351034 "This is kind of a subtle distinction. I suggested the naive fix, but I recommend reading"
10361035 "recursive-alias"