@@ -237,7 +237,7 @@ trait TypeKinds { self: ICodes =>
// override def maxType(other: TypeKind): TypeKind = other match {
// case STRING => STRING;
// case _ =>
- // abort("Uncomparbale type kinds: STRING with " + other);
+ // abort("Uncomparable type kinds: STRING with " + other);
// }
// }
@@ -263,7 +263,7 @@ trait TypeKinds { self: ICodes =>
case REFERENCE(_) | ARRAY(_) =>
REFERENCE(AnyRefClass)
case _ =>
- abort("Uncomparbale type kinds: REFERENCE with " + other)
+ abort("Uncomparable type kinds: REFERENCE with " + other)
}
/** Checks subtyping relationship. */
@@ -334,7 +334,7 @@ trait TypeKinds { self: ICodes =>
if (elem == elem2) ARRAY(elem)
else REFERENCE(AnyRefClass)
case _ =>
- abort("Uncomparbale type kinds: ARRAY with " + other)
+ abort("Uncomparable type kinds: ARRAY with " + other)
}
/** Array subtyping is covariant, as in Java. Necessary for checking
@@ -370,7 +370,7 @@ trait TypeKinds { self: ICodes =>
case REFERENCE(_) | ARRAY(_) | BOXED(_) =>
REFERENCE(AnyRefClass)
case _ =>
- abort("Uncomparbale type kinds: ARRAY with " + other)
+ abort("Uncomparable type kinds: ARRAY with " + other)
}
/** Checks subtyping relationship. */
@@ -409,7 +409,7 @@ trait TypeKinds { self: ICodes =>
case REFERENCE(_) =>
REFERENCE(AnyRefClass)
case _ =>
- abort("Uncomparbale type kinds: ConcatClass with " + other)
+ abort("Uncomparable type kinds: ConcatClass with " + other)
}
/** Checks subtyping relationship. */
src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala
@@ -213,17 +213,6 @@ object Console {
*/
def printf(text: String, args: Any*) { out.print(text format (args : _*)) }
- /**
- * @see <a href="#printf(java.lang.String,scala.Any*)"
- * target="contentFrame">Console.printf</a>.
- */
- @deprecated("For console output, use <code>Console.printf</code>. For <code>String</code>\n"+
- "formatting, <code>StringOps</code>'s <code>format</code> method.")
- def format(text: String, args: Any*) {
- if (text eq null) out.printf("null")
- else out.print(text format (args : _*))
- }
-
/** Read a full line from the terminal. Returns <code>null</code> if the end of the
* input stream has been reached.
*
@@ -435,26 +424,4 @@ object Console {
}
res
}
-
- private def textParams(s: Seq[Any]): Array[AnyRef] = {
- val res = new Array[AnyRef](s.length)
- var i: Int = 0
- val iter = s.iterator
- while (iter.hasNext) {
- res(i) = iter.next match {
- case x: Boolean => java.lang.Boolean.valueOf(x)
- case x: Byte => java.lang.Byte.valueOf(x)
- case x: Short => java.lang.Short.valueOf(x)
- case x: Char => java.lang.Character.valueOf(x)
- case x: Int => java.lang.Integer.valueOf(x)
- case x: Long => java.lang.Long.valueOf(x)
- case x: Float => java.lang.Float.valueOf(x)
- case x: Double => java.lang.Double.valueOf(x)
- case x: Unit => "()"
- case x: AnyRef => x
- }
- i += 1
- }
- res
- }
}
src/library/scala/Console.scala
@@ -50,12 +50,6 @@ sealed abstract class Option[+A] extends Product {
*/
def get: A
- @deprecated("use <code>getOrElse</code> instead")
- def get[B >: A](default: B): B = this match {
- case None => default
- case Some(x) => x
- }
-
/** If the option is nonempty return its value,
* otherwise return the result of evaluating a default expression.
*
src/library/scala/Option.scala
@@ -38,11 +38,6 @@ object Predef extends LowPriorityImplicits {
@deprecated("lower-case type aliases will be removed") type boolean = scala.Boolean
@deprecated("lower-case type aliases will be removed") type unit = scala.Unit
- @deprecated("use <code>java.lang.Integer</code> instead")
- type Integer = java.lang.Integer
- @deprecated("use <code>java.lang.Character</code> instead")
- type Character = java.lang.Character
-
type String = java.lang.String
type Class[T] = java.lang.Class[T]
type Runnable = java.lang.Runnable
src/library/scala/Predef.scala
@@ -190,13 +190,6 @@ object Iterator {
xs.slice(start, start + length).iterator
/**
- * @param str the given string
- * @return the iterator on <code>str</code>
- */
- @deprecated("replaced by <code>str.iterator</code>")
- def fromString(str: String): Iterator[Char] = str.iterator
-
- /**
* @param n the product arity
* @return the iterator on <code>Product<n></code>.
*/
src/library/scala/collection/Iterator.scala
@@ -54,9 +54,5 @@ object Seq extends SeqFactory[Seq] {
@deprecated("use Seq(value) instead")
def singleton[A](value: A) = Seq(value)
-
- /** Builds a singleton sequence. */
- @deprecated("use <code>Seq(x)</code> instead.")
- def single[A](x: A) = singleton(x)
}
src/library/scala/collection/Seq.scala
@@ -616,15 +616,6 @@ trait SeqLike[+A, +Repr] extends IterableLike[A, Repr] { self =>
/** Returns index of the last element satisying a predicate, or -1. */
@deprecated("use `lastIndexWhere' instead")
def findLastIndexOf(p: A => Boolean): Int = lastIndexWhere(p)
-
- /** A sub-sequence starting at index <code>from</code>
- * and extending up to the length of the current sequence
- *
- * @param from The index of the first element of the slice
- * @throws IndexOutOfBoundsException if <code>from < 0</code>
- */
- @deprecated("use `drop' instead")
- def slice(from: Int): Seq[A] = toCollection(slice(from, length))
@deprecated("Should be replaced by <code>(s1, s2) forall { case (x, y) => f(x, y) }</code>")
def equalsWith[B](that: Seq[B])(f: (A,B) => Boolean): Boolean = {
src/library/scala/collection/SeqLike.scala
@@ -57,7 +57,6 @@ trait SeqProxyLike[+A, +This <: SeqLike[A, This] with Seq[A]] extends SeqLike[A,
override def view = self.view
override def view(from: Int, until: Int) = self.view(from, until)
override def findLastIndexOf(p: A => Boolean): Int = self.lastIndexWhere(p)
- override def slice(from: Int): Seq[A] = self.drop(from)
override def equalsWith[B](that: Seq[B])(f: (A,B) => Boolean): Boolean = (self zip that) forall { case (x,y) => f(x,y) }
override def containsSlice[B](that: Seq[B]): Boolean = self.indexOfSeq(that) != -1
}
src/library/scala/collection/SeqProxyLike.scala
@@ -656,26 +656,6 @@ object List extends SeqFactory[List] {
res
}
- /** Parses a string which contains substrings separated by a
- * separator character and returns a list of all substrings.
- *
- * @param str the string to parse
- * @param separator the separator character
- * @return the list of substrings
- */
- @deprecated("use `str.split(separator).toList' instead")
- def fromString(str: String, separator: Char): List[String] = {
- var words: List[String] = Nil
- var pos = str.length()
- while (pos > 0) {
- val pos1 = str.lastIndexOf(separator, pos - 1)
- if (pos1 + 1 < pos)
- words = str.substring(pos1 + 1, pos) :: words
- pos = pos1
- }
- words
- }
-
/** Returns the given string as a list of characters.
*
* @param str the string to convert.
src/library/scala/collection/immutable/List.scala
@@ -182,7 +182,7 @@ extends scala.collection.IndexedSeq[T]
/** the subsequence from index `start' up to the
* length of the current sequence.
*/
- override def slice(start: Int) = slice(start, UndeterminedEnd)
+ def slice(start: Int): PagedSeq[T] = slice(start, UndeterminedEnd)
/** Convert sequence to string */
override def toString = {
src/library/scala/collection/immutable/PagedSeq.scala
@@ -62,18 +62,7 @@ class SyncVar[A] {
isDefined = true
notifyAll()
}
-
- @deprecated("Will be removed in 2.8. SyncVar should not allow exception by design.")
- def setWithCatch(x: => A) = synchronized {
- try {
- this set x
- } catch {
- case e =>
- this setException e
- throw e
- }
- }
-
+
def put(x: A) = synchronized {
while (isDefined) wait()
set(x)
src/library/scala/concurrent/SyncVar.scala
@@ -15,12 +15,10 @@ package scala.ref
* @author Sean McDirmid
*/
trait Reference[+T <: AnyRef] extends Function0[T] {
- @deprecated("Use .get.isDefined instead")
- def isValid: Boolean
/** return the underlying value */
def apply(): T
/** return <code>Some</code> underlying if it hasn't been collected, otherwise <code>None</code> */
- def get : Option[T]
+ def get: Option[T]
override def toString = get.map(_.toString).getOrElse("<deleted>")
def clear(): Unit
def enqueue(): Boolean
src/library/scala/ref/Reference.scala
@@ -15,7 +15,6 @@ package scala.ref
*/
trait ReferenceWrapper[+T <: AnyRef] extends Reference[T] with Proxy {
val underlying: java.lang.ref.Reference[_ <: T]
- @deprecated("Use .get.isDefined instead") def isValid = underlying.get != null
override def get = {
val ret = underlying.get
if (ret eq null) None else Some(ret)
src/library/scala/ref/ReferenceWrapper.scala
@@ -16,9 +16,6 @@ package scala.util.parsing.input
*/
object CharArrayReader {
final val EofCh = '\032'
-
- @deprecated("This should probably be LF instead?")
- final val CR = '\015'
}
/** A character array reader reads a stream of characters (keeping track of their positions)
src/library/scala/util/parsing/input/CharArrayReader.scala
@@ -74,9 +74,6 @@ object Utility extends AnyRef with parsing.TokenTests
case _ => n
}
- @deprecated("a string might also be Atom(s) - define your own conversion")
- def view(s: String): Text = Text(s)
-
/**
* Escapes the characters < > & and " from string.
*
src/library/scala/xml/Utility.scala
@@ -125,10 +125,9 @@ class Worker(val fileManager: FileManager) extends Actor {
val classpath: List[URL] =
outDir.toURL ::
//List(file.getParentFile.toURL) :::
- List(latestCompFile.toURL, latestLibFile.toURL,
- latestActFile.toURL, latestPartestFile.toURL) :::
- (List.fromString(CLASSPATH, File.pathSeparatorChar) map { x =>
- (new File(x)).toURL })
+ List(latestCompFile.toURL, latestLibFile.toURL, latestActFile.toURL, latestPartestFile.toURL) :::
+ ((CLASSPATH split File.pathSeparatorChar).toList map (x => new File(x).toURL))
+
NestUI.verbose("ObjectRunner classpath: "+classpath)
try {
@@ -589,7 +588,7 @@ class Worker(val fileManager: FileManager) extends Actor {
"-d "+outDir.getCanonicalFile.getAbsolutePath+
" -Xresident"+
" -sourcepath "+sourcepath
- val argList = List.fromString(argString, ' ')
+ val argList = argString split ' ' toList
// configure input/output files
val logOut = new FileOutputStream(logFile)
@@ -610,7 +609,7 @@ class Worker(val fileManager: FileManager) extends Actor {
val resCompile = (line: String) => {
NestUI.verbose("compiling "+line)
- val cmdArgs = List.fromString(line, ' ') map { fs => new File(dir, fs).getAbsolutePath }
+ val cmdArgs = (line split ' ').toList map (fs => new File(dir, fs).getAbsolutePath)
NestUI.verbose("cmdArgs: "+cmdArgs)
val sett = new Settings(error)
sett.sourcepath.value = sourcepath
src/partest/scala/tools/partest/nest/Worker.scala
src/library/scala/concurrent/jolib.scala
src/library/scala/unsealed.scala
src/library/scala/util/parsing/input/CharArrayPosition.scala
b40769d7277753a5867310b35993dcf7845a7baa
extempore
extempore@5e8d7ff9-d8ef-0310-90f0-a4852d11357a
http://github.com/paulp/scala/commit/41ff1d920901046b89b92b464f0ce95e9fd78652
41ff1d920901046b89b92b464f0ce95e9fd78652
2009-11-12T13:39:12-08:00
2009-11-12T13:39:12-08:00
Removed everything deprecated in 2.7.3 or earlier except the
lower case primitive type aliases, plus associated fixes.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@19600 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
da8905e4ea48f248f3681a60c5a51d8a33eab38c
extempore
extempore@5e8d7ff9-d8ef-0310-90f0-a4852d11357a