Revise #4973: move fix of #4936 into desugar #5723
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
Blaisorblade
force-pushed
the
fix-#4936-#4973-desugar
branch
from
93673e9 to
3db1783
Compare
Blaisorblade
commented
Jan 17, 2019
|
|
||
| if (mods.is(Abstract)) | ||
| ctx.error(hl"""$Abstract modifier cannot be used for objects""", flagPos(Abstract)) | ||
| if (mods.is(Sealed)) | ||
| ctx.error(hl"""$Sealed modifier is redundant for objects""", flagPos(Sealed)) | ||
| // Maybe this should be an error; see https://github.com/scala/bug/issues/11094. | ||
| if (mods.is(Final)) | ||
| if (mods.is(Final) && !mods.is(Synthetic)) | ||
| ctx.warning(hl"""$Final modifier is redundant for objects""", flagPos(Final)) | ||
|
|
||
| if (mods is Package) |
There was a problem hiding this comment.
This should fix the crashes in http://dotty-ci.epfl.ch/lampepfl/dotty/9779/5
Blaisorblade
added
the
area:reporting
odersky
approved these changes
Jan 18, 2019
|
@Blaisorblade Can be merged now after a rebase. |
This follows again the original strategy in 1ecf67b. This check is at the latest possible point: a few lines later, `RetainedModuleValFlags` excludes `Abstract` and `Sealed` while `ModuleValCreationFlags` adds `Final`. Unlike in Parsers, at this point in Desugar we get Synthetic objects. We also get objects with flags but without corresponding mods; they might all be synthetic, but let's harden flagSpan anyway.
Blaisorblade
force-pushed
the
fix-#4936-#4973-desugar
branch
from
3db1783 to
986c2df
Compare
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.
Revise #4973: move fix of #4936 into desugar.
As requested by @odersky, this reverts the changes to Parser and moves the checking to Desugar. These checks can't be done later (see commit msg for why).