Skip to content

Fix #4058: Fix two problems with flag combinations #4126

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.

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
merged 1 commit into from
Mar 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/parsing/Parsers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1839,7 +1839,7 @@ object Parsers {
val start = in.offset
var mods = annotsAsMods()
if (owner.isTypeName) {
mods = modifiers(start = mods) | ParamAccessor
mods = addFlag(modifiers(start = mods), ParamAccessor)
mods =
atPos(start, in.offset) {
if (in.token == VAL) {
Expand Down
16 changes: 9 additions & 7 deletions compiler/src/dotty/tools/dotc/typer/Checking.scala
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,10 @@ object Checking {
def checkWithDeferred(flag: FlagSet) =
if (sym.is(flag))
fail(AbstractMemberMayNotHaveModifier(sym, flag))
def checkNoConflict(flag1: FlagSet, flag2: FlagSet) =
if (sym.is(allOf(flag1, flag2)))
fail(i"illegal combination of modifiers: `$flag1` and `$flag2` for: $sym")
def checkNoConflict(flag1: FlagSet, flag2: FlagSet, msg: => String) =
if (sym.is(allOf(flag1, flag2))) fail(msg)
def checkCombination(flag1: FlagSet, flag2: FlagSet) =
checkNoConflict(flag1, flag2, i"illegal combination of modifiers: `$flag1` and `$flag2` for: $sym")
def checkApplicable(flag: FlagSet, ok: Boolean) =
if (!ok && !sym.is(Synthetic))
fail(i"modifier `$flag` is not allowed for this definition")
Expand Down Expand Up @@ -373,10 +374,11 @@ object Checking {
}
if (sym.isValueClass && sym.is(Trait) && !sym.isRefinementClass)
fail(CannotExtendAnyVal(sym))
checkNoConflict(Final, Sealed)
checkNoConflict(Private, Protected)
checkNoConflict(Abstract, Override)
checkNoConflict(Lazy, Inline)
checkCombination(Final, Sealed)
checkCombination(Private, Protected)
checkCombination(Abstract, Override)
checkCombination(Lazy, Inline)
checkNoConflict(Lazy, ParamAccessor, s"parameter may not be `lazy`")
if (sym.is(Inline)) checkApplicable(Inline, sym.isTerm && !sym.is(Mutable | Module))
if (sym.is(Lazy)) checkApplicable(Lazy, !sym.is(Method | Mutable))
if (sym.isType && !sym.is(Deferred))
Expand Down
12 changes: 12 additions & 0 deletions tests/neg/i4058.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
class A(sealed val a: Int) { // error
sealed lazy val b = 10 // error
}
class B(lazy val a: Int) // error: parameter may not be lazy
class C(abstract val a: Int)// error
class D {
def f(sealed a: Int) = 0 // error
def g(lazy a: Int) = 0 // error
def g(override a: Int) = 0 // error
def g(abstract a: Int) = 0 // error
}
sealed erased class E // error