picnoir/hnix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #54 from rimmington/ident-reserved-prefix

Browse source 
Correctly parse identifiers with reserved word prefixes
This commit is contained in:
John Wiegley 2017-04-17 10:05:39 -07:00 committed by GitHub
parent 38f6413075 c15de4532a
commit 851aaf92ff
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Nix/Parser.hs
View file

@ -105,11 +105,11 @@ nixInt = annotateLocation1 $ mkIntF <$> token decimal <?> "integer"
nixBool :: Parser NExprLoc
nixBool = annotateLocation1 $ try (true <|> false) <?> "bool" where
true = mkBoolF True <$ symbol "true"
false = mkBoolF False <$ symbol "false"
true = mkBoolF True <$ reserved "true"
false = mkBoolF False <$ reserved "false"
nixNull :: Parser NExprLoc
nixNull = annotateLocation1 $ mkNullF <$ try (symbol "null") <?> "null"
nixNull = annotateLocation1 $ mkNullF <$ try (reserved "null") <?> "null"
nixParens :: Parser NExprLoc
nixParens = parens nixExprLoc <?> "parens"

8
tests/ParserTests.hs
View file

@ -220,6 +220,14 @@ case_identifier_special_chars = do
assertParseFail ".a"
assertParseFail "'a"
case_identifier_keyword_prefix :: Assertion
case_identifier_keyword_prefix = do
assertParseString "true-name" $ mkSym "true-name"
assertParseString "trueName" $ mkSym "trueName"
assertParseString "null-name" $ mkSym "null-name"
assertParseString "nullName" $ mkSym "nullName"
assertParseString "[ null-name ]" $ mkList [ mkSym "null-name" ]
makeStringParseTest :: String -> Assertion
makeStringParseTest str = assertParseString ("\"" ++ str ++ "\"") $ mkStr $ pack str