diff options
| author | michelou <michelou@epfl.ch> | 2008-01-21 15:26:26 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2008-01-21 15:26:26 +0000 |
| commit | 94a67b3673d466a80362035db6211e5d73e40b79 (patch) | |
| tree | 4138b2b74ded6285b72fbc2c194a0c86b7387eb9 | |
| parent | ba2bb0f732c192b7639a85a9970022b4a56d76d6 (diff) | |
| download | scala-94a67b3673d466a80362035db6211e5d73e40b79.tar.gz scala-94a67b3673d466a80362035db6211e5d73e40b79.tar.bz2 scala-94a67b3673d466a80362035db6211e5d73e40b79.zip | |
no Liftcode on CLDC too
| -rw-r--r-- | src/cldc-library/scala/runtime/RichLong.scala | 30 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 3 |
2 files changed, 32 insertions, 1 deletions
diff --git a/src/cldc-library/scala/runtime/RichLong.scala b/src/cldc-library/scala/runtime/RichLong.scala new file mode 100644 index 0000000000..da1a827111 --- /dev/null +++ b/src/cldc-library/scala/runtime/RichLong.scala @@ -0,0 +1,30 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2008, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id: $ + + +package scala.runtime + + +final class RichLong(x: Long) extends Proxy with Ordered[Long] { + + // Proxy.self + def self: Any = x + + // Ordered[Long].compare + def compare(y: Long): Int = if (x < y) -1 else if (x > y) 1 else 0 + + def min(y: Long): Long = if (x < y) x else y + def max(y: Long): Long = if (x > y) x else y + def abs: Long = if (x < 0) -x else x + + def toBinaryString: String = java.lang.Long.toString(x, 2) + def toHexString: String = java.lang.Long.toString(x, 16) + def toOctalString: String = java.lang.Long.toString(x, 8) +} diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 3cf3a9a1bd..99884f746b 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -382,7 +382,7 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable pickler, // serializes symbol tables refchecks // perform reference and override checking, translate nested objects ) ::: ( - if (forMSIL) List() else List(liftcode) // generate reified trees + if (forJVM) List(liftcode) else List() // generate reified trees ) ::: List( uncurry, // uncurry, translate function values to anonymous classes tailCalls, // replace tail calls by jumps @@ -692,6 +692,7 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable } def forCLDC: Boolean = settings.target.value == "cldc" + def forJVM : Boolean = settings.target.value startsWith "jvm" def forMSIL: Boolean = settings.target.value == "msil" def onlyPresentation = settings.doc.value |