Derive not deriving

paf31 · paf31 · commit 205508e03675 · 2015-08-13T10:13:47.000-07:00
diff --git a/core-tests/tests/generic-deriving/Main.purs b/core-tests/tests/generic-deriving/Main.purs
@@ -10,4 +10,4 @@ data A
   | C (Array A) 
   | D { a :: A }
 
-deriving instance genericA :: Generic A
+derive instance genericA :: Generic A
diff --git a/src/Language/PureScript/Parser/Declarations.hs b/src/Language/PureScript/Parser/Declarations.hs
@@ -233,7 +233,7 @@ parseTypeInstanceDeclaration = do
   
 parseDerivingInstanceDeclaration :: TokenParser Declaration
 parseDerivingInstanceDeclaration = do
-  reserved "deriving"
+  reserved "derive"
   reserved "instance"
   name <- parseIdent <* indented <* doubleColon
   deps <- P.optionMaybe $ do
diff --git a/src/Language/PureScript/Parser/Lexer.hs b/src/Language/PureScript/Parser/Lexer.hs
@@ -494,7 +494,7 @@ reservedPsNames = [ "data"
                   , "infix"
                   , "class"
                   , "instance"
-                  , "deriving"
+                  , "derive"
                   , "module"
                   , "case"
                   , "of"
