diff options
Diffstat (limited to 'compiler/GHC/Hs')
| -rw-r--r-- | compiler/GHC/Hs/Decls.hs | 6 | ||||
| -rw-r--r-- | compiler/GHC/Hs/Expr.hs | 14 | ||||
| -rw-r--r-- | compiler/GHC/Hs/Pat.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Hs/Types.hs | 11 | ||||
| -rw-r--r-- | compiler/GHC/Hs/Utils.hs | 2 |
5 files changed, 18 insertions, 17 deletions
diff --git a/compiler/GHC/Hs/Decls.hs b/compiler/GHC/Hs/Decls.hs index 2146cc0c07..69cfd0a111 100644 --- a/compiler/GHC/Hs/Decls.hs +++ b/compiler/GHC/Hs/Decls.hs @@ -383,7 +383,7 @@ Plan of attack: (See RnHiFiles.getSysBinders) - When typechecking the decl, we build the implicit TyCons and Ids. - When doing so we look them up in the name cache (RnEnv.lookupSysName), + When doing so we look them up in the name cache (GHC.Rename.Env.lookupSysName), to ensure correct module and provenance is set These are the two places that we have to conjure up the magic derived @@ -908,7 +908,7 @@ Invariants ones. See Note [Dependency analsis of type, class, and instance decls] -in RnSource for more info. +in GHC.Rename.Source for more info. -} -- | Type or Class Group @@ -1412,7 +1412,7 @@ There's a wrinkle in ConDeclGADT con_args = PrefixCon [] con_res_ty = a :*: (b -> (a :*: (b -> (a :+: b)))) - - In the renamer (RnSource.rnConDecl), we unravel it afer + - In the renamer (GHC.Rename.Source.rnConDecl), we unravel it afer operator fixities are sorted. So we generate. So we end up with con_args = PrefixCon [ a :*: b, a :*: b ] diff --git a/compiler/GHC/Hs/Expr.hs b/compiler/GHC/Hs/Expr.hs index 13ca6b0eff..12daa75187 100644 --- a/compiler/GHC/Hs/Expr.hs +++ b/compiler/GHC/Hs/Expr.hs @@ -179,7 +179,7 @@ This is Less Cool than what we normally do for rebindable syntax, which is to make fully-instantiated piece of evidence at every use site. The Cmd way is Less Cool because * The renamer has to predict which methods are needed. - See the tedious RnExpr.methodNamesCmd. + See the tedious GHC.Rename.Expr.methodNamesCmd. * The desugarer has to know the polymorphic type of the instantiated method. This is checked by Inst.tcSyntaxName, but is less flexible @@ -1748,7 +1748,7 @@ type GhciStmt id = Stmt id (LHsExpr id) -- For details on above see note [Api annotations] in ApiAnnotation data StmtLR idL idR body -- body should always be (LHs**** idR) = LastStmt -- Always the last Stmt in ListComp, MonadComp, - -- and (after the renamer, see RnExpr.checkLastStmt) DoExpr, MDoExpr + -- and (after the renamer, see GHC.Rename.Expr.checkLastStmt) DoExpr, MDoExpr -- Not used for GhciStmtCtxt, PatGuard, which scope over other stuff (XLastStmt idL idR body) body @@ -1776,7 +1776,7 @@ data StmtLR idL idR body -- body should always be (LHs**** idR) -- appropriate applicative expression by the desugarer, but it is intended -- to be invisible in error messages. -- - -- For full details, see Note [ApplicativeDo] in RnExpr + -- For full details, see Note [ApplicativeDo] in GHC.Rename.Expr -- | ApplicativeStmt (XApplicativeStmt idL idR body) -- Post typecheck, Type of the body @@ -2297,7 +2297,7 @@ data HsSplice id -- AZ:TODO: use XSplice instead of HsSpliced | HsSpliced -- See Note [Delaying modFinalizers in untyped splices] in - -- RnSplice. + -- GHC.Rename.Splice. -- This is the result of splicing a splice. It is produced by -- the renamer and consumed by the typechecker. It lives only -- between the two. @@ -2333,7 +2333,7 @@ isTypedSplice _ = False -- Quasi-quotes are untyped splices -- | Finalizers produced by a splice with -- 'Language.Haskell.TH.Syntax.addModFinalizer' -- --- See Note [Delaying modFinalizers in untyped splices] in RnSplice. For how +-- See Note [Delaying modFinalizers in untyped splices] in GHC.Rename.Splice. For how -- this is used. -- newtype ThModFinalizers = ThModFinalizers [ForeignRef (TH.Q ())] @@ -2421,11 +2421,11 @@ distinguished by their UntypedSpliceFlavour UntypedExpSplice is also used for * quasi-quotes, where the pending expression expands to $(quoter "...blah...") - (see RnSplice.makePending, HsQuasiQuote case) + (see GHC.Rename.Splice.makePending, HsQuasiQuote case) * cross-stage lifting, where the pending expression expands to $(lift x) - (see RnSplice.checkCrossStageLifting) + (see GHC.Rename.Splice.checkCrossStageLifting) * Pending pattern splices (UntypedPatSplice), e.g., [| \$(f x) -> x |] diff --git a/compiler/GHC/Hs/Pat.hs b/compiler/GHC/Hs/Pat.hs index bb319181d3..945c2c195f 100644 --- a/compiler/GHC/Hs/Pat.hs +++ b/compiler/GHC/Hs/Pat.hs @@ -245,7 +245,7 @@ data Pat p -- a new hs-boot file. Not worth it. (SyntaxExpr p) -- (>=) function, of type t1->t2->Bool - (SyntaxExpr p) -- Name of '-' (see RnEnv.lookupSyntaxName) + (SyntaxExpr p) -- Name of '-' (see GHC.Rename.Env.lookupSyntaxName) -- ^ n+k pattern ------------ Pattern type signatures --------------- diff --git a/compiler/GHC/Hs/Types.hs b/compiler/GHC/Hs/Types.hs index 46cc1ecb24..92f064144a 100644 --- a/compiler/GHC/Hs/Types.hs +++ b/compiler/GHC/Hs/Types.hs @@ -144,7 +144,7 @@ Then we use a LHsBndrSig on the binder, so that the renamer can decorate it with the variables bound by the pattern ('a' in the first example, 'k' in the second), assuming that neither of them is in scope already -See also Note [Kind and type-variable binders] in RnTypes +See also Note [Kind and type-variable binders] in GHC.Rename.Types Note [HsType binders] ~~~~~~~~~~~~~~~~~~~~~ @@ -265,7 +265,7 @@ By "stable", we mean that any two variables who do not depend on each other preserve their existing left-to-right ordering. Implicitly bound variables are collected by the extract- family of functions -(extractHsTysRdrTyVars, extractHsTyVarBndrsKVs, etc.) in RnTypes. +(extractHsTysRdrTyVars, extractHsTyVarBndrsKVs, etc.) in GHC.Rename.Types. These functions thus promise to keep left-to-right ordering. Look for pointers to this note to see the places where the action happens. @@ -368,7 +368,7 @@ data HsImplicitBndrs pass thing -- See Note [HsType binders] -- Implicitly-bound kind & type vars -- Order is important; see -- Note [Ordering of implicit variables] - -- in RnTypes + -- in GHC.Rename.Types , hsib_body :: thing -- Main payload (type or list of types) } @@ -602,7 +602,8 @@ data HsType pass | HsParTy (XParTy pass) (LHsType pass) -- See Note [Parens in HsSyn] in GHC.Hs.Expr - -- Parenthesis preserved for the precedence re-arrangement in RnTypes + -- Parenthesis preserved for the precedence re-arrangement in + -- GHC.Rename.Types -- It's important that a * (b + c) doesn't get rearranged to (a*b) + c! -- ^ - 'ApiAnnotation.AnnKeywordId' : 'ApiAnnotation.AnnOpen' @'('@, -- 'ApiAnnotation.AnnClose' @')'@ @@ -774,7 +775,7 @@ After renaming Qualified currently behaves exactly as Implicit, but it is deprecated to use it for implicit quantification. In this case, GHC 7.10 gives a warning; see -Note [Context quantification] in RnTypes, and #4426. +Note [Context quantification] in GHC.Rename.Types, and #4426. In GHC 8.0, Qualified will no longer bind variables and this will become an error. diff --git a/compiler/GHC/Hs/Utils.hs b/compiler/GHC/Hs/Utils.hs index 1b386fd703..f9133eba87 100644 --- a/compiler/GHC/Hs/Utils.hs +++ b/compiler/GHC/Hs/Utils.hs @@ -239,7 +239,7 @@ nlParPat p = noLoc (ParPat noExtField p) ------------------------------- -- These are the bits of syntax that contain rebindable names --- See RnEnv.lookupSyntaxName +-- See GHC.Rename.Env.lookupSyntaxName mkHsIntegral :: IntegralLit -> HsOverLit GhcPs mkHsFractional :: FractionalLit -> HsOverLit GhcPs |