diff options
author | mihaylov <mihaylov@epfl.ch> | 2006-11-14 17:29:59 +0000 |
---|---|---|
committer | mihaylov <mihaylov@epfl.ch> | 2006-11-14 17:29:59 +0000 |
commit | 1ef41016b0a5f83d657de80f0b0492493f3f717a (patch) | |
tree | f650bfa5c83aeb0a0d835f5b2d1beb4a1cf9a344 | |
parent | 17c14587cb67eaed4e9e3fe7387d944d3d1a0e8f (diff) | |
download | scala-1ef41016b0a5f83d657de80f0b0492493f3f717a.tar.gz scala-1ef41016b0a5f83d657de80f0b0492493f3f717a.tar.bz2 scala-1ef41016b0a5f83d657de80f0b0492493f3f717a.zip |
Resurrected All & AllRef as aliases in Predef
-rw-r--r-- | src/library/scala/All$.scala | 10 | ||||
-rw-r--r-- | src/library/scala/AllRef$.scala | 10 | ||||
-rw-r--r-- | src/library/scala/Predef.scala | 3 |
3 files changed, 13 insertions, 10 deletions
diff --git a/src/library/scala/All$.scala b/src/library/scala/All$.scala index cab25048c2..6b9e88af85 100644 --- a/src/library/scala/All$.scala +++ b/src/library/scala/All$.scala @@ -6,20 +6,20 @@ ** |/ ** \* */ -// $Id: All$.java 5880 2006-03-02 23:05:17Z mihaylov $ +// $Id$ 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. + * + * @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> */ /** to be removed after new starr */ diff --git a/src/library/scala/AllRef$.scala b/src/library/scala/AllRef$.scala index b6280fd96a..b0dc552b05 100644 --- a/src/library/scala/AllRef$.scala +++ b/src/library/scala/AllRef$.scala @@ -6,20 +6,20 @@ ** |/ ** \* */ -// $Id: AllRef$.java 5880 2006-03-02 23:05:17Z mihaylov $ +// $Id$ 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. + * + * @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> */ sealed abstract class AllRef$ diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index 72632ff0f6..c20c968277 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -35,6 +35,9 @@ object Predef { type boolean = scala.Boolean type unit = scala.Unit + type All = Nothing + type AllRef = Null + type String = java.lang.String type Class = java.lang.Class |