diff options
Diffstat (limited to 'compiler/GHC/Tc')
| -rw-r--r-- | compiler/GHC/Tc/Errors.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Tc/Gen/Splice.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Tc/Instance/FunDeps.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Tc/Solver/Interact.hs | 6 | ||||
| -rw-r--r-- | compiler/GHC/Tc/Types.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Tc/Types/Constraint.hs | 3 | ||||
| -rw-r--r-- | compiler/GHC/Tc/Utils/TcMType.hs | 2 |
7 files changed, 10 insertions, 9 deletions
diff --git a/compiler/GHC/Tc/Errors.hs b/compiler/GHC/Tc/Errors.hs index 2901078004..70f5d0ddd7 100644 --- a/compiler/GHC/Tc/Errors.hs +++ b/compiler/GHC/Tc/Errors.hs @@ -1910,7 +1910,7 @@ mkDictErr ctxt cts -- but we really only want to report the latter elim_superclasses cts = mkMinimalBySCs ctPred cts --- [Note: mk_dict_err] +-- Note [mk_dict_err] -- ~~~~~~~~~~~~~~~~~~~ -- Different dictionary error messages are reported depending on the number of -- matches and unifiers: diff --git a/compiler/GHC/Tc/Gen/Splice.hs b/compiler/GHC/Tc/Gen/Splice.hs index fe6ec75568..747b3a7d98 100644 --- a/compiler/GHC/Tc/Gen/Splice.hs +++ b/compiler/GHC/Tc/Gen/Splice.hs @@ -1553,7 +1553,7 @@ readQResult i = do QFail str -> fail str {- Note [TH recover with -fexternal-interpreter] - + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Recover is slightly tricky to implement. The meaning of "recover a b" is diff --git a/compiler/GHC/Tc/Instance/FunDeps.hs b/compiler/GHC/Tc/Instance/FunDeps.hs index 9abfc31f0b..4b45f2fa38 100644 --- a/compiler/GHC/Tc/Instance/FunDeps.hs +++ b/compiler/GHC/Tc/Instance/FunDeps.hs @@ -374,7 +374,7 @@ checkInstCoverage :: Bool -- Be liberal -> Class -> [PredType] -> [Type] -> Validity -- "be_liberal" flag says whether to use "liberal" coverage of --- See Note [Coverage Condition] below +-- See Note [Coverage condition] below -- -- Return values -- Nothing => no problems diff --git a/compiler/GHC/Tc/Solver/Interact.hs b/compiler/GHC/Tc/Solver/Interact.hs index a088637e46..36e9afae98 100644 --- a/compiler/GHC/Tc/Solver/Interact.hs +++ b/compiler/GHC/Tc/Solver/Interact.hs @@ -1632,8 +1632,8 @@ Now the second wanted comes along, but it cannot rewrite the given, so we simply At the end we spontaneously solve that guy, *reunifying* [alpha := Int] We avoid this problem by orienting the resulting given so that the unification -variable is on the left. [Note that alternatively we could attempt to -enforce this at canonicalization] +variable is on the left (note that alternatively we could attempt to +enforce this at canonicalization). See also Note [No touchables as FunEq RHS] in GHC.Tc.Solver.Monad; avoiding double unifications is the main reason we disallow touchable @@ -2177,7 +2177,7 @@ chooseInstance work_item ; if isDerived ev then -- Use type-class instances for Deriveds, in the hope -- of generating some improvements - -- C.f. Example 3 of Note [The improvement story] + -- C.f. Example 3 of Note [The improvement story and derived shadows] -- It's easy because no evidence is involved do { dflags <- getDynFlags ; unless (subGoalDepthExceeded dflags (ctLocDepth deeper_loc)) $ diff --git a/compiler/GHC/Tc/Types.hs b/compiler/GHC/Tc/Types.hs index 2de119b416..a784eb5719 100644 --- a/compiler/GHC/Tc/Types.hs +++ b/compiler/GHC/Tc/Types.hs @@ -1046,7 +1046,7 @@ thLevel (Brack s _) = thLevel s + 1 thLevel (RunSplice _) = panic "thLevel: called when running a splice" -- See Note [RunSplice ThLevel]. -{- Node [RunSplice ThLevel] +{- Note [RunSplice ThLevel] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The 'RunSplice' stage is set when executing a splice, and only when running a splice. In particular it is not set when the splice is renamed or typechecked. diff --git a/compiler/GHC/Tc/Types/Constraint.hs b/compiler/GHC/Tc/Types/Constraint.hs index ffe14b3d62..f1d59bf04b 100644 --- a/compiler/GHC/Tc/Types/Constraint.hs +++ b/compiler/GHC/Tc/Types/Constraint.hs @@ -2093,7 +2093,8 @@ but we do not want to complain about Bool ~ Char! Note [Deriveds do rewrite Deriveds] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ However we DO allow Deriveds to rewrite Deriveds, because that's how -improvement works; see Note [The improvement story] in GHC.Tc.Solver.Interact. +improvement works; see Note [The improvement story and derived shadows] in +GHC.Tc.Solver.Interact. However, for now at least I'm only letting (Derived,NomEq) rewrite (Derived,NomEq) and not doing anything for ReprEq. If we have diff --git a/compiler/GHC/Tc/Utils/TcMType.hs b/compiler/GHC/Tc/Utils/TcMType.hs index c510d29f63..22f9b14d26 100644 --- a/compiler/GHC/Tc/Utils/TcMType.hs +++ b/compiler/GHC/Tc/Utils/TcMType.hs @@ -2257,7 +2257,7 @@ Consider this: * So we get a dict binding for Num (C d a), which is zonked to give a = () - [Note Sept 04: now that we are zonking quantified type variables + Note (Sept 04): now that we are zonking quantified type variables on construction, the 'a' will be frozen as a regular tyvar on quantification, so the floated dict will still have type (C d a). Which renders this whole note moot; happily!] |