projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2006-01-06 16:30:17 by simonmar]
[ghc-hetmet.git]
/
ghc
/
compiler
/
hsSyn
/
HsDecls.lhs
diff --git
a/ghc/compiler/hsSyn/HsDecls.lhs
b/ghc/compiler/hsSyn/HsDecls.lhs
index
ddd11a6
..
5253d11
100644
(file)
--- a/
ghc/compiler/hsSyn/HsDecls.lhs
+++ b/
ghc/compiler/hsSyn/HsDecls.lhs
@@
-405,7
+405,7
@@
tyClDeclNames (TySynonym {tcdLName = name}) = [name]
tyClDeclNames (ForeignType {tcdLName = name}) = [name]
tyClDeclNames (ClassDecl {tcdLName = cls_name, tcdSigs = sigs})
tyClDeclNames (ForeignType {tcdLName = name}) = [name]
tyClDeclNames (ClassDecl {tcdLName = cls_name, tcdSigs = sigs})
- = cls_name : [n | L _ (Sig n _) <- sigs]
+ = cls_name : [n | L _ (TypeSig n _) <- sigs]
tyClDeclNames (TyData {tcdLName = tc_name, tcdCons = cons})
= tc_name : conDeclsNames (map unLoc cons)
tyClDeclNames (TyData {tcdLName = tc_name, tcdCons = cons})
= tc_name : conDeclsNames (map unLoc cons)
@@
-500,6
+500,18
@@
instance Outputable NewOrData where
\begin{code}
type LConDecl name = Located (ConDecl name)
\begin{code}
type LConDecl name = Located (ConDecl name)
+-- data T b = forall a. Eq a => MkT a b
+-- MkT :: forall b a. Eq a => MkT a b
+
+-- data T b where
+-- MkT1 :: Int -> T Int
+
+-- data T = Int `MkT` Int
+-- | MkT2
+
+-- data T a where
+-- Int `MkT` Int :: T Int
+
data ConDecl name
= ConDecl
{ con_name :: Located name -- Constructor name; this is used for the
data ConDecl name
= ConDecl
{ con_name :: Located name -- Constructor name; this is used for the
@@
-709,8
+721,8
@@
instance Outputable ForeignImport where
ptext SLIT("dynamic")
pprCEntity _ _ (CWrapper) = ptext SLIT("wrapper")
--
ptext SLIT("dynamic")
pprCEntity _ _ (CWrapper) = ptext SLIT("wrapper")
--
- pprLib lib | nullFastString lib = empty
- | otherwise = char '[' <> ppr lib <> char ']'
+ pprLib lib | nullFS lib = empty
+ | otherwise = char '[' <> ppr lib <> char ']'
instance Outputable ForeignExport where
ppr (CExport (CExportStatic lbl cconv)) =
instance Outputable ForeignExport where
ppr (CExport (CExportStatic lbl cconv)) =