X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=d5314e4b21969f3c4d6df94cd785fde0fe917c1e;hb=d6a972fb003ab3a21011564c654487788ae7be55;hp=6493b06f291f796a185108c6d71c9499abdd1c97;hpb=ef70af356e3229cc5c64359bf7866e5fdf44bb09;p=ghc-hetmet.git

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 6493b06..d5314e4 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -8,7 +8,7 @@
 -- ---------------------------------------------------------------------------
 
 {
-{-# OPTIONS -w #-}
+{-# OPTIONS -Wwarn #-}
 -- The above warning supression flag is a temporary kludge.
 -- While working on this module you are encouraged to remove it and fix
 -- any warnings in the module. See
@@ -1004,17 +1004,6 @@ strict_mark :: { Located HsBang }
 	: '!'				{ L1 HsStrict }
 	| '{-# UNPACK' '#-}' '!'	{ LL HsUnbox }
 
-----------------------
--- Notes for 'ctype'
--- We should probably use 'gentype' rather than 'type' in the LHS of type declarations
--- That would leave the only use of 'type' in 'ctype'; and only one of its occurrences 
--- makes sense there too! So it might make sense to inline type there:
---    ctype : 'forall' tv_bndrs '.' ctype
---          | context '=>' ctype           
---          | ipvar '::' gentype
---          | gentype
--- Which in turn would let us rename gentype to type 
-
 -- A ctype is a for-all type
 ctype	:: { LHsType RdrName }
 	: 'forall' tv_bndrs '.' ctype	{ LL $ mkExplicitHsForAllTy $2 (noLoc []) $4 }
@@ -1023,10 +1012,6 @@ ctype	:: { LHsType RdrName }
 	| ipvar '::' type		{ LL (HsPredTy (HsIParam (unLoc $1) $3)) }
 	| type  			{ $1 }
 
-type :: { LHsType RdrName }
-	: ipvar '::' gentype		{ LL (HsPredTy (HsIParam (unLoc $1) $3)) }
-	| gentype			{ $1 }
-
 ----------------------
 -- Notes for 'ctypedoc'
 -- It would have been nice to simplify the grammar by unifying `ctype` and 
@@ -1045,10 +1030,6 @@ ctypedoc :: { LHsType RdrName }
 	| ipvar '::' type		{ LL (HsPredTy (HsIParam (unLoc $1) $3)) }
 	| typedoc			{ $1 }
 
-typedoc :: { LHsType RdrName }
-	: ipvar '::' gentype		{ LL (HsPredTy (HsIParam (unLoc $1) $3)) }
-	| gentypedoc			{ $1 }
-
 ----------------------
 -- Notes for 'context'
 -- We parse a context as a btype so that we don't get reduce/reduce