Contents of scala.Math moved into scala.math pa...

Contents of scala.Math moved into scala.math package object, and
scala.Math deprecated. Also a couple janitorial cleanups.

5 files changed, 8 insertions, 21 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/Types.scala b/src/compiler/scala/tools/nsc/symtab/Types.scala
index 5d2d85c83d..a68f766c9c 100644
--- a/src/compiler/scala/tools/nsc/symtab/Types.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Types.scala
@@ -2338,10 +2338,6 @@ A type's typeSymbol should never be inspected directly.
     if (phase.erasedTypes)
       if (parents.isEmpty) ObjectClass.tpe else parents.head
     else {
-      // having $anonfun as owner causes the pickler to break upon unpickling; see ticket #2323
-      // martin: I disabled this patch, replacing it with a fix in Pickler.
-      //val nonAnonOwner = (owner.ownerChain dropWhile (_.isAnonymousFunction)).headOption getOrElse NoSymbol
-      //val clazz = nonAnonOwner.newRefinementClass(NoPosition)
       val clazz = owner.newRefinementClass(NoPosition)
       val result = refinementOfClass(clazz, parents, decls)
       clazz.setInfo(result)
diff --git a/src/library/scala/Math.scala b/src/library/scala/math/package.scala
index c3e619594b..51c657893b 100644
--- a/src/library/scala/Math.scala
+++ b/src/library/scala/math/package.scala
@@ -1,22 +1,19 @@
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
+**    / __/ __// _ | / /  / _ |    (c) 2003-2009, LAMP/EPFL             **
 **  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
 \*                                                                      */
 
-// $Id$
-
-
 package scala
 
-/** The object <code>Math</code> contains methods for performing basic numeric
+/** The package object <code>scala.math</code> contains methods for performing basic numeric
  *  operations such as the elementary exponential, logarithm, square root, and
  *  trigonometric functions.
  */
-object Math {
 
+package object math {
   /** The smallest possible value for <a href="Byte.html" target="_self">scala.Byte</a>. */
   val MIN_BYTE   = java.lang.Byte.MIN_VALUE
   /** The greatest possible value for <a href="Byte.html" target="_self">scala.Byte</a>. */
@@ -199,4 +196,4 @@ object Math {
   // def hypot(x: Double, y: Double): Double = java.lang.Math.hypot(x, y)
   // def expm1(x: Double): Double = java.lang.Math.expm1(x)
   // def log1p(x: Double): Double = java.lang.Math.log1p(x)
-}
+}
\ No newline at end of file
diff --git a/src/library/scala/package.scala b/src/library/scala/package.scala
index 7c25757e57..ebc959a16b 100644
--- a/src/library/scala/package.scala
+++ b/src/library/scala/package.scala
@@ -71,6 +71,9 @@ package object scala {
 
   // Numeric types which were moved into scala.math.*
 
+  @deprecated("use scala.math package instead")
+  val Math = scala.math.`package`
+
   type BigDecimal = scala.math.BigDecimal
   val BigDecimal = scala.math.BigDecimal
 
diff --git a/src/library/scala/util/parsing/combinator/Parsers.scala b/src/library/scala/util/parsing/combinator/Parsers.scala
index b2c72153fe..9943ed68a9 100644
--- a/src/library/scala/util/parsing/combinator/Parsers.scala
+++ b/src/library/scala/util/parsing/combinator/Parsers.scala
@@ -153,9 +153,7 @@ trait Parsers {
 
     def get: Nothing = error("No result when parsing failed")
   }
-  /** An extractor so NoSuccess(msg, next) can be used in matches
-   *  Note: case class inheritance is currently sketchy and may be
-   *  deprecated, so an explicit extractor is better.
+  /** An extractor so NoSuccess(msg, next) can be used in matches.
    */
   object NoSuccess {
     def unapply[T](x: ParseResult[T]) = x match {
diff --git a/test/pending/pos/t2636.scala b/test/pending/pos/t2636.scala
deleted file mode 100644
index 4e6ffb4930..0000000000
--- a/test/pending/pos/t2636.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-object o {
-  val props = new scala.collection.mutable.ListBuffer[(String,String)]
-  lazy val property = new {
-    def update(propName: String, p: String) = props += ((propName, p))
-  }
-  def crash = property("a") = "b"
-}
\ No newline at end of file