diff options
author | michelou <michelou@epfl.ch> | 2007-07-09 11:11:29 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2007-07-09 11:11:29 +0000 |
commit | 887f9515f70ffe560b06cfdd32d1fadfc0ba9bb1 (patch) | |
tree | 10a963af1b901594bca2d32e15a306026bbea00e | |
parent | 819c89544ae936316b6142bbb236f9fd453c7e00 (diff) | |
download | scala-887f9515f70ffe560b06cfdd32d1fadfc0ba9bb1.tar.gz scala-887f9515f70ffe560b06cfdd32d1fadfc0ba9bb1.tar.bz2 scala-887f9515f70ffe560b06cfdd32d1fadfc0ba9bb1.zip |
added @deprecated annotation
-rw-r--r-- | src/library/scala/util/parsing/CharInputStreamIterator.scala | 21 | ||||
-rw-r--r-- | src/library/scala/util/parsing/Parsers.scala | 6 | ||||
-rw-r--r-- | src/library/scala/util/parsing/SimpleTokenizer.scala | 10 |
3 files changed, 25 insertions, 12 deletions
diff --git a/src/library/scala/util/parsing/CharInputStreamIterator.scala b/src/library/scala/util/parsing/CharInputStreamIterator.scala index 476bf45d18..b58650e025 100644 --- a/src/library/scala/util/parsing/CharInputStreamIterator.scala +++ b/src/library/scala/util/parsing/CharInputStreamIterator.scala @@ -19,28 +19,33 @@ import java.io.{IOException, EOFException} * * @author Burak Emir * @version 1.0 - * @deprecated use classes from scala.util.parsing.input instead + * + * @deprecated use classes from <a target="contentFrame" href="input.html"> + * <code>scala.util.parsing.input</code></a> instead. */ +@deprecated class CharInputStreamIterator(in: InputStream) extends Iterator[Char] { private var ch: Int = _ private var chSet = false private var error: IOException = null - private def lookahead(): Unit = try { - ch = in.read(); chSet = ch >= 0 - } catch { - case ex: EOFException => ch = -1 - case ex: IOException => ch = 1; error = ex + private def lookahead() { + try { + ch = in.read(); chSet = ch >= 0 + } catch { + case ex: EOFException => ch = -1 + case ex: IOException => ch = 1; error = ex + } } def hasNext: Boolean = { - if (!chSet) lookahead + if (!chSet) lookahead() chSet } def next(): Char = { - if (!chSet) lookahead + if (!chSet) lookahead() chSet = false ch.asInstanceOf[Char] } diff --git a/src/library/scala/util/parsing/Parsers.scala b/src/library/scala/util/parsing/Parsers.scala index cfd56b218a..9124c624ab 100644 --- a/src/library/scala/util/parsing/Parsers.scala +++ b/src/library/scala/util/parsing/Parsers.scala @@ -17,8 +17,12 @@ package scala.util.parsing * * @author Burak Emir * @version 1.0 - * @deprecated use scala.util.parsing.combinator.Parsers instead + * + * @deprecated use <a target="contentFrame" href="combinator/Parsers.html"> + * <code>scala.util.parsing.combinator.Parsers</code></a> + * instead. */ +@deprecated abstract class Parsers { type inputType diff --git a/src/library/scala/util/parsing/SimpleTokenizer.scala b/src/library/scala/util/parsing/SimpleTokenizer.scala index 5103e6897d..52e921f351 100644 --- a/src/library/scala/util/parsing/SimpleTokenizer.scala +++ b/src/library/scala/util/parsing/SimpleTokenizer.scala @@ -15,8 +15,12 @@ package scala.util.parsing * * @author Burak Emir * @version 1.0 - * @deprecated use scala.util.parsing.combinator.lexical.StdLexical instead + * + * @deprecated use <a target="contentFrame" href="combinator/lexical/StdLexical.html"> + * <code>scala.util.parsing.combinator.lexical.StdLexical</code></a> + * instead. */ +@deprecated class SimpleTokenizer(in: Iterator[Char], delimiters: String) extends Iterator[String] { private def max(x: Int, y: Char): Int = if (x > y) x else y @@ -26,7 +30,7 @@ class SimpleTokenizer(in: Iterator[Char], delimiters: String) extends Iterator[S private def delimArray: Array[Boolean] = { val ds = List.fromString(delimiters) val da = new Array[Boolean]((0 /: ds)(max) + 1) - for (ch <- ds) { da(ch) = true } + for (ch <- ds) da(ch) = true da } @@ -47,7 +51,7 @@ class SimpleTokenizer(in: Iterator[Char], delimiters: String) extends Iterator[S while (ch <= ' ' && ch != EOI) ch = nextChar() if (ch == EOI) "" else { - buf.setLength(0) + buf setLength 0 if (isDelimiter(ch)) { buf append ch.asInstanceOf[Char]; ch = nextChar() } else { |