git.iko.soy/elk
on master help sign in
Rename Mismatch to BadExpr
commitd7e3cd704f7d4e6773de5456d590ca8c8e812486 authorEvan Czaplicki <evancz@users.noreply.github.com> dateFri 9 Feb 2018, 22:19 (9 years ago) parent6ecd0be
2 files changed+9−9
compare with master
unifiedsplit
src/Reporting/Error/Type.hs+6−6 src/Type/Solve.hs+3−3
src/Reporting/Error/Type.hs+6−6
@@ -38,7 +38,7 @@ import qualified Type.Error as T
3838
3939
4040data Error
41− = Mismatch R.Region Category T.Type (Expected T.Type)
41+ = BadExpr R.Region Category T.Type (Expected T.Type)
4242 | BadPattern R.Region PCategory T.Type (PExpected T.Type)
4343 | InfiniteType T.Type
4444
@@ -164,8 +164,8 @@ ptypeReplace expectation tipe =
164164toReport :: Code.Source -> T.Localizer -> Error -> Report.Report
165165toReport source localizer err =
166166 case err of
167− Mismatch region category actualType expected ->
168− toMismatchReport source localizer region category actualType expected
167+ BadExpr region category actualType expected ->
168+ toExprReport source localizer region category actualType expected
169169
170170 BadPattern region category tipe expected ->
171171 error "TODO" region category tipe expected
@@ -207,11 +207,11 @@ toDescription category thatThingIs =
207207
208208
209209
210−-- TO MISMATCH REPORT
210+-- TO EXPR REPORT
211211
212212
213−toMismatchReport :: Code.Source -> T.Localizer -> R.Region -> Category -> T.Type -> Expected T.Type -> Report.Report
214−toMismatchReport source localizer exprRegion category tipe expected =
213+toExprReport :: Code.Source -> T.Localizer -> R.Region -> Category -> T.Type -> Expected T.Type -> Report.Report
214+toExprReport source localizer exprRegion category tipe expected =
215215 Report.Report "TYPE MISMATCH" exprRegion [] $
216216 case expected of
217217 NoExpectation expectedType ->
src/Type/Solve.hs+3−3
@@ -89,7 +89,7 @@ solve env rank pools state constraint =
8989 Unify.Err vars actualType expectedType ->
9090 do introduce rank pools vars
9191 return $ addError state $
92− Error.Mismatch region category actualType $
92+ Error.BadExpr region category actualType $
9393 Error.typeReplace expectation expectedType
9494
9595 CLocal region name expectation ->
@@ -104,7 +104,7 @@ solve env rank pools state constraint =
104104 Unify.Err vars actualType expectedType ->
105105 do introduce rank pools vars
106106 return $ addError state $
107− Error.Mismatch region (Error.Local name) actualType $
107+ Error.BadExpr region (Error.Local name) actualType $
108108 Error.typeReplace expectation expectedType
109109
110110 CForeign region name (Can.Forall freeVars srcType) expectation ->
@@ -119,7 +119,7 @@ solve env rank pools state constraint =
119119 Unify.Err vars actualType expectedType ->
120120 do introduce rank pools vars
121121 return $ addError state $
122− Error.Mismatch region (Error.Foreign name) actualType $
122+ Error.BadExpr region (Error.Foreign name) actualType $
123123 Error.typeReplace expectation expectedType
124124
125125 CPattern region category tipe expectation ->