summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/cmd/gen/AnyVals.scala84
-rw-r--r--src/compiler/scala/tools/cmd/gen/Codegen.scala12
-rw-r--r--src/compiler/scala/tools/cmd/gen/CodegenSpec.scala6
3 files changed, 58 insertions, 44 deletions
diff --git a/src/compiler/scala/tools/cmd/gen/AnyVals.scala b/src/compiler/scala/tools/cmd/gen/AnyVals.scala
index 23a31a56b4..f6f48359cd 100644
--- a/src/compiler/scala/tools/cmd/gen/AnyVals.scala
+++ b/src/compiler/scala/tools/cmd/gen/AnyVals.scala
@@ -7,9 +7,8 @@ package scala.tools.cmd
package gen
trait AnyValTemplates {
- def timestampString = "// generated on " + new java.util.Date + "\n"
-
- def template = """
+ def timestampString = ""
+ def template = ("""
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2002-2011, LAMP/EPFL **
@@ -22,10 +21,10 @@ trait AnyValTemplates {
package scala
import java.{ lang => jl }
-
""".trim.format(timestampString) + "\n\n"
+ )
- val booleanBody = """
+ def booleanBody = """
final class Boolean extends AnyVal {
def unary_! : Boolean = sys.error("stub")
@@ -48,7 +47,7 @@ object Boolean extends AnyValCompanion {
}
""".trim
- val unitBody = """
+ def unitBody = """
import runtime.BoxedUnit
final class Unit extends AnyVal { }
@@ -59,6 +58,40 @@ object Unit extends AnyValCompanion {
def unbox(x: jl.Object): Unit = ()
}
""".trim
+
+ def cardinalCompanion = """
+final val MinValue = @type@.MIN_VALUE
+final val MaxValue = @type@.MAX_VALUE
+
+def box(x: @name@): @type@ = @type@.valueOf(x)
+def unbox(x: jl.Object): @name@ = x.asInstanceOf[@type@].@lcname@Value()
+override def toString = "object scala.@name@"
+ """.trim.lines
+
+ def floatingCompanion = """
+/** The smallest positive value greater than @zero@.*/
+final val MinPositiveValue = @type@.MIN_VALUE
+final val NaN = @type@.NaN
+final val PositiveInfinity = @type@.POSITIVE_INFINITY
+final val NegativeInfinity = @type@.NEGATIVE_INFINITY
+
+@deprecated("use @name@.MinPositiveValue instead")
+final val Epsilon = MinPositiveValue
+
+/** The negative number with the greatest (finite) absolute value which is representable
+ * by a @name@. Note that it differs from [[java.lang.@name@.MIN_VALUE]], which
+ * is the smallest positive value representable by a @name@. In Scala that number
+ * is called @name@.MinPositiveValue.
+ */
+final val MinValue = -@type@.MAX_VALUE
+
+/** The largest finite positive number representable as a @name@. */
+final val MaxValue = @type@.MAX_VALUE
+
+def box(x: @name@): @type@ = @type@.valueOf(x)
+def unbox(x: jl.Object): @name@ = x.asInstanceOf[@type@].@lcname@Value()
+override def toString = "object scala.@name@"
+ """.trim.lines
}
class AnyVals extends AnyValTemplates {
@@ -90,11 +123,18 @@ class AnyVals extends AnyValTemplates {
val isCardinal = cardinal contains name
val restype = if ("LFD" contains name.head) name else I
val tpe = javaType(name)
+ val zero = name.head match {
+ case 'L' => "0L"
+ case 'F' => "0.0f"
+ case 'D' => "0.0d"
+ case _ => "0"
+ }
val interpolations = Map(
"@restype@" -> restype,
"@name@" -> name,
"@type@" -> tpe,
- "@lcname@" -> name.toLowerCase
+ "@lcname@" -> name.toLowerCase,
+ "@zero@" -> zero
)
def mkCoercions = numeric map (x => "def to%s: %s".format(x, x))
@@ -131,7 +171,7 @@ class AnyVals extends AnyValTemplates {
}
assemble("final class", "AnyVal", lines)
}
- def mkObject = assemble("object", "AnyValCompanion", companionLines map interpolate)
+ def mkObject = assemble("object", "AnyValCompanion", companionBody map interpolate toList)
def assemble(what: String, parent: String, lines: List[String]): String = (
List(what, name, "extends", parent, "{").mkString(" ") +:
@@ -171,35 +211,9 @@ class AnyVals extends AnyValTemplates {
def boolBinops = List("==", "!=", "<", "<=", ">", ">=")
def otherBinops = List("+", "-" ,"*", "/", "%")
- def floatingCompanion = List(
- "final val MinPositiveValue = @type@.MIN_VALUE",
- "final val MinNegativeValue = -@type@.MAX_VALUE",
- "final val NaN = @type@.NaN",
- "final val PositiveInfinity = @type@.POSITIVE_INFINITY",
- "final val NegativeInfinity = @type@.NEGATIVE_INFINITY",
- "",
- """@deprecated("use @name@.MinPositiveValue instead")""",
- "final val Epsilon = MinPositiveValue",
- """@deprecated("use @name@.MinNegativeValue instead")""",
- "final val MinValue = MinNegativeValue"
- )
-
- def cardinalCompanion = List(
- "final val MinValue = @type@.MIN_VALUE"
- )
-
- def commonCompanion = List(
- "final val MaxValue = @type@.MAX_VALUE",
- "",
- "def box(x: @name@): @type@ = @type@.valueOf(x)",
- "def unbox(x: jl.Object): @name@ = x.asInstanceOf[@type@].@lcname@Value()",
- "override def toString = \"object scala.@name@\""
- )
-
- def companionLines = (
+ def companionBody =
if (isCardinal) cardinalCompanion
else floatingCompanion
- ) ++ commonCompanion
}
}
diff --git a/src/compiler/scala/tools/cmd/gen/Codegen.scala b/src/compiler/scala/tools/cmd/gen/Codegen.scala
index a96e53d4e2..d7801f2c08 100644
--- a/src/compiler/scala/tools/cmd/gen/Codegen.scala
+++ b/src/compiler/scala/tools/cmd/gen/Codegen.scala
@@ -27,19 +27,19 @@ object Codegen {
if (anyvals || all) {
val av = new AnyVals {
- override def timestampString =
- if (stamp) super.timestampString
- else ""
+ override def timestampString = (
+ "// DO NOT EDIT, CHANGES WILL BE LOST.\n" + (
+ if (stamp) "// Generated by tools/codegen on " + new java.util.Date + "\n" else ""
+ )
+ )
}
+
av.make() foreach { case (name, code ) =>
val file = out / (name + ".scala") toFile;
echo("Writing: " + file)
file writeAll code
}
}
- if (products || all) {
- ()
- }
}
}
diff --git a/src/compiler/scala/tools/cmd/gen/CodegenSpec.scala b/src/compiler/scala/tools/cmd/gen/CodegenSpec.scala
index e99c49721f..7f4b9c1bb0 100644
--- a/src/compiler/scala/tools/cmd/gen/CodegenSpec.scala
+++ b/src/compiler/scala/tools/cmd/gen/CodegenSpec.scala
@@ -10,15 +10,15 @@ import FromString.ExistingDir
trait CodegenSpec extends Spec with Meta.StdOpts with Interpolation {
def referenceSpec = CodegenSpec
- def programInfo = Spec.Info("codegen", "", "scala.tools.cmd.cmd")
+ def programInfo = Spec.Info("codegen", "", "scala.tools.cmd.gen.Codegen")
import FromString.ExistingDir
help("Usage: codegen [<options>]")
- val inDir = "in" / "directory containing templates" --^ ExistingDir
+ // val inDir = "in" / "directory containing templates" --^ ExistingDir
val outDir = "out" / "directory for generated files" --^ ExistingDir
- val install = "install" / "write source files directly to src/library/scala"
+ // val install = "install" / "write source files directly to src/library/scala"
val anyvals = "anyvals" / "generate sources for AnyVal types" --?
val products = "products" / "generate sources for ProductN, FunctionN, etc." --?
val genall = "all" / "generate sources for everything" --?
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-28 16:05:28 +0000