X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnHsSyn.lhs;h=5c959d2e4550f41f89d9cdde410337cd5df4b661;hb=16e4ce4c0c02650082f2e11982017c903c549ad5;hp=efe24a3645cf85e4575a6b99b39bf94f876be572;hpb=fd8400f7a7bcdde8fb6544b327561f00b4f0ade5;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnHsSyn.lhs b/ghc/compiler/rename/RnHsSyn.lhs index efe24a3..5c959d2 100644 --- a/ghc/compiler/rename/RnHsSyn.lhs +++ b/ghc/compiler/rename/RnHsSyn.lhs @@ -11,42 +11,44 @@ module RnHsSyn where import HsSyn import HsCore import Class ( FunDep, DefMeth(..) ) -import TysWiredIn ( tupleTyCon, listTyCon, charTyCon ) +import TyCon ( visibleDataCons, tyConName ) +import TysWiredIn ( tupleTyCon, listTyCon, parrTyCon, charTyCon ) import Name ( Name, getName, isTyVarName ) import NameSet -import BasicTypes ( Boxity ) -import Maybes ( orElse ) +import BasicTypes ( Boxity, FixitySig ) import Outputable \end{code} \begin{code} -type RenamedArithSeqInfo = ArithSeqInfo Name RenamedPat +type RenamedHsDecl = HsDecl Name +type RenamedArithSeqInfo = ArithSeqInfo Name type RenamedClassOpSig = Sig Name type RenamedConDecl = ConDecl Name type RenamedContext = HsContext Name -type RenamedHsDecl = HsDecl Name RenamedPat -type RenamedRuleDecl = RuleDecl Name RenamedPat -type RenamedTyClDecl = TyClDecl Name RenamedPat +type RenamedRuleDecl = RuleDecl Name +type RenamedTyClDecl = TyClDecl Name type RenamedDefaultDecl = DefaultDecl Name type RenamedForeignDecl = ForeignDecl Name -type RenamedGRHS = GRHS Name RenamedPat -type RenamedGRHSs = GRHSs Name RenamedPat -type RenamedHsBinds = HsBinds Name RenamedPat -type RenamedHsExpr = HsExpr Name RenamedPat -type RenamedHsModule = HsModule Name RenamedPat -type RenamedInstDecl = InstDecl Name RenamedPat -type RenamedMatch = Match Name RenamedPat -type RenamedMonoBinds = MonoBinds Name RenamedPat +type RenamedCoreDecl = CoreDecl Name +type RenamedGRHS = GRHS Name +type RenamedGRHSs = GRHSs Name +type RenamedHsBinds = HsBinds Name +type RenamedHsExpr = HsExpr Name +type RenamedInstDecl = InstDecl Name +type RenamedMatchContext = HsMatchContext Name +type RenamedMatch = Match Name +type RenamedMonoBinds = MonoBinds Name type RenamedPat = InPat Name type RenamedHsType = HsType Name type RenamedHsPred = HsPred Name -type RenamedRecordBinds = HsRecordBinds Name RenamedPat +type RenamedRecordBinds = HsRecordBinds Name type RenamedSig = Sig Name -type RenamedStmt = Stmt Name RenamedPat +type RenamedStmt = Stmt Name type RenamedFixitySig = FixitySig Name type RenamedDeprecation = DeprecDecl Name -type RenamedHsOverLit = HsOverLit Name +type RenamedHsCmd = HsCmd Name +type RenamedHsCmdTop = HsCmdTop Name \end{code} %************************************************************************ @@ -58,9 +60,10 @@ type RenamedHsOverLit = HsOverLit Name These free-variable finders returns tycons and classes too. \begin{code} -charTyCon_name, listTyCon_name :: Name +charTyCon_name, listTyCon_name, parrTyCon_name :: Name charTyCon_name = getName charTyCon listTyCon_name = getName listTyCon +parrTyCon_name = getName parrTyCon tupleTyCon_name :: Boxity -> Int -> Name tupleTyCon_name boxity n = getName (tupleTyCon boxity n) @@ -77,14 +80,17 @@ extractHsTyNames ty where get (HsAppTy ty1 ty2) = get ty1 `unionNameSets` get ty2 get (HsListTy ty) = unitNameSet listTyCon_name `unionNameSets` get ty - get (HsTupleTy (HsTupCon n _) tys) = unitNameSet n - `unionNameSets` extractHsTyNames_s tys + get (HsPArrTy ty) = unitNameSet parrTyCon_name `unionNameSets` get ty + get (HsTupleTy con tys) = hsTupConFVs con `unionNameSets` extractHsTyNames_s tys get (HsFunTy ty1 ty2) = get ty1 `unionNameSets` get ty2 get (HsPredTy p) = extractHsPredTyNames p get (HsOpTy ty1 tycon ty2) = get ty1 `unionNameSets` get ty2 `unionNameSets` - unitNameSet tycon + case tycon of { HsTyOp n -> unitNameSet n ; + HsArrow -> emptyNameSet } + get (HsParTy ty) = get ty get (HsNumTy n) = emptyNameSet get (HsTyVar tv) = unitNameSet tv + get (HsKindSig ty k) = get ty get (HsForAllTy (Just tvs) ctxt ty) = (extractHsCtxtTyNames ctxt `unionNameSets` get ty) `minusNameSet` @@ -99,9 +105,9 @@ extractHsCtxtTyNames ctxt = foldr (unionNameSets . extractHsPredTyNames) emptyNa -- You don't import or export implicit parameters, -- so don't mention the IP names -extractHsPredTyNames (HsPClass cls tys) +extractHsPredTyNames (HsClassP cls tys) = unitNameSet cls `unionNameSets` extractHsTyNames_s tys -extractHsPredTyNames (HsPIParam n ty) +extractHsPredTyNames (HsIParam n ty) = extractHsTyNames ty \end{code} @@ -114,30 +120,53 @@ extractHsPredTyNames (HsPIParam n ty) Return the Names that must be in scope if we are to use this declaration. In all cases this is set up for interface-file declarations: - - for class decls we ignroe the bindings + - for class decls we ignore the bindings - for instance decls likewise, plus the pragmas - for rule decls, we ignore HsRules + - for data decls, we ignore derivings + + *** See "THE NAMING STORY" in HsDecls **** \begin{code} +---------------- +impDeclFVs :: RenamedHsDecl -> NameSet + -- Just the ones that come from imports +impDeclFVs (InstD d) = instDeclFVs d +impDeclFVs (TyClD d) = tyClDeclFVs d + +---------------- tyClDeclFVs :: RenamedTyClDecl -> NameSet +tyClDeclFVs (ForeignType {}) + = emptyFVs + tyClDeclFVs (IfaceSig {tcdType = ty, tcdIdInfo = id_infos}) = extractHsTyNames ty `plusFV` plusFVs (map hsIdInfoFVs id_infos) -tyClDeclFVs (TyData {tcdCtxt = context, tcdTyVars = tyvars, tcdCons = condecls, tcdDerivs = derivings}) - = delFVs (map hsTyVarName tyvars) $ +tyClDeclFVs (TyData {tcdCtxt = context, tcdTyVars = tyvars, tcdCons = condecls}) + = delFVs (map hsTyVarName tyvars) $ extractHsCtxtTyNames context `plusFV` - plusFVs (map conDeclFVs condecls) `plusFV` - mkNameSet (derivings `orElse` []) + plusFVs (map conDeclFVs (visibleDataCons condecls)) tyClDeclFVs (TySynonym {tcdTyVars = tyvars, tcdSynRhs = ty}) = delFVs (map hsTyVarName tyvars) (extractHsTyNames ty) -tyClDeclFVs (ClassDecl {tcdCtxt = context, tcdTyVars = tyvars, tcdFDs = fds, tcdSigs = sigs}) +tyClDeclFVs (ClassDecl {tcdCtxt = context, tcdTyVars = tyvars, tcdFDs = fds, + tcdSigs = sigs, tcdMeths = maybe_meths}) = delFVs (map hsTyVarName tyvars) $ extractHsCtxtTyNames context `plusFV` plusFVs (map extractFunDepNames fds) `plusFV` - hsSigsFVs sigs + hsSigsFVs sigs `plusFV` + dm_fvs + where + dm_fvs = case maybe_meths of + Nothing -> mkFVs [v | ClassOpSig _ (DefMeth v) _ _ <- sigs] + -- No method bindings, so this class decl comes from an interface file, + -- So we want to treat the default-method names as free (they should + -- be defined somewhere else). [In source code this is not so; the class + -- decl will bind whatever default-methods are necessary.] + Just _ -> emptyFVs -- Source code, so the default methods + -- are *bound* not *free* ---------------- hsSigsFVs sigs = plusFVs (map hsSigFVs sigs) @@ -145,6 +174,7 @@ hsSigsFVs sigs = plusFVs (map hsSigFVs sigs) hsSigFVs (Sig v ty _) = extractHsTyNames ty hsSigFVs (SpecInstSig ty _) = extractHsTyNames ty hsSigFVs (SpecSig v ty _) = extractHsTyNames ty +hsSigFVs (ClassOpSig _ _ ty _) = extractHsTyNames ty hsSigFVs other = emptyFVs ---------------- @@ -154,17 +184,18 @@ instDeclFVs (InstDecl inst_ty _ _ maybe_dfun _) ---------------- ruleDeclFVs (HsRule _ _ _ _ _ _) = emptyFVs -ruleDeclFVs (IfaceRule _ vars _ args rhs _) +ruleDeclFVs (IfaceRuleOut _ _) = emptyFVs +ruleDeclFVs (IfaceRule _ _ vars _ args rhs _) = delFVs (map ufBinderName vars) $ ufExprFVs rhs `plusFV` plusFVs (map ufExprFVs args) ---------------- -conDeclFVs (ConDecl _ _ tyvars context details _) +conDeclFVs (ConDecl _ tyvars context details _) = delFVs (map hsTyVarName tyvars) $ extractHsCtxtTyNames context `plusFV` conDetailsFVs details -conDetailsFVs (VanillaCon btys) = plusFVs (map bangTyFVs btys) +conDetailsFVs (PrefixCon btys) = plusFVs (map bangTyFVs btys) conDetailsFVs (InfixCon bty1 bty2) = bangTyFVs bty1 `plusFV` bangTyFVs bty2 conDetailsFVs (RecCon flds) = plusFVs [bangTyFVs bty | (_, bty) <- flds] @@ -172,14 +203,14 @@ bangTyFVs bty = extractHsTyNames (getBangType bty) ---------------- hsIdInfoFVs (HsUnfold _ unf) = ufExprFVs unf -hsIdInfoFVs (HsWorker n) = unitFV n +hsIdInfoFVs (HsWorker n a) = unitFV n hsIdInfoFVs other = emptyFVs ---------------- ufExprFVs (UfVar n) = unitFV n ufExprFVs (UfLit l) = emptyFVs ufExprFVs (UfLitLit l ty) = extractHsTyNames ty -ufExprFVs (UfCCall cc ty) = extractHsTyNames ty +ufExprFVs (UfFCall cc ty) = extractHsTyNames ty ufExprFVs (UfType ty) = extractHsTyNames ty ufExprFVs (UfTuple tc es) = hsTupConFVs tc `plusFV` plusFVs (map ufExprFVs es) ufExprFVs (UfLam v e) = ufBndrFVs v (ufExprFVs e) @@ -204,9 +235,11 @@ ufConFVs other = emptyFVs ufNoteFVs (UfCoerce ty) = extractHsTyNames ty ufNoteFVs note = emptyFVs -hsTupConFVs (HsTupCon n _) = unitFV n +hsTupConFVs (HsTupCon bx n) = unitFV (tyConName (tupleTyCon bx n)) + -- Always return the TyCon; that'll suck in the data con \end{code} + %************************************************************************ %* * \subsection{A few functions on generic defintions @@ -221,8 +254,8 @@ maybeGenericMatch :: RenamedMatch -> Maybe (RenamedHsType, RenamedMatch) -- Tells whether a Match is for a generic definition -- and extract the type from a generic match and put it at the front -maybeGenericMatch (Match tvs (TypePatIn ty : pats) sig_ty grhss) - = Just (ty, Match tvs pats sig_ty grhss) +maybeGenericMatch (Match (TypePat ty : pats) sig_ty grhss) + = Just (ty, Match pats sig_ty grhss) maybeGenericMatch other_match = Nothing \end{code}