summaryrefslogtreecommitdiff
path: root/compiler/parser
diff options
context:
space:
mode:
authorJose Pedro Magalhaes <jpm@cs.uu.nl>2011-05-04 08:54:50 +0200
committerJose Pedro Magalhaes <jpm@cs.uu.nl>2011-05-04 11:17:36 +0200
commitada48bbc7f6a43b2c042df629327902d82cea681 (patch)
tree8d5d690bdd236c27f107d335af129863b6df6a64 /compiler/parser
parent7d54412fb74016fc964575abc9dfab760052ebe4 (diff)
downloadhaskell-ada48bbc7f6a43b2c042df629327902d82cea681.tar.gz
Add a new flag XDefaultSignatures to enable just the signatures on the default methods. Redefine the behavior of XGenerics to mean enable XDefaultSignatures and XDeriveRepresentable.
Diffstat (limited to 'compiler/parser')
-rw-r--r--compiler/parser/RdrHsSyn.lhs6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/parser/RdrHsSyn.lhs b/compiler/parser/RdrHsSyn.lhs
index 7aa2654ca9..21fbb5acf1 100644
--- a/compiler/parser/RdrHsSyn.lhs
+++ b/compiler/parser/RdrHsSyn.lhs
@@ -814,8 +814,8 @@ checkValSig lhs@(L l _) ty
where
hint = if foreign_RDR `looks_like` lhs
then "Perhaps you meant to use -XForeignFunctionInterface?"
- else if generic_RDR `looks_like` lhs
- then "Perhaps you meant to use -XGenerics?"
+ else if default_RDR `looks_like` lhs
+ then "Perhaps you meant to use -XDefaultSignatures?"
else "Should be of form <variable> :: <type>"
-- A common error is to forget the ForeignFunctionInterface flag
-- so check for that, and suggest. cf Trac #3805
@@ -825,7 +825,7 @@ checkValSig lhs@(L l _) ty
looks_like _ _ = False
foreign_RDR = mkUnqual varName (fsLit "foreign")
- generic_RDR = mkUnqual varName (fsLit "generic")
+ default_RDR = mkUnqual varName (fsLit "default")
checkDoAndIfThenElse :: LHsExpr RdrName
-> Bool