From 61349a919192d003d3b62bda6b733cb4368af33d Mon Sep 17 00:00:00 2001 From: mihaylov Date: Wed, 13 Jun 2007 14:35:45 +0000 Subject: Synced src/dotnet-library with rev 12018 --- src/dotnet-library/scala/Math.scala | 4 +++- src/dotnet-library/scala/Predef.scala | 4 ++-- src/dotnet-library/scala/runtime/RichString.scala | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/dotnet-library') diff --git a/src/dotnet-library/scala/Math.scala b/src/dotnet-library/scala/Math.scala index e1ef9e771e..cb7abd19ae 100644 --- a/src/dotnet-library/scala/Math.scala +++ b/src/dotnet-library/scala/Math.scala @@ -84,13 +84,15 @@ object Math { def atan(x: Double): Double = System.Math.Atan(x) def toRadians(x: Double): Double = x * Pi / 180.0 + def toDegrees(x: Double): Double = x * 180.0 / Pi def exp(x: Double): Double = System.Math.Exp(x) def log(x: Double): Double = System.Math.Log(x) def sqrt(x: Double): Double = System.Math.Sqrt(x) - + def sqrt(x: Int): Int = System.Math.Sqrt(x.toDouble).toInt def IEEEremainder(x: Double, y: Double): Double = System.Math.IEEERemainder(x, y) + def ceil(x: Double): Double = System.Math.Ceiling(x) def floor(x: Double): Double = System.Math.Floor(x) diff --git a/src/dotnet-library/scala/Predef.scala b/src/dotnet-library/scala/Predef.scala index 50bac1d91b..26d9928ebb 100644 --- a/src/dotnet-library/scala/Predef.scala +++ b/src/dotnet-library/scala/Predef.scala @@ -35,8 +35,8 @@ object Predef { type boolean = scala.Boolean type unit = scala.Unit - type All = Nothing - type AllRef = Null + @deprecated type All = Nothing + @deprecated type AllRef = Null type String = System.String type StringBuilder = compat.StringBuilder diff --git a/src/dotnet-library/scala/runtime/RichString.scala b/src/dotnet-library/scala/runtime/RichString.scala index b7fb269cbc..1b087d7ff9 100644 --- a/src/dotnet-library/scala/runtime/RichString.scala +++ b/src/dotnet-library/scala/runtime/RichString.scala @@ -14,7 +14,7 @@ package scala.runtime import Predef._ -final class RichString(val self: String) extends Proxy with Seq[Char] with Ordered[String] { +final class RichString(val self: String) extends Seq[Char] with Ordered[String] with Proxy { // Ordered[String] def compare(other: String) = self compareTo other -- cgit v1.2.3