\'kind\' is no longer a reserved word

paf31 · paf31 · commit 975e2807abbb · 2017-01-01T13:06:25.000-08:00
diff --git a/src/Language/PureScript/Parser/Declarations.hs b/src/Language/PureScript/Parser/Declarations.hs
@@ -110,7 +110,7 @@ parseValueDeclaration = do
 
 parseExternDeclaration :: TokenParser Declaration
 parseExternDeclaration = reserved "foreign" *> indented *> reserved "import" *> indented *> parseExternAlt where
-  parseExternAlt = parseExternData <|> parseExternKind <|> parseExternTerm
+  parseExternAlt = parseExternData <|> P.try parseExternKind <|> parseExternTerm
 
   parseExternData = ExternDataDeclaration <$> (reserved "data" *> indented *> typeName)
                                           <*> (indented *> doubleColon *> parseKind)
@@ -167,11 +167,11 @@ parseImportDeclaration' = do
 parseDeclarationRef :: TokenParser DeclarationRef
 parseDeclarationRef =
   withSourceSpan PositionedDeclarationRef
-    $ (ValueRef <$> parseIdent)
+    $ (KindRef <$> P.try (reserved "kind" *> kindName))
+    <|> (ValueRef <$> parseIdent)
     <|> (ValueOpRef <$> parens parseOperator)
     <|> parseTypeRef
     <|> (TypeClassRef <$> (reserved "class" *> properName))
-    <|> (KindRef <$> (reserved "kind" *> kindName))
     <|> (ModuleRef <$> (indented *> reserved "module" *> moduleName))
     <|> (TypeOpRef <$> (indented *> reserved "type" *> parens parseOperator))
   where
diff --git a/src/Language/PureScript/Parser/Lexer.hs b/src/Language/PureScript/Parser/Lexer.hs
@@ -556,7 +556,6 @@ reservedPsNames :: [Text]
 reservedPsNames = [ "data"
                   , "newtype"
                   , "type"
-                  , "kind"
                   , "foreign"
                   , "import"
                   , "infixl"
