Moved a bunch of classes into the newly created...

Moved a bunch of classes into the newly created scala.math package.
Created compatibility aliases in the scala package object.

11 files changed, 34 insertions, 10 deletions

diff --git a/src/library/scala/BigDecimal.scala b/src/library/scala/math/BigDecimal.scala
index b43e4b2a04..677dfa7e17 100644
--- a/src/library/scala/BigDecimal.scala
+++ b/src/library/scala/math/BigDecimal.scala
@@ -8,7 +8,7 @@
 
 // $Id$
 
-package scala
+package scala.math
 
 import java.{ lang => jl }
 import java.math.{ MathContext, BigDecimal => BigDec }
diff --git a/src/library/scala/BigInt.scala b/src/library/scala/math/BigInt.scala
index 9ccd9663a7..5415a29489 100644
--- a/src/library/scala/BigInt.scala
+++ b/src/library/scala/math/BigInt.scala
@@ -9,7 +9,7 @@
 // $Id$
 
 
-package scala
+package scala.math
 
 import java.math.BigInteger
 import java.{ lang => jl }
diff --git a/src/library/scala/Equiv.scala b/src/library/scala/math/Equiv.scala
index a13530eb35..3cdee42ee7 100644
--- a/src/library/scala/Equiv.scala
+++ b/src/library/scala/math/Equiv.scala
@@ -9,7 +9,7 @@
 // $Id$
 
 
-package scala
+package scala.math
 
 /** <p>
  *    A trait for representing equivalence relations.  It is important to
diff --git a/src/library/scala/Fractional.scala b/src/library/scala/math/Fractional.scala
index 46899e5274..4c7c09fe73 100644
--- a/src/library/scala/Fractional.scala
+++ b/src/library/scala/math/Fractional.scala
@@ -9,7 +9,7 @@
 // $Id$
 
 
-package scala
+package scala.math
 
 /**
  * @since 2.8
diff --git a/src/library/scala/Integral.scala b/src/library/scala/math/Integral.scala
index 63d3ef989c..cdace45fb0 100644
--- a/src/library/scala/Integral.scala
+++ b/src/library/scala/math/Integral.scala
@@ -9,7 +9,7 @@
 // $Id$
 
 
-package scala
+package scala.math
 
 /**
  * @since 2.8
diff --git a/src/library/scala/Numeric.scala b/src/library/scala/math/Numeric.scala
index fa71df6383..4ecacc975b 100644
--- a/src/library/scala/Numeric.scala
+++ b/src/library/scala/math/Numeric.scala
@@ -9,7 +9,7 @@
 // $Id$
 
 
-package scala
+package scala.math
 
 /**
  * @since 2.8
diff --git a/src/library/scala/Ordered.scala b/src/library/scala/math/Ordered.scala
index 45e10b3a25..bd84b1a6a2 100644
--- a/src/library/scala/Ordered.scala
+++ b/src/library/scala/math/Ordered.scala
@@ -9,7 +9,7 @@
 // $Id$
 
 
-package scala
+package scala.math
 
 /** A trait for totally ordered data.
  *
diff --git a/src/library/scala/Ordering.scala b/src/library/scala/math/Ordering.scala
index 223d0bf37d..30e13d9f0e 100644
--- a/src/library/scala/Ordering.scala
+++ b/src/library/scala/math/Ordering.scala
@@ -9,7 +9,7 @@
 // $Id$
 
 
-package scala
+package scala.math
 
 import java.util.Comparator
 
diff --git a/src/library/scala/PartialOrdering.scala b/src/library/scala/math/PartialOrdering.scala
index cba71410d7..0f3f667cd5 100644
--- a/src/library/scala/PartialOrdering.scala
+++ b/src/library/scala/math/PartialOrdering.scala
@@ -9,7 +9,7 @@
 // $Id$
 
 
-package scala
+package scala.math
 
 /** <p>
  *    A trait for representing partial orderings.  It is important to
diff --git a/src/library/scala/PartiallyOrdered.scala b/src/library/scala/math/PartiallyOrdered.scala
index b0ddf70220..a09d8326f4 100644
--- a/src/library/scala/PartiallyOrdered.scala
+++ b/src/library/scala/math/PartiallyOrdered.scala
@@ -9,7 +9,7 @@
 // $Id$
 
 
-package scala
+package scala.math
 
 /** A class for partially ordered data.
  *
diff --git a/src/library/scala/package.scala b/src/library/scala/package.scala
index 34ba3c1ff2..e45e5cebe7 100644
--- a/src/library/scala/package.scala
+++ b/src/library/scala/package.scala
@@ -49,6 +49,30 @@ package object scala {
   type Range = scala.collection.immutable.Range
   val Range = scala.collection.immutable.Range
 
+  // Numeric types which were moved into scala.math.*
+
+  type BigDecimal = scala.math.BigDecimal
+  val BigDecimal = scala.math.BigDecimal
+
+  type BigInt = scala.math.BigInt
+  val BigInt = scala.math.BigInt
+
+  type Equiv[T] = scala.math.Equiv[T]
+  type Fractional[T] = scala.math.Fractional[T]
+  type Integral[T] = scala.math.Integral[T]
+
+  type Numeric[T] = scala.math.Numeric[T]
+  val Numeric = scala.math.Numeric
+
+  type Ordered[T] = scala.math.Ordered[T]
+  val Ordered = scala.math.Ordered
+
+  type Ordering[T] = scala.math.Ordering[T]
+  val Ordering = scala.math.Ordering
+
+  type PartialOrdering[T] = scala.math.PartialOrdering[T]
+  type PartiallyOrdered[T] = scala.math.PartiallyOrdered[T]
+
   @deprecated("use Iterable instead") type Collection[+A] = Iterable[A]
   @deprecated("use Iterable instead") val Collection = Iterable