diff options
| author | mihaylov <mihaylov@epfl.ch> | 2006-11-14 17:11:16 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2006-11-14 17:11:16 +0000 |
| commit | 17c14587cb67eaed4e9e3fe7387d944d3d1a0e8f (patch) | |
| tree | c14141b8e10b5fc02dcde2ef94f1043a4f076f44 /src/library | |
| parent | 25896b2d55b16cc6f0ccf4b890138db1ff0fe2e2 (diff) | |
| download | scala-17c14587cb67eaed4e9e3fe7387d944d3d1a0e8f.tar.gz scala-17c14587cb67eaed4e9e3fe7387d944d3d1a0e8f.tar.bz2 scala-17c14587cb67eaed4e9e3fe7387d944d3d1a0e8f.zip | |
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
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/All$.scala | 4 | ||||
| -rw-r--r-- | src/library/scala/AllRef$.scala | 5 | ||||
| -rw-r--r-- | src/library/scala/Nothing$.scala | 3 | ||||
| -rw-r--r-- | src/library/scala/Null$.scala | 3 | ||||
| -rw-r--r-- | src/library/scala/runtime/Nothing$.scala | 21 | ||||
| -rw-r--r-- | src/library/scala/runtime/Null$.scala | 21 |
6 files changed, 56 insertions, 1 deletions
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$ |