Skip to content

Generalize grammar for certain annotation expressions #2320

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

Merged
Gabriella439 merged 3 commits into from
Oct 23, 2021
Merged

Generalize grammar for certain annotation expressions #2320

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06951d8
Generalize grammar for certain annotation expressions
Gabriella439 Oct 21, 2021
3fe6829
Fix additional inconsistencies with standard
Gabriella439 Oct 22, 2021
f940dde
Merge branch 'master' into gabriella/annotation-expression
Gabriella439 Oct 23, 2021
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
6 changes: 3 additions & 3 deletions dhall/src/Dhall/Parser/Expression.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,15 +418,15 @@ parsers embedded = Parsers{..}
nonemptyWhitespace
case (shallowDenote a, a0Info) of
(ListLit Nothing [], _) -> do
b <- applicationExpression
b <- expression

return (ListLit (Just b) [])
(Merge c d Nothing, NakedMergeOrSomeOrToMap) -> do
b <- applicationExpression
b <- expression

return (Merge c d (Just b))
(ToMap c Nothing, NakedMergeOrSomeOrToMap) -> do
b <- applicationExpression
b <- expression

return (ToMap c (Just b))
_ -> do
Expand Down
10 changes: 5 additions & 5 deletions dhall/src/Dhall/Pretty/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,15 +861,15 @@ prettyPrinters characterSet =
<> Pretty.indent 2 (prettyImportExpression_ b)
<> Pretty.hardline
<> colon <> space
<> prettyApplicationExpression c
<> prettyExpression c
)

short = keyword "merge" <> space
<> prettyImportExpression_ a
<> " "
<> prettyImportExpression_ b
<> space <> colon <> space
<> prettyApplicationExpression c
<> prettyExpression c
prettyAnnotatedExpression (ToMap a (Just b)) =
Pretty.group (Pretty.flatAlt long short)
where
Expand All @@ -880,13 +880,13 @@ prettyPrinters characterSet =
<> Pretty.indent 2 (prettyImportExpression_ a)
<> Pretty.hardline
<> colon <> space
<> prettyApplicationExpression b
<> prettyExpression b
)

short = keyword "toMap" <> space
<> prettyImportExpression_ a
<> space <> colon <> space
<> prettyApplicationExpression b
<> prettyExpression b
prettyAnnotatedExpression a0@(Annot _ _) =
enclose'
""
Expand All @@ -906,7 +906,7 @@ prettyPrinters characterSet =
prettyAnnotatedExpression (ListLit (Just a) b) =
list (map prettyExpression (Data.Foldable.toList b))
<> " : "
<> prettyApplicationExpression a
<> prettyExpression a
prettyAnnotatedExpression a
| Just doc <- preserveSource a =
doc
Expand Down