X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fparser%2FLexer.x;h=49dabf00a05eea8cc22528141a2945d0b8ab402d;hb=8ff14137d7cbf1bc91a88d1790422b689af284af;hp=316f21f1e9a9368082e73207a421aad51703f437;hpb=84923cc7de2a93c22a2f72daf9ac863959efae13;p=ghc-hetmet.git

diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index 316f21f..49dabf0 100644
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@ -389,7 +389,7 @@ data Token
   | ITdata
   | ITdefault
   | ITderiving
-  | ITderived
+  | ITderive
   | ITdo
   | ITelse
   | IThiding
@@ -422,7 +422,6 @@ data Token
   | ITccallconv
   | ITdotnet
   | ITmdo
-  | ITiso
   | ITfamily
 
 	-- Pragmas
@@ -544,7 +543,7 @@ isSpecial :: Token -> Bool
 -- not as a keyword.
 isSpecial ITas        	= True
 isSpecial IThiding    	= True
-isSpecial ITderived    	= True
+isSpecial ITderive    	= True
 isSpecial ITqualified 	= True
 isSpecial ITforall    	= True
 isSpecial ITexport    	= True
@@ -556,7 +555,6 @@ isSpecial ITunsafe    	= True
 isSpecial ITccallconv   = True
 isSpecial ITstdcallconv = True
 isSpecial ITmdo		= True
-isSpecial ITiso		= True
 isSpecial ITfamily	= True
 isSpecial _             = False
 
@@ -576,7 +574,7 @@ reservedWordsFM = listToUFM $
 	( "data",	ITdata, 	0 ),     
 	( "default",	ITdefault, 	0 ),  
 	( "deriving",	ITderiving, 	0 ), 
-	( "derived",	ITderived, 	0 ), 
+	( "derive",	ITderive, 	0 ), 
 	( "do",		ITdo, 		0 ),       
 	( "else",	ITelse, 	0 ),     
 	( "hiding",	IThiding, 	0 ),
@@ -649,7 +647,7 @@ reservedSymsFM = listToUFM $
        ,("∀",	ITforall,	bit glaExtsBit)
        ,("→",   ITrarrow,	bit glaExtsBit)
        ,("←",   ITlarrow,	bit glaExtsBit)
-       ,("⋯", 	ITdotdot,	bit glaExtsBit)
+       ,("?", 	ITdotdot,	bit glaExtsBit)
         -- ToDo: ideally, → and ∷ should be "specials", so that they cannot
         -- form part of a large operator.  This would let us have a better
         -- syntax for kinds: ɑ∷*→* would be a legal kind signature. (maybe).