Skip to content

Check Java classes are not used as objects #1201

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 8, 2016
Merged

Check Java classes are not used as objects #1201

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
74 changes: 74 additions & 0 deletions src/dotty/tools/dotc/transform/TreeChecker.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,80 @@ class TreeChecker extends Phase with SymTransformer {
if (tree.symbol.maybeOwner.isTerm)
assert(nowDefinedSyms contains tree.symbol, i"undefined symbol ${tree.symbol}")

/** assert Java classes are not used as objects */
def assertIdentNotJavaClass(tree: Tree)(implicit ctx: Context): Unit = tree match {
case _ : untpd.Ident =>
assert(!tree.symbol.is(JavaModule), "Java class can't be used as value: " + tree)
case _ =>
}

/** check Java classes are not used as objects */
def checkIdentNotJavaClass(tree: Tree)(implicit ctx: Context): Unit = tree match {
// case tree: untpd.Ident =>
// case tree: untpd.Select =>
// case tree: untpd.SelectFromTypeTree =>
// case tree: untpd.Bind =>
case vd : ValDef =>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I keep the unchecked cases as comments to make it explicit what cases are ignored, in order to facilitate code maintenance. I'm not sure if it's a good style.

assertIdentNotJavaClass(vd.forceIfLazy)
case dd : DefDef =>
assertIdentNotJavaClass(dd.forceIfLazy)
// case tree: untpd.TypeDef =>
case Apply(fun, args) =>
assertIdentNotJavaClass(fun)
args.foreach(assertIdentNotJavaClass _)
// case tree: untpd.This =>
// case tree: untpd.Literal =>
// case tree: untpd.New =>
case Pair(left, right) =>
assertIdentNotJavaClass(left)
assertIdentNotJavaClass(right)
case Typed(expr, _) =>
assertIdentNotJavaClass(expr)
case NamedArg(_, arg) =>
assertIdentNotJavaClass(arg)
case Assign(_, rhs) =>
assertIdentNotJavaClass(rhs)
case Block(stats, expr) =>
stats.foreach(assertIdentNotJavaClass _)
assertIdentNotJavaClass(expr)
case If(_, thenp, elsep) =>
assertIdentNotJavaClass(thenp)
assertIdentNotJavaClass(elsep)
// case tree: untpd.Closure =>
case Match(selector, cases) =>
assertIdentNotJavaClass(selector)
cases.foreach(caseDef => assertIdentNotJavaClass(caseDef.body))
case Return(expr, _) =>
assertIdentNotJavaClass(expr)
case Try(expr, cases, finalizer) =>
assertIdentNotJavaClass(expr)
cases.foreach(caseDef => assertIdentNotJavaClass(caseDef.body))
assertIdentNotJavaClass(finalizer)
// case tree: TypeApply =>
// case tree: Super =>
case SeqLiteral(elems, _) =>
elems.foreach(assertIdentNotJavaClass)
// case tree: TypeTree =>
// case tree: SingletonTypeTree =>
// case tree: AndTypeTree =>
// case tree: OrTypeTree =>
// case tree: RefinedTypeTree =>
// case tree: AppliedTypeTree =>
// case tree: ByNameTypeTree =>
// case tree: TypeBoundsTree =>
// case tree: Alternative =>
// case tree: PackageDef =>
case Annotated(_, arg) =>
assertIdentNotJavaClass(arg)
case _ =>
}

override def typed(tree: untpd.Tree, pt: Type = WildcardType)(implicit ctx: Context): tpd.Tree = {
val tpdTree = super.typed(tree)
checkIdentNotJavaClass(tpdTree)
tpdTree
}

override def typedUnadapted(tree: untpd.Tree, pt: Type)(implicit ctx: Context): tpd.Tree = {
val res = tree match {
case _: untpd.UnApply =>
Expand Down