Use commaSeparated helper in more places #14741
Merged
Conversation
This file contains hidden or 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
This was referenced Mar 22, 2022
odersky
requested changes
Mar 23, 2022
| @@ -3203,13 +3200,6 @@ object Parsers { | |||
| if !idOK then syntaxError(i"named imports cannot follow wildcard imports") | |||
| namedSelector(termIdent()) | |||
| } | |||
| val rest = | |||
There was a problem hiding this comment.
It seems that changes the accepted set of programs since it does not propagate isWildcard to following import selectors.
| * @param readFirst If true, assume we have not read the first `part`. Otherwise, | ||
| * expect that we have (i.e the next thing to expect is a [[COMMA]]). | ||
| */ | ||
| def commaSeparated[T](part: () => T, readFirst: Boolean = true): List[T] = |
There was a problem hiding this comment.
Better to avoid boolean parameters. In this case we can do that by having two methods commaSeparated and commaSeparatedRest. The second takes the first node as parameter.
odersky
approved these changes
Mar 23, 2022
odersky
added a commit
to dotty-staging/dotty
that referenced
this pull request
Mar 23, 2022
Do it in Lexer but take into account whether commas are expected in current region. Also fixes an issue in scala#14741 regarding import parsing.
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.
Pure refactor, but one that will make fixing scala/bug#11900 in dotty easier.