From 6a20eed594c346790b6da5da4be243dd581927d3 Mon Sep 17 00:00:00 2001 From: mihaylov Date: Sun, 8 Oct 2006 09:07:41 +0000 Subject: Moved scala.runtime.compat to scala.compat --- test/files/run/Course-2002-06.scala | 4 ++-- test/files/run/Course-2002-09.scala | 2 +- test/files/run/arrays.scala | 2 +- test/files/run/bugs.scala | 2 +- test/files/run/exceptions.scala | 2 +- test/files/run/lisp.scala | 6 +++--- test/files/run/tailcalls.scala | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'test/files/run') diff --git a/test/files/run/Course-2002-06.scala b/test/files/run/Course-2002-06.scala index df73daa08f..47851988c0 100644 --- a/test/files/run/Course-2002-06.scala +++ b/test/files/run/Course-2002-06.scala @@ -11,7 +11,7 @@ class Vector (_x: Double, _y: Double) { def *(scalar: Double): Vector = new Vector(x * scalar, y * scalar); def -(that: Vector): Vector = new Vector(x - that.x, y - that.y); def /(scalar: Double): Vector = new Vector(x / scalar, y / scalar); - def norm: Double = scala.runtime.compat.Math.sqrt(x * x + y * y); + def norm: Double = compat.Math.sqrt(x * x + y * y); } //############################################################################ @@ -88,7 +88,7 @@ class PostScript (filename: String, _width: Double, _height: Double) def mm2ps(x: Double) : Double = round(x * 72.0 / 25.4); def round(x: Double): Double = - scala.runtime.compat.Math.floor(x * 100.0 + 0.5) / 100.0; + compat.Math.floor(x * 100.0 + 0.5) / 100.0; def scaleAndCenter(frm: Frame, ratio:Double): Frame = { val currentRatio = frm.edgeX.norm / frm.edgeY.norm; diff --git a/test/files/run/Course-2002-09.scala b/test/files/run/Course-2002-09.scala index 65f9adad2b..afc3be7665 100644 --- a/test/files/run/Course-2002-09.scala +++ b/test/files/run/Course-2002-09.scala @@ -50,7 +50,7 @@ class Squarer(square: Quantity, root: Quantity) extends Constraint { def newValue: Unit = Pair(square.getValue, root.getValue) match { case Pair(Some(x), _ )if (x < 0) => error("Square of negative number") case Pair(Some(x), _ ) => - root.setValue(scala.runtime.compat.Math.sqrt(x), this) + root.setValue(compat.Math.sqrt(x), this) case Pair(_ , Some(x)) => square.setValue(x*x, this) case _ => } diff --git a/test/files/run/arrays.scala b/test/files/run/arrays.scala index db7d381aa9..d1a9e7ff37 100644 --- a/test/files/run/arrays.scala +++ b/test/files/run/arrays.scala @@ -162,7 +162,7 @@ object Test { //########################################################################## // Values - import scala.runtime.compat.Math._; + import compat.Math._; val u0: Unit = (); val u1: Unit = (); diff --git a/test/files/run/bugs.scala b/test/files/run/bugs.scala index fc9c735ec9..165be165d6 100644 --- a/test/files/run/bugs.scala +++ b/test/files/run/bugs.scala @@ -454,7 +454,7 @@ object Test { test; } catch { case exception => { - val curr: String = scala.runtime.compat.Platform.currentThread.toString(); + val curr: String = compat.Platform.currentThread.toString(); Console.print("Exception in thread \"" + curr + "\" " + exception); Console.println; errors = errors + 1; diff --git a/test/files/run/exceptions.scala b/test/files/run/exceptions.scala index 04fc4a1a85..82740cc74d 100644 --- a/test/files/run/exceptions.scala +++ b/test/files/run/exceptions.scala @@ -33,7 +33,7 @@ object exceptions { val value = try { map.lookup(key) } catch { - case e => scala.runtime.compat.Platform.getMessage(e) + case e => compat.Platform.getMessage(e) } check("lookup(" + key + ")", value, "KO"); } diff --git a/test/files/run/lisp.scala b/test/files/run/lisp.scala index cb26972e2d..f12196ca50 100644 --- a/test/files/run/lisp.scala +++ b/test/files/run/lisp.scala @@ -240,7 +240,7 @@ object LispCaseClasses extends Lisp { if (token == "(") parseList else if (token == ")") error("unbalanced parentheses") else if ('0' <= token.charAt(0) && token.charAt(0) <= '9') - NUM(scala.runtime.compat.Platform.parseInt(token)) + NUM(compat.Platform.parseInt(token)) else if (token.charAt(0) == '\"' && token.charAt(token.length()-1)=='\"') STR(token.substring(1,token.length() - 1)) else SYM(token) @@ -432,8 +432,8 @@ object LispAny extends Lisp { if (token == "(") parseList else if (token == ")") error("unbalanced parentheses") //else if (Character.isDigit(token.charAt(0))) - else if (scala.runtime.compat.Platform.isDigit(token.charAt(0))) - scala.runtime.compat.Platform.parseInt(token) + else if (compat.Platform.isDigit(token.charAt(0))) + compat.Platform.parseInt(token) else if (token.charAt(0) == '\"' && token.charAt(token.length()-1)=='\"') token.substring(1,token.length() - 1) else Symbol(token) diff --git a/test/files/run/tailcalls.scala b/test/files/run/tailcalls.scala index 3279e6bf64..3c1d96dd0b 100644 --- a/test/files/run/tailcalls.scala +++ b/test/files/run/tailcalls.scala @@ -212,7 +212,7 @@ object Test { while (!stop) { try { calibrator.f(n, n); - if (n >= scala.runtime.compat.Math.MAX_INT / 2) error("calibration failure"); + if (n >= compat.Math.MAX_INT / 2) error("calibration failure"); n = 2 * n; } catch { case exception: StackOverflowError => stop = true -- cgit v1.2.3