diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2008-08-25 09:31:01 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2008-08-25 09:31:01 +0000 |
| commit | cd6ed4e12b272750bc7bf6f41e9d1bfe5f0cfc8a (patch) | |
| tree | d5333fadcb57c1b95a33da78da7a19693af03781 /src | |
| parent | 9a984e4e5a24dcaf11942ee96067fafff96ab762 (diff) | |
| download | scala-cd6ed4e12b272750bc7bf6f41e9d1bfe5f0cfc8a.tar.gz scala-cd6ed4e12b272750bc7bf6f41e9d1bfe5f0cfc8a.tar.bz2 scala-cd6ed4e12b272750bc7bf6f41e9d1bfe5f0cfc8a.zip | |
Fixed #1232 and #1167
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index b558c44945..680f973f19 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -471,8 +471,8 @@ abstract class GenJVM extends SubComponent { for (innerSym <- innerClasses.toList.sort(_.name.length < _.name.length)) { var outerName = javaName(innerSym.rawowner) // remove the trailing '$' - if (outerName.endsWith("$")) - outerName = outerName.substring(0, outerName.length - 1) + //if (outerName.endsWith("$")) + //outerName = outerName.substring(0, outerName.length - 1) innerClassesAttr.addEntry(javaName(innerSym), outerName, @@ -1558,8 +1558,9 @@ abstract class GenJVM extends SubComponent { else if (sym == definitions.NullClass) return "scala.runtime.Null$" - if (sym.isClass && !sym.rawowner.isPackageClass) + if (sym.isClass && !sym.rawowner.isPackageClass && !sym.isModuleClass) { innerClasses = innerClasses + sym; + } (if (sym.isClass || (sym.isModule && !sym.isMethod)) sym.fullNameString('/') |