diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-01-07 08:58:53 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-01-26 15:41:07 +0100 |
| commit | eb4b06544a4362231357686c39beef9dbe00d932 (patch) | |
| tree | 20533826a3ab198915ccba546c0ca6ab18fe7841 /src/reflect/scala/reflect/runtime/JavaMirrors.scala | |
| parent | 3813d75fa8c83a593859919f5979a1a217e8da44 (diff) | |
| download | scala-eb4b06544a4362231357686c39beef9dbe00d932.tar.gz scala-eb4b06544a4362231357686c39beef9dbe00d932.tar.bz2 scala-eb4b06544a4362231357686c39beef9dbe00d932.zip | |
Wider use of isTopLevel
Diffstat (limited to 'src/reflect/scala/reflect/runtime/JavaMirrors.scala')
| -rw-r--r-- | src/reflect/scala/reflect/runtime/JavaMirrors.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/reflect/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala index cdb9e7159c..2bffe398f6 100644 --- a/src/reflect/scala/reflect/runtime/JavaMirrors.scala +++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala @@ -507,7 +507,7 @@ private[reflect] trait JavaMirrors extends internal.SymbolTable with api.JavaUni def erasure = symbol.moduleClass.asClass def isStatic = true def instance = { - if (symbol.owner.isPackageClass) + if (symbol.isTopLevel) staticSingletonInstance(classLoader, symbol.fullName) else if (outer == null) staticSingletonInstance(classToJava(symbol.moduleClass.asClass)) @@ -1156,11 +1156,11 @@ private[reflect] trait JavaMirrors extends internal.SymbolTable with api.JavaUni valueClassToJavaType(clazz) else if (clazz == ArrayClass) noClass - else if (clazz.owner.isPackageClass) + else if (clazz.isTopLevel) javaClass(clazz.javaClassName) else if (clazz.owner.isClass) { val childOfClass = !clazz.owner.isModuleClass - val childOfTopLevel = clazz.owner.owner.isPackageClass + val childOfTopLevel = clazz.owner.isTopLevel val childOfTopLevelObject = clazz.owner.isModuleClass && childOfTopLevel // suggested in https://issues.scala-lang.org/browse/SI-4023?focusedCommentId=54759#comment-54759 |