975e280 · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

on golang help sign in

\'kind\' is no longer a reserved word

975e280Phil Freeman10 years ago

src/Language/PureScript/Parser/Declarations.hs+3−3

@@ -110,7 +110,7 @@ parseValueDeclaration = do

110

111parseExternDeclaration :: TokenParser Declaration

112parseExternDeclaration = reserved "foreign" *> indented *> reserved "import" *> indented *> parseExternAlt where

113− parseExternAlt = parseExternData <|> parseExternKind <|> parseExternTerm

113+ parseExternAlt = parseExternData <|> P.try parseExternKind <|> parseExternTerm

114

115 parseExternData = ExternDataDeclaration <$> (reserved "data" *> indented *> typeName)

116 <*> (indented *> doubleColon *> parseKind)

@@ -167,11 +167,11 @@ parseImportDeclaration' = do

167parseDeclarationRef :: TokenParser DeclarationRef

168parseDeclarationRef =

169 withSourceSpan PositionedDeclarationRef

170+ $ (KindRef <$> P.try (reserved "kind" *> kindName))

170− $ (ValueRef <$> parseIdent)

171+ <|> (ValueRef <$> parseIdent)

171 <|> (ValueOpRef <$> parens parseOperator)

172 <|> (ValueOpRef <$> parens parseOperator)

172 <|> parseTypeRef

173 <|> parseTypeRef

173 <|> (TypeClassRef <$> (reserved "class" *> properName))

174 <|> (TypeClassRef <$> (reserved "class" *> properName))

174− <|> (KindRef <$> (reserved "kind" *> kindName))

175 <|> (ModuleRef <$> (indented *> reserved "module" *> moduleName))

176 <|> (TypeOpRef <$> (indented *> reserved "type" *> parens parseOperator))

177 where

src/Language/PureScript/Parser/Lexer.hs−1

@@ -556,7 +556,6 @@ reservedPsNames :: [Text]

556reservedPsNames = [ "data"

557 , "newtype"

558 , "type"

559− , "kind"

560 , "foreign"

559 , "foreign"

561 , "import"

560 , "import"

562 , "infixl"

561 , "infixl"