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

Merge pull request #1 from lethalman/master

Browse source 
Fix parsing of rec sets with reserved keyword
This commit is contained in:
John Wiegley 2014-07-04 15:43:30 -05:00
parent d5d77cd84f f8d0496bba
commit 74e1812f74
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Nix/Parser.hs
View file

@ -96,10 +96,10 @@ nixIf = Fix <$> (NIf
setLambdaStringOrSym :: Bool -> Parser NExpr setLambdaStringOrSym :: Bool -> Parser NExpr
setLambdaStringOrSym allowLambdas = do setLambdaStringOrSym allowLambdas = do
trace "setLambdaStringOrSym" $ return () trace "setLambdaStringOrSym" $ return ()
x <- try (lookAhead identifier) isSetOrArgs <- try (lookAhead (reserved "rec") *> pure True) <|>
<|> try (lookAhead (singleton <$> char '{')) try (lookAhead (singleton <$> char '{') *> pure True)
<|> return "" <|> pure False
if x == "rec" || x == "{" if isSetOrArgs
then setOrArgs then setOrArgs
else do else do
trace "might still have a lambda" $ return () trace "might still have a lambda" $ return ()