Allow blocks to appear as elements in lists and tuples #2415
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
runarorama
added
the
ready-to-merge
runarorama
commented
Sep 17, 2021
| Just (block, n) -> do | ||
| S.put (env { layout = drop n (layout env), opening = Just block }) | ||
| let opens = [Token (Reserved close) pos1 pos2] | ||
| pure $ replicate (n-1) (Token Close pos1 pos2) ++ opens |
There was a problem hiding this comment.
The n-1 here is key. Close as many blocks as necessary to get us back to the bracket block.
runarorama
commented
Sep 17, 2021
| @@ -84,9 +84,9 @@ effectList = do | |||
|
|
|||
| sequenceTyp :: Var v => TypeP v | |||
| sequenceTyp = do | |||
| open <- reserved "[" | |||
| open <- openBlockWith "[" | |||
There was a problem hiding this comment.
Maybe it's a bit weird that blocks can appear in list types, but there aren't any block type elements at this level anyway.
pchiusano
approved these changes
Sep 17, 2021
pchiusano
removed
the
ready-to-merge
Co-authored-by: Paul Chiusano <paul.chiusano@gmail.com>
Co-authored-by: Paul Chiusano <paul.chiusano@gmail.com>
runarorama
added
the
ready-to-merge
mergify
bot
removed
the
ready-to-merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2258.
This changes and unifies the way the parser handles brackets—namely parentheses (
()) and square brackets ([])—and commas (,) inside them. A bracket now opens a block, and the corresponding closing bracket closes it. Any comma between brackets also closes any inner blocks that were opened inside the brackets.As a result, blocks can now appear as elements in lists and tuples, so this is valid syntax:
as is
This incidentally also adds support for redundant commas in tuples, like
(,"one",,"two",), making that syntax consistent with lists.