diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/All$.scala (renamed from src/library/scala/AllRef$.java) | 6 | ||||
| -rw-r--r-- | src/library/scala/AllRef$.scala (renamed from src/library/scala/All$.java) | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 517059b31c..9409c73e68 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -94,7 +94,7 @@ abstract class GenJVM extends SubComponent { case _ => log("Could not find pickle information for " + sym); } - if (!jclass.getName().endsWith("$")) + if (!(jclass.getName().endsWith("$") && sym.isModuleClass)) addScalaAttr(if (isTopLevelModule(sym)) sym.sourceModule else sym); val outfile = getFile(jclass, ".class"); jclass.writeTo(outfile); diff --git a/src/library/scala/AllRef$.java b/src/library/scala/All$.scala index b0ef7468f9..5859adf6c9 100644 --- a/src/library/scala/AllRef$.java +++ b/src/library/scala/All$.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id$ +// $Id: All$.java 5880 2006-03-02 23:05:17Z mihaylov $ package scala; @@ -14,8 +14,8 @@ package scala; /** * Dummy class which exist only to satisfy the JVM. It corresponds - * to scala.AllRef. If such type appears in method + * to scala.All. If such type appears in method * signatures, it is erased to this one. */ -public class AllRef$ {} +sealed abstract class All$ diff --git a/src/library/scala/All$.java b/src/library/scala/AllRef$.scala index 68c119d288..15dc79930e 100644 --- a/src/library/scala/All$.java +++ b/src/library/scala/AllRef$.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id$ +// $Id: AllRef$.java 5880 2006-03-02 23:05:17Z mihaylov $ package scala; @@ -18,4 +18,4 @@ package scala; * signatures, it is erased to this one. */ -public class All$ {} +sealed abstract class AllRef$ |