X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=889e4cef727258f9bd46de80c1b087d9f8a071c0;hp=f72c8b9d83f46b2085b40957b5662ba61a73ce8f;hb=84923cc7de2a93c22a2f72daf9ac863959efae13;hpb=c8732b3c99e93c36ad28e23d2b901b794e89542a

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index f72c8b9..889e4ce 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -178,9 +178,9 @@ incorrect.
  'data' 	{ L _ ITdata } 
  'default' 	{ L _ ITdefault }
  'deriving' 	{ L _ ITderiving }
+ 'derived' 	{ L _ ITderived }
  'do' 		{ L _ ITdo }
  'else' 	{ L _ ITelse }
- 'for' 	        { L _ ITfor }
  'hiding' 	{ L _ IThiding }
  'if' 		{ L _ ITif }
  'import' 	{ L _ ITimport }
@@ -740,10 +740,7 @@ tycl_hdr :: { Located (LHsContext RdrName,
 
 -- Glasgow extension: stand-alone deriving declarations
 stand_alone_deriving :: { LDerivDecl RdrName }
-  	: 'deriving' qtycon            'for' qtycon  {% do { p <- checkInstType (fmap HsTyVar $2)
-				                           ; checkDerivDecl (LL (DerivDecl p $4)) } }
-
-        | 'deriving' '(' inst_type ')' 'for' qtycon  {% checkDerivDecl (LL (DerivDecl $3 $6)) }
+  	: 'derived' 'instance' inst_type {% checkDerivDecl (LL (DerivDecl $3)) }
 
 -----------------------------------------------------------------------------
 -- Nested declarations
@@ -1741,7 +1738,7 @@ special_id
 	: 'as'			{ L1 FSLIT("as") }
 	| 'qualified'		{ L1 FSLIT("qualified") }
 	| 'hiding'		{ L1 FSLIT("hiding") }
-        | 'for'                 { L1 FSLIT("for") }
+	| 'derived'		{ L1 FSLIT("derived") }
 	| 'export'		{ L1 FSLIT("export") }
 	| 'label'		{ L1 FSLIT("label")  }
 	| 'dynamic'		{ L1 FSLIT("dynamic") }