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

Correct location annotation for parenthesized expressions 

At the moment parentheses are not included in the location annotation
for nix expressions. This changes the code to include any parentheses in
the SrcSpan of the underlying expression. Information which is difficult
to recover otherwise.
This commit is contained in:
Joe Hermaszewski 2020-10-16 19:13:03 +08:00 committed by Anton Latukha
parent 4202bac068
commit dba7650bc5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nix/Parser.hs
View File

@ -58,6 +58,7 @@ import Data.Char ( isAlpha
, isSpace , isSpace
) )
import Data.Data ( Data(..) ) import Data.Data ( Data(..) )
import Data.Fix ( Fix(..) )
import Data.Functor import Data.Functor
import Data.Functor.Identity import Data.Functor.Identity
import Data.HashSet ( HashSet ) import Data.HashSet ( HashSet )
@ -195,8 +196,11 @@ nixBool =
nixNull :: Parser NExprLoc nixNull :: Parser NExprLoc
nixNull = annotateLocation1 (mkNullF <$ reserved "null" <?> "null") nixNull = annotateLocation1 (mkNullF <$ reserved "null" <?> "null")
-- | 'nixTopLevelForm' returns an expression annotated with a source position,
-- however this position doesn't include the parsed parentheses, so remove the
-- "inner" location annotateion and annotate again, including the parentheses.
nixParens :: Parser NExprLoc nixParens :: Parser NExprLoc
nixParens = parens nixToplevelForm <?> "parens" nixParens = annotateLocation1 (stripAnn . unFix <$> (parens nixToplevelForm <?> "parens"))
nixList :: Parser NExprLoc nixList :: Parser NExprLoc
nixList = annotateLocation1 (brackets (NList <$> many nixTerm) <?> "list") nixList = annotateLocation1 (brackets (NList <$> many nixTerm) <?> "list")