Issue #3435 #3455
Merged
Issue #3435 #3455
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Distinguish between candidates that fail because they have the wrong type and candidates that fail due to some constraints. If there's a single one of the latter candidates (and on valid instance is found) report the error from the constraint. If there are multiple of the latter report the candidates together with the corresponding error.
Closed
jespercockx
approved these changes
Dec 14, 2018
There was a problem hiding this comment.
Looks very good! Just one minor complaint: I don't really like the way you handle the InstanceCandidateFailed error, it feels like you could just directly construct the YesNoMaybe value instead of throwing a global exception and catching it again almost immediately.
| @@ -135,23 +135,31 @@ whenConstraints action handler = | |||
| stealConstraints pid | |||
| handler | |||
|
|
|||
| wakeConstraints' :: (ProblemConstraint -> TCM Bool) -> TCM () | |||
There was a problem hiding this comment.
I don't want to nitpick but some comment for the extra argument here would be nice.
| solveAwakeConstraints' force = do | ||
| solveAwakeConstraints' = solveSomeAwakeConstraints (const True) | ||
|
|
||
| solveSomeAwakeConstraints :: (ProblemConstraint -> Bool) -> Bool -> TCM () |
src/full/Agda/TypeChecking/Errors.hs
Outdated
| vcat [ prettyTCM term <?> text "was ruled out because" | ||
| , prettyTCM err ] | ||
|
|
||
| InstanceCandidateFailed{} -> __IMPOSSIBLE__ -- Only used internally by instance search |
There was a problem hiding this comment.
Maybe a local ExceptT for instance search would be a better solution.
| @@ -330,16 +347,19 @@ dropSameCandidates m cands0 = verboseBracket "tc.instance" 30 "dropSameCandidate | |||
| {- else -} (\ _ -> return False) | |||
| `catchError` (\ _ -> return False) | |||
|
|
|||
| data YesNoMaybe = Yes | No | Maybe | HellNo TCErr | |||
| data YesNoMaybe = Yes | No | NoBecause TCErr | Maybe | HellNo TCErr | |||
There was a problem hiding this comment.
It's probably time to give a different name to this type
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix performance regression in #3435 by delaying solving of instance constraints.