diff options
author | Martin Odersky <odersky@gmail.com> | 2015-05-22 16:56:41 +0200 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2015-05-27 20:08:28 +0200 |
commit | 8dd3466ff605db006934697edd7b8ffd9af4bf7f (patch) | |
tree | da21d3e5554d11f68aab5d118d2516053a2e01af /src/dotty/tools | |
parent | 6ec4b0a7753ffadaf85e4ffee0ad8bd1749cde01 (diff) | |
download | dotty-8dd3466ff605db006934697edd7b8ffd9af4bf7f.tar.gz dotty-8dd3466ff605db006934697edd7b8ffd9af4bf7f.tar.bz2 dotty-8dd3466ff605db006934697edd7b8ffd9af4bf7f.zip |
Add harmonization method for harmonizing numeric types.
Diffstat (limited to 'src/dotty/tools')
-rw-r--r-- | src/dotty/tools/dotc/core/Definitions.scala | 3 | ||||
-rw-r--r-- | src/dotty/tools/dotc/core/SymDenotations.scala | 3 | ||||
-rw-r--r-- | src/dotty/tools/dotc/typer/Applications.scala | 20 |
3 files changed, 25 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/src/dotty/tools/dotc/core/Definitions.scala index a1b44ec34..1c4d5c282 100644 --- a/src/dotty/tools/dotc/core/Definitions.scala +++ b/src/dotty/tools/dotc/core/Definitions.scala @@ -539,7 +539,7 @@ class Definitions { // ----- primitive value class machinery ------------------------------------------ - lazy val ScalaNumericValueClasses: collection.Set[Symbol] = Set( + lazy val ScalaNumericValueClassList = List( ByteClass, ShortClass, CharClass, @@ -548,6 +548,7 @@ class Definitions { FloatClass, DoubleClass) + lazy val ScalaNumericValueClasses: collection.Set[Symbol] = ScalaNumericValueClassList.toSet lazy val ScalaValueClasses: collection.Set[Symbol] = ScalaNumericValueClasses + UnitClass + BooleanClass lazy val ScalaBoxedClasses = ScalaValueClasses map boxedClass diff --git a/src/dotty/tools/dotc/core/SymDenotations.scala b/src/dotty/tools/dotc/core/SymDenotations.scala index c6264b817..33258b6b6 100644 --- a/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/src/dotty/tools/dotc/core/SymDenotations.scala @@ -386,6 +386,9 @@ object SymDenotations { /** Is symbol a primitive value class? */ def isPrimitiveValueClass(implicit ctx: Context) = defn.ScalaValueClasses contains symbol + /** Is symbol a primitive value class? */ + def isNumericValueClass(implicit ctx: Context) = defn.ScalaNumericValueClasses contains symbol + /** Is symbol a phantom class for which no runtime representation exists? */ def isPhantomClass(implicit ctx: Context) = defn.PhantomClasses contains symbol diff --git a/src/dotty/tools/dotc/typer/Applications.scala b/src/dotty/tools/dotc/typer/Applications.scala index 855f265cc..e1d3d243d 100644 --- a/src/dotty/tools/dotc/typer/Applications.scala +++ b/src/dotty/tools/dotc/typer/Applications.scala @@ -1024,6 +1024,26 @@ trait Applications extends Compatibility { self: Typer => result } } + + def harmonize(trees: List[Tree])(implicit ctx: Context): List[Tree] = { + def numericClasses(trees: List[Tree], acc: Set[Symbol]): Set[Symbol] = trees match { + case tree :: trees1 => + val sym = tree.tpe.typeSymbol + if (sym.isNumericValueClass && tree.tpe.isRef(sym)) + numericClasses(trees1, acc + sym) + else + Set() + case Nil => + acc + } + val clss = numericClasses(trees, Set()) + if (clss.size > 1) { + val lub = defn.ScalaNumericValueClassList.find(lubCls => + clss.forall(defn.isValueSubClass(_, lubCls))).get.typeRef + trees.mapConserve(tree => adaptInterpolated(tree, lub, tree)) + } + else trees + } } /* |