Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#371, fix multiline LANGUAGE pragmas #408

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

#371, fix multiline LANGUAGE pragmas #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce9db5d
Fix #371, parse multiline LANGUAGE pragmas correctly
bravit May 6, 2018
809616e
Add test to #371 fix
bravit May 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Language/Haskell/Exts/InternalParser.ly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@ TODO: Yuck, this is messy, needs fixing in the AST!


> conids :: { ([Name L],[S]) }
> : conids ',' conid { (fst $1 ++ [$3], snd $1 ++ [$2]) }
> | optsemis conid { ([$2],[]) }
> : conids optsemis ',' optsemis conid { (fst $1 ++ [$5], snd $1 ++ [$3]) }
> | optsemis conid { ([$2],[]) }

-----------------------------------------------------------------------------
Module Header
Expand Down
8 changes: 8 additions & 0 deletions tests/examples/MultilineLanguagePragma.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{-# LANGUAGE
BangPatterns,
MagicHash
,OverloadedStrings
, LambdaCase
#-}

main = undefined
1 change: 1 addition & 0 deletions tests/examples/MultilineLanguagePragma.hs.exactprinter.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Match
107 changes: 107 additions & 0 deletions tests/examples/MultilineLanguagePragma.hs.parser.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
ParseOk
( Module
SrcSpanInfo
{ srcInfoSpan =
SrcSpan "tests/examples/MultilineLanguagePragma.hs" 1 1 9 1
, srcInfoPoints =
[ SrcSpan "tests/examples/MultilineLanguagePragma.hs" 1 1 1 1
, SrcSpan "tests/examples/MultilineLanguagePragma.hs" 8 1 8 1
, SrcSpan "tests/examples/MultilineLanguagePragma.hs" 8 1 8 1
, SrcSpan "tests/examples/MultilineLanguagePragma.hs" 8 1 8 1
, SrcSpan "tests/examples/MultilineLanguagePragma.hs" 9 1 9 1
, SrcSpan "tests/examples/MultilineLanguagePragma.hs" 9 1 9 1
]
}
Nothing
[ LanguagePragma
SrcSpanInfo
{ srcInfoSpan =
SrcSpan "tests/examples/MultilineLanguagePragma.hs" 1 1 6 6
, srcInfoPoints =
[ SrcSpan "tests/examples/MultilineLanguagePragma.hs" 1 1 1 13
, SrcSpan "tests/examples/MultilineLanguagePragma.hs" 2 13 2 14
, SrcSpan "tests/examples/MultilineLanguagePragma.hs" 4 1 4 2
, SrcSpan "tests/examples/MultilineLanguagePragma.hs" 5 1 5 2
, SrcSpan "tests/examples/MultilineLanguagePragma.hs" 6 3 6 6
]
}
[ Ident
SrcSpanInfo
{ srcInfoSpan =
SrcSpan "tests/examples/MultilineLanguagePragma.hs" 2 1 2 13
, srcInfoPoints = []
}
"BangPatterns"
, Ident
SrcSpanInfo
{ srcInfoSpan =
SrcSpan "tests/examples/MultilineLanguagePragma.hs" 3 1 3 10
, srcInfoPoints = []
}
"MagicHash"
, Ident
SrcSpanInfo
{ srcInfoSpan =
SrcSpan "tests/examples/MultilineLanguagePragma.hs" 4 2 4 19
, srcInfoPoints = []
}
"OverloadedStrings"
, Ident
SrcSpanInfo
{ srcInfoSpan =
SrcSpan "tests/examples/MultilineLanguagePragma.hs" 5 4 5 14
, srcInfoPoints = []
}
"LambdaCase"
]
]
[]
[ PatBind
SrcSpanInfo
{ srcInfoSpan =
SrcSpan "tests/examples/MultilineLanguagePragma.hs" 8 1 8 17
, srcInfoPoints = []
}
(PVar
SrcSpanInfo
{ srcInfoSpan =
SrcSpan "tests/examples/MultilineLanguagePragma.hs" 8 1 8 5
, srcInfoPoints = []
}
(Ident
SrcSpanInfo
{ srcInfoSpan =
SrcSpan "tests/examples/MultilineLanguagePragma.hs" 8 1 8 5
, srcInfoPoints = []
}
"main"))
(UnGuardedRhs
SrcSpanInfo
{ srcInfoSpan =
SrcSpan "tests/examples/MultilineLanguagePragma.hs" 8 6 8 17
, srcInfoPoints =
[ SrcSpan "tests/examples/MultilineLanguagePragma.hs" 8 6 8 7 ]
}
(Var
SrcSpanInfo
{ srcInfoSpan =
SrcSpan "tests/examples/MultilineLanguagePragma.hs" 8 8 8 17
, srcInfoPoints = []
}
(UnQual
SrcSpanInfo
{ srcInfoSpan =
SrcSpan "tests/examples/MultilineLanguagePragma.hs" 8 8 8 17
, srcInfoPoints = []
}
(Ident
SrcSpanInfo
{ srcInfoSpan =
SrcSpan "tests/examples/MultilineLanguagePragma.hs" 8 8 8 17
, srcInfoPoints = []
}
"undefined"))))
Nothing
]
, []
)
1 change: 1 addition & 0 deletions tests/examples/MultilineLanguagePragma.hs.prettyparser.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Match
3 changes: 3 additions & 0 deletions tests/examples/MultilineLanguagePragma.hs.prettyprinter.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{-# LANGUAGE BangPatterns, MagicHash, OverloadedStrings, LambdaCase
#-}
main = undefined