Use scala.runtime.Nothing$/Null$ instead of sca...

Use scala.runtime.Nothing$/Null$ instead of scala.Nothing$/Null$. The
latter should be removed after bootstrapping

7 files changed, 60 insertions, 5 deletions

diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
index 272d8c7d75..610ee01106 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -1266,8 +1266,8 @@ abstract class GenJVM extends SubComponent {
      * </p>
      * <p>
      *   Special handling: scala.Nothing and <code>scala.Null</code> are
-     *   <em>erased</em> to <code>scala.Nothing$</code> and
-     *   </code>scala.Null$</code>. This is needed because they are
+     *   <em>erased</em> to <code>scala.runtime.Nothing$</code> and
+     *   </code>scala.runtime.Null$</code>. This is needed because they are
      *   not real classes, and they mean 'abrupt termination upon evaluation
      *   of that expression' or <code>null</code> respectively. This handling is
      *   done already in <a href="../icode/GenIcode.html" target="contentFrame">
@@ -1282,9 +1282,9 @@ abstract class GenJVM extends SubComponent {
                         !sym.hasFlag(Flags.JAVA)) "$" else "";
 
       if (sym == definitions.AllClass)
-        return "scala.Nothing$"
+        return "scala.runtime.Nothing$"
       else if (sym == definitions.AllRefClass)
-        return "scala.Null$"
+        return "scala.runtime.Null$"
 
       if (sym.isClass && !sym.rawowner.isPackageClass)
         innerClasses = innerClasses + sym;
diff --git a/src/library/scala/All$.scala b/src/library/scala/All$.scala
index 6c71dd5ce6..cab25048c2 100644
--- a/src/library/scala/All$.scala
+++ b/src/library/scala/All$.scala
@@ -13,6 +13,10 @@ package scala
 
 
 /**
+ * @deprecated <i>To be removed at some time in the future. Kept only for
+ * backward compatibility. Newly compiled code will refer to
+ * <code>scala.runtime.Nothing$</code></i>
+ *
  * Dummy class which exist only to satisfy the JVM. It corresponds
  * to <code>scala.All</code>. If such type appears in method
  * signatures, it is erased to this one.
diff --git a/src/library/scala/AllRef$.scala b/src/library/scala/AllRef$.scala
index f45de212ff..b6280fd96a 100644
--- a/src/library/scala/AllRef$.scala
+++ b/src/library/scala/AllRef$.scala
@@ -13,10 +13,13 @@ package scala
 
 
 /**
+ * @deprecated <i>To be removed at some time in the future. Kept only for
+ * backward compatibility. Newly compiled code will refer to
+ * <code>scala.runtime.Null$</code></i>
+ *
  * Dummy class which exist only to satisfy the JVM. It corresponds
  * to <code>scala.AllRef</code>. If such type appears in method
  * signatures, it is erased to this one.
  */
 
-/** to be removed after new starr */
 sealed abstract class AllRef$
diff --git a/src/library/scala/Nothing$.scala b/src/library/scala/Nothing$.scala
index 51a16361e9..680f044c52 100644
--- a/src/library/scala/Nothing$.scala
+++ b/src/library/scala/Nothing$.scala
@@ -12,6 +12,9 @@
 package scala
 
 
+//!!! TO BE REMOVED AFTER BOOTSTRAPPING !!!
+
+
 /**
  * Dummy class which exist only to satisfy the JVM. It corresponds
  * to <code>scala.Nothing</code>. If such type appears in method
diff --git a/src/library/scala/Null$.scala b/src/library/scala/Null$.scala
index 6ede96473f..6870558897 100644
--- a/src/library/scala/Null$.scala
+++ b/src/library/scala/Null$.scala
@@ -12,6 +12,9 @@
 package scala
 
 
+//!!! TO BE REMOVED AFTER BOOTSTRAPPING !!!
+
+
 /**
  * Dummy class which exist only to satisfy the JVM. It corresponds
  * to <code>scala.Null</code>. If such type appears in method
diff --git a/src/library/scala/runtime/Nothing$.scala b/src/library/scala/runtime/Nothing$.scala
new file mode 100644
index 0000000000..c101637ff7
--- /dev/null
+++ b/src/library/scala/runtime/Nothing$.scala
@@ -0,0 +1,21 @@
+/*                     __                                               *\
+**     ________ ___   / /  ___     Scala API                            **
+**    / __/ __// _ | / /  / _ |    (c) 2003-2006, LAMP/EPFL             **
+**  __\ \/ /__/ __ |/ /__/ __ |                                         **
+** /____/\___/_/ |_/____/_/ | |                                         **
+**                          |/                                          **
+\*                                                                      */
+
+// $Id$
+
+
+package scala.runtime
+
+
+/**
+ * Dummy class which exist only to satisfy the JVM. It corresponds
+ * to <code>scala.Nothing</code>. If such type appears in method
+ * signatures, it is erased to this one.
+ */
+
+sealed abstract class Nothing$
diff --git a/src/library/scala/runtime/Null$.scala b/src/library/scala/runtime/Null$.scala
new file mode 100644
index 0000000000..b27dd848e8
--- /dev/null
+++ b/src/library/scala/runtime/Null$.scala
@@ -0,0 +1,21 @@
+/*                     __                                               *\
+**     ________ ___   / /  ___     Scala API                            **
+**    / __/ __// _ | / /  / _ |    (c) 2003-2006, LAMP/EPFL             **
+**  __\ \/ /__/ __ |/ /__/ __ |                                         **
+** /____/\___/_/ |_/____/_/ | |                                         **
+**                          |/                                          **
+\*                                                                      */
+
+// $Id$
+
+
+package scala.runtime
+
+
+/**
+ * Dummy class which exist only to satisfy the JVM. It corresponds
+ * to <code>scala.Null</code>. If such type appears in method
+ * signatures, it is erased to this one.
+ */
+
+sealed abstract class Null$