git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #1583 from purescript/1577
634790fPhil Freeman
src/Language/PureScript/Errors.hs+9−4
compare with golang
unifiedsplit
@@ -156,6 +156,7 @@ data ErrorMessageHint
156 | ErrorCheckingAccessor Expr String
156 | ErrorCheckingAccessor Expr String
157 | ErrorCheckingType Expr Type
157 | ErrorCheckingType Expr Type
158 | ErrorCheckingKind Type
158 | ErrorCheckingKind Type
159+ | ErrorCheckingGuard
159 | ErrorInferringType Expr
160 | ErrorInferringType Expr
160 | ErrorInApplication Expr Type Expr
161 | ErrorInApplication Expr Type Expr
161 | ErrorInDataConstructor ProperName
162 | ErrorInDataConstructor ProperName
@@ -530,15 +531,15 @@ prettyPrintSingleError full level e = prettyPrintErrorMessage <$> onTypesInError
530 , indent $ prettyPrintValue expr
531 , indent $ prettyPrintValue expr
531 ]) binding
532 ]) binding
532 renderSimpleErrorMessage (TypesDoNotUnify t1 t2)
533 renderSimpleErrorMessage (TypesDoNotUnify t1 t2)
533− = paras [ line "Could not match expected type"
534+ = paras [ line "Could not match type"
534 , indent $ typeAsBox t1
535 , indent $ typeAsBox t1
535− , line "with actual type"
536+ , line "with type"
536 , indent $ typeAsBox t2
537 , indent $ typeAsBox t2
537 ]
538 ]
538 renderSimpleErrorMessage (KindsDoNotUnify k1 k2) =
539 renderSimpleErrorMessage (KindsDoNotUnify k1 k2) =
539− paras [ line "Could not match expected kind"
540+ paras [ line "Could not match kind"
540 , indent $ line $ prettyPrintKind k1
541 , indent $ line $ prettyPrintKind k1
541− , line "with actual kind"
542+ , line "with kind"
542 , indent $ line $ prettyPrintKind k2
543 , indent $ line $ prettyPrintKind k2
543 ]
544 ]
544 renderSimpleErrorMessage (ConstrainedTypeUnified t1 t2) =
545 renderSimpleErrorMessage (ConstrainedTypeUnified t1 t2) =
@@ -730,6 +731,10 @@ prettyPrintSingleError full level e = prettyPrintErrorMessage <$> onTypesInError
730 , typeAsBox ty
731 , typeAsBox ty
731 ]
732 ]
732 ]
733 ]
734+ renderHint ErrorCheckingGuard detail =
735+ paras [ detail
736+ , line "while checking the type of a guard clause"
737+ ]
733 renderHint (ErrorInferringType expr) detail =
738 renderHint (ErrorInferringType expr) detail =
734 paras [ detail
739 paras [ detail
735 , Box.hsep 1 Box.top [ line "while inferring the type of"
740 , Box.hsep 1 Box.top [ line "while inferring the type of"
src/Language/PureScript/TypeChecker/Types.hs+1−1
@@ -418,7 +418,7 @@ checkBinders nvals ret (CaseAlternative binders result : bs) = do
418 case result of
418 case result of
419 Left gs -> do
419 Left gs -> do
420 gs' <- forM gs $ \(grd, val) -> do
420 gs' <- forM gs $ \(grd, val) -> do
421− grd' <- check grd tyBoolean
421+ grd' <- rethrow (addHint ErrorCheckingGuard) $ check grd tyBoolean
422 val' <- TypedValue True <$> check val ret <*> pure ret
422 val' <- TypedValue True <$> check val ret <*> pure ret
423 return (grd', val')
423 return (grd', val')
424 return $ Left gs'
424 return $ Left gs'