Merged the dotnet-scala branch

5 files changed, 11 insertions, 15 deletions

diff --git a/src/library/scala/Console.scala b/src/library/scala/Console.scala
index 3c075e8193..488e091390 100644
--- a/src/library/scala/Console.scala
+++ b/src/library/scala/Console.scala
@@ -204,7 +204,7 @@ object Console {
    */
   def readLine(text: String, args: Any*): String = {
     format(text, args: _*)
-    in.readLine()
+    readLine
   }
 
 
@@ -212,7 +212,7 @@ object Console {
    *
    *  @return the boolean value read from the terminal.
    */
-  def readBoolean: Boolean = in.readLine().toLowerCase() match {
+  def readBoolean: Boolean = readLine.toLowerCase() match {
     case "true" => true
     case "t" => true
     case "yes" => true
@@ -252,7 +252,7 @@ object Console {
    *  @return a list of all extracted values.
    */
   def readf(format: String): List[Any] =
-    textComponents(new MessageFormat(format).parse(in.readLine()))
+    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
diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala
index cff1c41238..bdd2846272 100644
--- a/src/library/scala/Enumeration.scala
+++ b/src/library/scala/Enumeration.scala
@@ -45,7 +45,7 @@ abstract class Enumeration(initial: Int, names: String*) {
   def this(names: String*) = this(0, names: _*)
 
   def name = {
-    val cname = compat.Platform.getClassName(this)
+    val cname = this.getClass().getName()
     if (cname.endsWith("$"))
       cname.substring(0, cname.length() - 1)
     else if (cname.endsWith("$class"))
diff --git a/src/library/scala/compat/Platform.scala b/src/library/scala/compat/Platform.scala
index 028c9c8ab2..11e90a0789 100644
--- a/src/library/scala/compat/Platform.scala
+++ b/src/library/scala/compat/Platform.scala
@@ -26,15 +26,12 @@ object Platform {
   def createArray(elemClass: Class, length: Int): AnyRef =
     java.lang.reflect.Array.newInstance(elemClass, length)
 
-  def getClass(obj: AnyRef) = obj.getClass()
-  def getClassName(obj: AnyRef) = obj.getClass().getName()
-  def getName(cls: Class) = cls.getName()
-  def getElementClass(obj: AnyRef) = obj.getClass().getComponentType()
   def getClassForName(name: String): Class = java.lang.Class.forName(name)
 
   val EOL = System.getProperty("line.separator", "\n")
 
   def currentTime: Long = System.currentTimeMillis()
+
   def collectGarbage: Unit = System.gc()
 
 }
diff --git a/src/library/scala/runtime/BoxedObjectArray.scala b/src/library/scala/runtime/BoxedObjectArray.scala
index 98f58ea92c..e60cf7f585 100644
--- a/src/library/scala/runtime/BoxedObjectArray.scala
+++ b/src/library/scala/runtime/BoxedObjectArray.scala
@@ -13,7 +13,7 @@ package scala.runtime
 
 
 import Predef.Class
-import compat.Platform.{createArray, getElementClass}
+import compat.Platform.createArray
 
 [serializable]
 final class BoxedObjectArray(val value: Array[AnyRef]) extends BoxedArray {
@@ -36,7 +36,7 @@ final class BoxedObjectArray(val value: Array[AnyRef]) extends BoxedArray {
   override def hashCode(): Int = value.hashCode()
 
   private def create(length: Int): Array[AnyRef] = {
-    createArray(getElementClass(value), length).asInstanceOf[Array[AnyRef]]
+    createArray(value.getClass().getComponentType(), length).asInstanceOf[Array[AnyRef]]
   }
 
   override def subArray(start: Int, end: Int): Array[AnyRef] = {
diff --git a/src/library/scala/util/automata/BaseBerrySethi.scala b/src/library/scala/util/automata/BaseBerrySethi.scala
index 7a7a6c642f..2d590a0edf 100644
--- a/src/library/scala/util/automata/BaseBerrySethi.scala
+++ b/src/library/scala/util/automata/BaseBerrySethi.scala
@@ -16,7 +16,6 @@ import scala.util.regexp.Base
 
 import scala.collection.mutable
 import scala.collection.immutable
-import compat.Platform
 
 /** this turns a regexp over A into a NondetWorkAutom over A using the
  *  celebrated position automata construction (also called Berry-Sethi or
@@ -64,7 +63,7 @@ abstract class BaseBerrySethi {
       tmp
     case Star(t) => compFirst(t)
     case _ =>
-      throw new IllegalArgumentException("unexpected pattern " + Platform.getClass(r))
+      throw new IllegalArgumentException("unexpected pattern " + r.getClass())
   }
 
   /** computes last( r ) for the regexp r */
@@ -89,7 +88,7 @@ abstract class BaseBerrySethi {
       tmp
     case Star(t)  => compLast(t)
     case _        =>
-      throw new IllegalArgumentException("unexpected pattern " + Platform.getClass(r))
+      throw new IllegalArgumentException("unexpected pattern " + r.getClass())
   }
 
   /** Starts from the right-to-left
@@ -170,7 +169,7 @@ abstract class BaseBerrySethi {
         first
 
       case _ =>
-        throw new IllegalArgumentException("unexpected pattern: " + Platform.getClass(r))
+        throw new IllegalArgumentException("unexpected pattern: " + r.getClass())
     }
   }
 
@@ -193,7 +192,7 @@ abstract class BaseBerrySethi {
     case Star(t) =>
       traverse(t)
     case _ =>
-      throw new IllegalArgumentException("unexp pattern " + Platform.getClass(r))
+      throw new IllegalArgumentException("unexp pattern " + r.getClass())
   }
 
 }