Skip to content

Make Ycheck stricter #3763

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
merged 1 commit into from
Apr 1, 2018
Merged

Make Ycheck stricter #3763

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 5 additions & 10 deletions compiler/src/dotty/tools/dotc/transform/TreeChecker.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,12 @@ class TreeChecker extends Phase with SymTransformer {

def isValidJVMMethodName(name: Name) = name.toString.forall(isValidJVMMethodChar)

def printError(str: String)(implicit ctx: Context) = {
ctx.echo(Console.RED + "[error] " + Console.WHITE + str)
}

val NoSuperClass = Trait | Package

def testDuplicate(sym: Symbol, registry: mutable.Map[String, Symbol], typ: String)(implicit ctx: Context) = {
val name = sym.fullName.mangledString
if (this.flatClasses && registry.contains(name))
assert(false, s"$typ defined twice $sym ${sym.id} ${registry(name).id}")
val isDuplicate = this.flatClasses && registry.contains(name)
assert(!isDuplicate, s"$typ defined twice $sym ${sym.id} ${registry(name).id}")
registry(name) = sym
}

Expand All @@ -85,14 +81,13 @@ class TreeChecker extends Phase with SymTransformer {
if (sym.isClass && !sym.isAbsent) {
val validSuperclass = sym.isPrimitiveValueClass || defn.syntheticCoreClasses.contains(sym) ||
(sym eq defn.ObjectClass) || (sym is NoSuperClass) || (sym.asClass.superClass.exists)
if (!validSuperclass)
printError(s"$sym has no superclass set")

assert(validSuperclass, i"$sym has no superclass set")
testDuplicate(sym, seenClasses, "class")
}

if (sym.is(Method) && sym.is(Deferred) && sym.is(Private))
assert(false, s"$sym is both Deferred and Private")
val isDeferredAndPrivate = sym.is(Method) && sym.is(Deferred) && sym.is(Private)
assert(!isDeferredAndPrivate, i"$sym is both Deferred and Private")

checkCompanion(symd)

Expand Down