X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=060eeac87b1aff4cdb0365f06519c60efd54cca9;hp=889e4cef727258f9bd46de80c1b087d9f8a071c0;hb=1ed54200532d9a9b1b58ac914dae28c1ecb48699;hpb=3de26aa3d728b06ee7bf658fec6a09855822d492

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 889e4ce..060eeac 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -178,7 +178,7 @@ incorrect.
  'data' 	{ L _ ITdata } 
  'default' 	{ L _ ITdefault }
  'deriving' 	{ L _ ITderiving }
- 'derived' 	{ L _ ITderived }
+ 'derive' 	{ L _ ITderive }
  'do' 		{ L _ ITdo }
  'else' 	{ L _ ITelse }
  'hiding' 	{ L _ IThiding }
@@ -740,7 +740,7 @@ tycl_hdr :: { Located (LHsContext RdrName,
 
 -- Glasgow extension: stand-alone deriving declarations
 stand_alone_deriving :: { LDerivDecl RdrName }
-  	: 'derived' 'instance' inst_type {% checkDerivDecl (LL (DerivDecl $3)) }
+  	: 'derive' 'instance' inst_type {% checkDerivDecl (LL (DerivDecl $3)) }
 
 -----------------------------------------------------------------------------
 -- Nested declarations
@@ -1738,7 +1738,7 @@ special_id
 	: 'as'			{ L1 FSLIT("as") }
 	| 'qualified'		{ L1 FSLIT("qualified") }
 	| 'hiding'		{ L1 FSLIT("hiding") }
-	| 'derived'		{ L1 FSLIT("derived") }
+	| 'derive'		{ L1 FSLIT("derive") }
 	| 'export'		{ L1 FSLIT("export") }
 	| 'label'		{ L1 FSLIT("label")  }
 	| 'dynamic'		{ L1 FSLIT("dynamic") }