From 37cf9efe509b0bac4fb6bda01b7126e7511e43f0 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 26 Mar 2014 19:15:40 +0100 Subject: Erasure phase PoC Still missing: bridge method generation, signatures. Other changes - Turned around Checking and NoChecking. Checking is the default, NoChecking disables it. - Refactored Typer#typed to expose typedNamed, so that it can be overridden in erasure. - Made logging more forgiving wrt off-buy-one phase errors. Conflicts: src/dotty/tools/dotc/typer/Typer.scala --- src/dotty/tools/dotc/core/Definitions.scala | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/dotty/tools/dotc/core/Definitions.scala') diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/src/dotty/tools/dotc/core/Definitions.scala index af88a04b9..3ae74b467 100644 --- a/src/dotty/tools/dotc/core/Definitions.scala +++ b/src/dotty/tools/dotc/core/Definitions.scala @@ -182,6 +182,9 @@ class Definitions { lazy val DoubleClass = valueClassSymbol("scala.Double", BoxedDoubleClass, java.lang.Double.TYPE, DoubleEnc) lazy val BoxedUnitClass = ctx.requiredClass("scala.runtime.BoxedUnit") + + lazy val BoxedUnit_UNIT = BoxedUnitClass.linkedClass.requiredValue("UNIT") + lazy val BoxedBooleanClass = ctx.requiredClass("java.lang.Boolean") lazy val BoxedByteClass = ctx.requiredClass("java.lang.Byte") lazy val BoxedShortClass = ctx.requiredClass("java.lang.Short") @@ -428,6 +431,8 @@ class Definitions { FloatClass, DoubleClass) + lazy val ScalaBoxedClasses = ScalaValueClasses map boxedClass + private[this] val _boxedClass = mutable.Map[Symbol, Symbol]() private[this] val _unboxedClass = mutable.Map[Symbol, Symbol]() -- cgit v1.2.3