diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/ModelAdditions.scala | 44 | ||||
-rw-r--r-- | src/jvm14-library/scala/Console.scala | 350 | ||||
-rw-r--r-- | src/jvm14-library/scala/runtime/RichString.scala | 22 | ||||
-rw-r--r-- | src/library/scala/Console.scala | 11 | ||||
-rw-r--r-- | src/library/scala/runtime/RichString.scala | 22 |
5 files changed, 72 insertions, 377 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/ModelAdditions.scala b/src/compiler/scala/tools/nsc/doc/ModelAdditions.scala index a8fc073e99..0a373c509a 100644 --- a/src/compiler/scala/tools/nsc/doc/ModelAdditions.scala +++ b/src/compiler/scala/tools/nsc/doc/ModelAdditions.scala @@ -68,32 +68,32 @@ class ModelAdditions(val global: Global) { <a href="AnyVal.html"><code>AnyVal</code></a>. </p>""" - addition(Object_isInstanceOf); - comments(Object_isInstanceOf) = """ + addition(Any_==); + comments(Any_==) = """ <p> - The method <code>isInstanceOf</code> is the pendant of the Java - operator <code>instanceof</code>. + <code> o1 == o2</code> is the same as <code>o1.equals(o2)</code>. </p> - @see <ul><li>Java Language Specification (2<sup>nd</sup> Ed.): - <a href="http://java.sun.com/docs/books/jls/second_edition/html/expressions.doc.html#80289" - target="_top">Operator <code>instanceof</code></a>.</li></ul> """ - addition(Object_synchronized); - comments(Object_synchronized) = """ - <p> - To make your programs thread-safe, you must first identify what - data will be shared across threads. If you are writing data that - may be read later by another thread, or reading data that may - have been written by another thread, then that data is shared, - and you must synchronize when accessing it. - </p> - @see <ul><li>The Java Tutorials: - <a href="http://java.sun.com/docs/books/tutorial/essential/concurrency/sync.html" - target="_top">Synchronization</a>.</li> - <li> IBM developerWorks: - <a href="http://www-128.ibm.com/developerworks/java/library/j-threads1.html" - target="_top">Synchronization is not the enemy</a>.</li></ul> + addition(Any_!=); + comments(Any_!=) = """ + <p> + <code> o1 != o2</code> is the same as <code>!(o1.equals(o2))</code>. + </p> + """ + + addition(Any_toString); + comments(Any_toString) = """ + <p> + Returns a string representation of the object. + </p> + """ + + addition(Any_hashCode); + comments(Any_hashCode) = """ + <p> + Returns a hash code value for the object. + </p> """ addition(AnyRefClass); diff --git a/src/jvm14-library/scala/Console.scala b/src/jvm14-library/scala/Console.scala deleted file mode 100644 index 0562ec8de1..0000000000 --- a/src/jvm14-library/scala/Console.scala +++ /dev/null @@ -1,350 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2007, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - - -package scala - -import java.io.{BufferedReader, InputStream, InputStreamReader, - OutputStream, PrintStream, Reader} -import java.text.MessageFormat - -import scala.util.DynamicVariable -import Predef._ - - -/** The <code>Console</code> object implements functionality for - * printing Scala values on the terminal. There are also functions - * for reading specific values. <code>Console</code> also defines - * constants for marking up text on ANSI terminals. - * - * @author Matthias Zenger - * @version 1.0, 03/09/2003 - */ -object Console { - - // ANSI colors foreground - final val BLACK = "\033[30m" - final val RED = "\033[31m" - final val GREEN = "\033[32m" - final val YELLOW = "\033[33m" - final val BLUE = "\033[34m" - final val MAGENTA = "\033[35m" - final val CYAN = "\033[36m" - final val WHITE = "\033[37m" - - // ANSI colors background - final val BLACK_B = "\033[40m" - final val RED_B = "\033[41m" - final val GREEN_B = "\033[42m" - final val YELLOW_B = "\033[43m" - final val BLUE_B = "\033[44m" - final val MAGENTA_B = "\033[45m" - final val CYAN_B = "\033[46m" - final val WHITE_B = "\033[47m" - - // ANSI styles - final val RESET = "\033[0m" - final val BOLD = "\033[1m" - final val UNDERLINED = "\033[4m" - final val BLINK = "\033[5m" - final val REVERSED = "\033[7m" - final val INVISIBLE = "\033[8m" - - private val outVar = new DynamicVariable[PrintStream](java.lang.System.out) - private val inVar = new DynamicVariable[BufferedReader]( - new BufferedReader(new InputStreamReader(java.lang.System.in))) - - def out = outVar.value - def in = inVar.value - - val err = java.lang.System.err - - /** Set the default output stream. - * - * @param out the new output stream. - */ - def setOut(out: PrintStream) { outVar.value = out } - - /** Set the default output stream for the duration - * of execution of one thunk. - * - * @param out the new output stream. - * @param thunk the code to execute with - * the new output stream active - * @return ... - */ - def withOut[T](out: PrintStream)(thunk: =>T): T = - outVar.withValue(out)(thunk) - - /** Set the default output stream. - * - * @param@ out the new output stream. - */ - def setOut(out: OutputStream): Unit = - setOut(new PrintStream(out)) - - /** Set the default output stream for the duration - * of execution of one thunk. - * - * @param out the new output stream. - * @param thunk the code to execute with - * the new output stream active - * @return ... - */ - def withOut[T](out: OutputStream)(thunk: =>T): T = - withOut(new PrintStream(out))(thunk) - - - /** Set the default input stream. - * - * @param reader specifies the new input stream. - */ - def setIn(reader: Reader): Unit = { - inVar.value = new BufferedReader(reader) - } - - /** Set the default input stream for the duration - * of execution of one thunk. - * - * @param in the new input stream. - * @param thunk the code to execute with - * the new input stream active - */ - def withIn[T](reader: Reader)(thunk: =>T): T = - inVar.withValue(new BufferedReader(reader))(thunk) - - - /** Set the default input stream. - * - * @param in the new input stream. - */ - def setIn(in: InputStream): Unit = - setIn(new InputStreamReader(in)) - - /** Set the default input stream for the duration - * of execution of one thunk. - * - * @param in the new input stream. - * @param thunk the code to execute with - * the new input stream active - */ - def withIn[T](in: InputStream)(thunk: =>T): T = - withIn(new InputStreamReader(in))(thunk) - - /** Print an object on the terminal. - * - * @param obj the object to print. - */ - def print(obj: Any): Unit = - out.print(if (null == obj) "null" else obj.toString()) - - /** Flush the output stream. This function is required when partial - * output (i.e. output not terminated by a new line character) has - * to be made visible on the terminal. - */ - def flush() { out.flush() } - - /** Print a new line character on the terminal. - */ - def println(): Unit = out.println() - - /** Print out an object followed by a new line character. - * - * @param x the object to print. - */ - def println(x: Any): Unit = out.println(x) - - /** <p> - * Prints its arguments as a formatted string, based on a string - * pattern (in a fashion similar to printf in C). - * </p> - * <p> - * The interpretation of the formatting patterns is described in - * <a href="" target="contentFrame" class="java/text/MessageFormat"> - * <code>java.text.MessageFormat</code></a>. - * </p> - * - * @param text the pattern for formatting the arguments. - * @param args the arguments used to instantiating the pattern. - * @throws java.lang.IllegalArgumentException - */ - def printf(text: String, args: Any*) { format(text, args: _*) } - - /** - * @see <a href="#printf(java.lang.String,scala.Any*)" - * target="contentFrame">Console.printf</a>. - */ - def format(text: String, args: Any*): Unit = - out.print( - if (text eq null) "null" - else MessageFormat.format(text, textParams(args)) - ) - - /** Read a full line from the terminal. Throws EOFException if the end of the - * input stream has been reached. - * - * @return the string read from the terminal. - * @throws java.io.EOFException - */ - def readLine(): String = { - val s = in.readLine() - if (s == null) throw new java.io.EOFException("Console has reached end of input") else s - } - - /** Print a formatted text and read a full line from the terminal - * - * @param text the format of the text to print out. - * @param args the parameters used to instantiate the format. - * @return the string read from the terminal. - */ - def readLine(text: String, args: Any*): String = { - format(text, args: _*) - readLine() - } - - - /** Read a boolean value from the terminal. - * - * @return the boolean value read from the terminal. - */ - def readBoolean(): Boolean = readLine().toLowerCase() match { - case "true" => true - case "t" => true - case "yes" => true - case "y" => true - case _ => false - } - - /** Read a byte value from the terminal. - */ - def readByte(): Byte = readLine().toByte - - /** Read a short value from the terminal. - */ - def readShort(): Short = readLine().toShort - - /** Read a char value from the terminal. - */ - def readChar(): Char = readLine() charAt 0 - - /** Read an int value from the terminal. - */ - def readInt(): Int = readLine().toInt - - /** Read an int value from the terminal. - */ - def readLong(): Long = readLine().toLong - - /** Read a float value from the terminal. - */ - def readFloat(): Float = readLine().toFloat - - /** Read a double value from the terminal. - */ - def readDouble(): Double = readLine().toDouble - - /** Read in some structured input, specified by a format specifier. - * See class <code>java.text.MessageFormat</code> for details of - * the format specification. - * - * @param format the format of the input. - * @return a list of all extracted values. - */ - def readf(format: String): List[Any] = - textComponents(new MessageFormat(format).parse(readLine())) - - /** Read in some structured input, specified by a format specifier. - * Opposed to <code>readf</code>, this function only returns the - * first value extracted from the input according to the format - * specification. - * - * @param format ... - * @return ... - */ - def readf1(format: String): Any = readf(format).head - - /** Read in some structured input, specified by a format specifier. - * Opposed to <code>readf</code>, this function only returns the - * first two values extracted from the input according to the format - * specification. - * - * @param format ... - * @return ... - */ - def readf2(format: String): (Any, Any) = { - val res = readf(format) - (res.head, res.tail.head) - } - - /** Read in some structured input, specified by a format specifier. - * Opposed to <code>readf</code>, this function only returns the - * first three values extracted from the input according to the format - * specification. - * - * @param format ... - * @return ... - */ - def readf3(format: String): (Any, Any, Any) = { - val res = readf(format) - (res.head, res.tail.head, res.tail.tail.head) - } - - private def textComponents(a: Array[AnyRef]): List[Any] = { - var i: Int = a.length - 1 - var res: List[Any] = Nil - while (i >= 0) { - res = (a(i) match { - case x: java.lang.Boolean => x.booleanValue() - case x: java.lang.Byte => x.byteValue() - case x: java.lang.Short => x.shortValue() - case x: java.lang.Character => x.charValue() - case x: java.lang.Integer => x.intValue() - case x: java.lang.Long => x.longValue() - case x: java.lang.Float => x.floatValue() - case x: java.lang.Double => x.doubleValue() - case x => x - }) :: res; - i -= 1 - } - res - } - - private def textParams(s: Seq[Any]): Array[AnyRef] = { - val res = new Array[AnyRef](s.length) - var i: Int = 0 - val iter = s.elements - while (iter.hasNext) { - res(i) = iter.next match { - case x: Boolean => java.lang.Boolean.valueOf(x) - /** Should use java.lang.Byte.valueOf(Byte), but only available - * in Java 1.5 and above. */ - case x: Byte => new java.lang.Byte(x) - /** Should use java.lang.Short.valueOf(Short), but only available - * in Java 1.5 and above. */ - case x: Short => new java.lang.Short(x) - /** Should use java.lang.Character.valueOf(Char), but only available - * in Java 1.5 and above. */ - case x: Char => new java.lang.Character(x) - /** Should use java.lang.Integer.valueOf(Int), but only available - * in Java 1.5 and above. */ - case x: Int => new java.lang.Integer(x) - /** Should use java.lang.Long.valueOf(Long), but only available - * in Java 1.5 and above. */ - case x: Long => new java.lang.Long(x) - case x: Float => new java.lang.Float(x) - case x: Double => new java.lang.Double(x) - case x: Unit => "()" - case x: AnyRef => x - } - i += 1 - } - res - } -} diff --git a/src/jvm14-library/scala/runtime/RichString.scala b/src/jvm14-library/scala/runtime/RichString.scala index 2496ddc64b..f38b79cc92 100644 --- a/src/jvm14-library/scala/runtime/RichString.scala +++ b/src/jvm14-library/scala/runtime/RichString.scala @@ -224,6 +224,28 @@ final class RichString(val self: String) extends Proxy with RandomAccessSeq[Char self.getChars(0, length, result, 0) result } + + + /** <p> + * Uses the underlying string as a pattern (in a fashion similar to + * printf in C), and uses the supplied arguments to fill in the + * holes. Only works on Java 1.5 or higher! + * </p> + * <p> + * The interpretation of the formatting patterns is described in + * <a href="" target="contentFrame" class="java/util/Formatter"> + * <code>java.util.Formatter</code></a>. + * </p> + * + * @param args the arguments used to instantiating the pattern. + * @throws java.lang.IllegalArgumentException + */ + def format(args : Any*) : String = { + val m = classOf[String].getDeclaredMethod("format", classOf[String], classOf[Array[Object]]) + m.invoke(null, self, + args.asInstanceOf[scala.runtime.BoxedObjectArray]. + unbox(args.getClass).asInstanceOf[Array[Object]]).asInstanceOf[String] + } } object RichString { diff --git a/src/library/scala/Console.scala b/src/library/scala/Console.scala index 6136c25bc7..6e122f450e 100644 --- a/src/library/scala/Console.scala +++ b/src/library/scala/Console.scala @@ -175,16 +175,17 @@ object Console { * @param args the arguments used to instantiating the pattern. * @throws java.lang.IllegalArgumentException */ - def printf(text: String, args: Any*) { format(text, args: _*) } + 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> formatting, + * <code>RichString</code>'s <code>format</code> method. */ - def format(text: String, args: Any*): Unit = - if (text eq null) "null" else - out.printf(text, args.asInstanceOf[scala.runtime.BoxedObjectArray]. - unbox(args.getClass).asInstanceOf[Array[Object]] : _*) + @deprecated 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. diff --git a/src/library/scala/runtime/RichString.scala b/src/library/scala/runtime/RichString.scala index 412f2fd86c..ea4dd44e5f 100644 --- a/src/library/scala/runtime/RichString.scala +++ b/src/library/scala/runtime/RichString.scala @@ -220,6 +220,28 @@ final class RichString(val self: String) extends Proxy with RandomAccessSeq[Char self.getChars(0, length, result, 0) result } + + + /** <p> + * Uses the underlying string as a pattern (in a fashion similar to + * printf in C), and uses the supplied arguments to fill in the + * holes. Only works on Java 1.5 or higher! + * </p> + * <p> + * The interpretation of the formatting patterns is described in + * <a href="" target="contentFrame" class="java/util/Formatter"> + * <code>java.util.Formatter</code></a>. + * </p> + * + * @param args the arguments used to instantiating the pattern. + * @throws java.lang.IllegalArgumentException + */ + def format(args : Any*) : String = { + val m = classOf[String].getDeclaredMethod("format", classOf[String], classOf[Array[Object]]) + m.invoke(null, self, + args.asInstanceOf[scala.runtime.BoxedObjectArray]. + unbox(args.getClass).asInstanceOf[Array[Object]]).asInstanceOf[String] + } } object RichString { |