12e296e · rowtype-yoga/purescript-native

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

Merge pull request #699 from michaelficarra/GH-606

fixes #606: allow unquoted reserved words in more positions

commit12e296e9d6daa634d1bddbd758c78fdbff52549c authorPhil Freeman <paf31@cantab.net> dateTue 11 Nov 2014, 11:06 (12 years ago) parent53e5fbb 116668c

4 files changed+24−5

compare with golang

unifiedsplit

examples/passing/ReservedWords.purs+13 src/Language/PureScript/Parser/Common.hs+6 src/Language/PureScript/Parser/Declarations.hs+4−4 src/Language/PureScript/Parser/Types.hs+1−1

examples/passing/ReservedWords.pursnew file+13

@@ -0,0 +1,13 @@

1+-- See https://github.com/purescript/purescript/issues/606

2+module Main where

4+ o :: { type :: String }

5+ o = { type: "o" }

7+ p :: { type :: String }

8+ p = o { type = "p" }

10+ f :: forall r. { type :: String | r } -> String

11+ f { type = "p" } = "Done"

12+

13+ main = Debug.Trace.trace $ f { type: p.type, foo: "bar" }

src/Language/PureScript/Parser/Common.hs+6

@@ -133,6 +133,12 @@ lexeme = PT.lexeme tokenParser

133133identifier :: P.Parsec String u String

134134identifier = PT.identifier tokenParser

135135

136+-- |

137+-- Parse an identifier in a more permissive position

138+--

139+identifierName :: P.Parsec String u String

140+identifierName = lexeme $ (:) <$> identStart <*> many identLetter

141+

136142-- |

137143-- Parse a reserved word

138144--

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

@@ -269,7 +269,7 @@ parseObjectLiteral :: P.Parsec String ParseState Expr

269269parseObjectLiteral = ObjectLiteral <$> C.braces (C.commaSep parseIdentifierAndValue)

270270

271271parseIdentifierAndValue :: P.Parsec String ParseState (String, Expr)

272−parseIdentifierAndValue = (,) <$> (C.indented *> (C.identifier <|> C.stringLiteral) <* C.indented <* C.colon)

272+parseIdentifierAndValue = (,) <$> (C.indented *> (C.identifierName <|> C.stringLiteral) <* C.indented <* C.colon)

273273 <*> (C.indented *> parseValue)

274274

275275parseAbs :: P.Parsec String ParseState Expr

@@ -332,14 +332,14 @@ parseValueAtom = P.choice

332332

333333parsePropertyUpdate :: P.Parsec String ParseState (String, Expr)

334334parsePropertyUpdate = do

335− name <- C.lexeme (C.identifier <|> C.stringLiteral)

335+ name <- C.lexeme (C.identifierName <|> C.stringLiteral)

336336 _ <- C.lexeme $ C.indented *> P.char '='

337337 value <- C.indented *> parseValue

338338 return (name, value)

339339

340340parseAccessor :: Expr -> P.Parsec String ParseState Expr

341341parseAccessor (Constructor _) = P.unexpected "constructor"

342−parseAccessor obj = P.try $ Accessor <$> (C.indented *> C.dot *> P.notFollowedBy C.opLetter *> C.indented *> (C.identifier <|> C.stringLiteral)) <*> pure obj

342+parseAccessor obj = P.try $ Accessor <$> (C.indented *> C.dot *> P.notFollowedBy C.opLetter *> C.indented *> (C.identifierName <|> C.stringLiteral)) <*> pure obj

343343

344344parseDo :: P.Parsec String ParseState Expr

345345parseDo = do

@@ -419,7 +419,7 @@ parseNullBinder = C.lexeme (P.char '_' *> P.notFollowedBy C.identLetter) *> retu

419419

420420parseIdentifierAndBinder :: P.Parsec String ParseState (String, Binder)

421421parseIdentifierAndBinder = do

422− name <- C.lexeme (C.identifier <|> C.stringLiteral)

422+ name <- C.lexeme (C.identifierName <|> C.stringLiteral)

423423 _ <- C.lexeme $ C.indented *> P.char '='

424424 binder <- C.indented *> parseBinder

425425 return (name, binder)

src/Language/PureScript/Parser/Types.hs+1−1

@@ -109,7 +109,7 @@ parsePolyType :: P.Parsec String ParseState Type

109109parsePolyType = parseAnyType

110110

111111parseNameAndType :: P.Parsec String ParseState t -> P.Parsec String ParseState (String, t)

112−parseNameAndType p = (,) <$> (indented *> (identifier <|> stringLiteral) <* indented <* lexeme (P.string "::")) <*> p

112+parseNameAndType p = (,) <$> (indented *> (identifierName <|> stringLiteral) <* indented <* lexeme (P.string "::")) <*> p

113113

114114parseRowEnding :: P.Parsec String ParseState Type

115115parseRowEnding = P.option REmpty (TypeVar <$> (lexeme (indented *> P.char '|') *> indented *> identifier))