diff options
author | Martin Odersky <odersky@gmail.com> | 2015-11-07 22:49:21 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2015-11-09 15:45:39 +0100 |
commit | af6ffc319cb23c5ade01251a93810f7a33429e58 (patch) | |
tree | 99dd27434fcc4fd37aeaae359ea5d0e1f9700767 /src/dotty/tools/backend/jvm | |
parent | 5398c5a723b0f8b0d35e6c3ad230c5046169e837 (diff) | |
download | dotty-af6ffc319cb23c5ade01251a93810f7a33429e58.tar.gz dotty-af6ffc319cb23c5ade01251a93810f7a33429e58.tar.bz2 dotty-af6ffc319cb23c5ade01251a93810f7a33429e58.zip |
Renamings in Definitions
TypeRef becomes Type, thus removing duplicates. Where
...Type was used in an extraction (e.g. ArrayType(...),
FunctionType(...)), we now use ...Of.
Diffstat (limited to 'src/dotty/tools/backend/jvm')
-rw-r--r-- | src/dotty/tools/backend/jvm/CollectEntryPoints.scala | 9 | ||||
-rw-r--r-- | src/dotty/tools/backend/jvm/scalaPrimitives.scala | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/dotty/tools/backend/jvm/CollectEntryPoints.scala b/src/dotty/tools/backend/jvm/CollectEntryPoints.scala index 80907fb99..3ed232bc7 100644 --- a/src/dotty/tools/backend/jvm/CollectEntryPoints.scala +++ b/src/dotty/tools/backend/jvm/CollectEntryPoints.scala @@ -49,13 +49,10 @@ class CollectEntryPoints extends MiniPhaseTransform { object CollectEntryPoints{ def isJavaMainMethod(sym: Symbol)(implicit ctx: Context) = { - val d = ctx.definitions - val StringType = d.StringType - (sym.name == nme.main) && (sym.info match { - case r@MethodType(_, List(d.ArrayType(t))) => - (t.widenDealias =:= StringType) && ( - r.resultType.widenDealias =:= d.UnitType) + case r@MethodType(_, List(defn.ArrayOf(t))) => + (t.widenDealias =:= defn.StringType) && ( + r.resultType.widenDealias =:= defn.UnitType) case _ => false }) } diff --git a/src/dotty/tools/backend/jvm/scalaPrimitives.scala b/src/dotty/tools/backend/jvm/scalaPrimitives.scala index 4eeeb4b01..0027defa7 100644 --- a/src/dotty/tools/backend/jvm/scalaPrimitives.scala +++ b/src/dotty/tools/backend/jvm/scalaPrimitives.scala @@ -69,7 +69,7 @@ class DottyPrimitives(ctx: Context) { } def elementType: Type = tpe.widenDealias match { - case defn.ArrayType(el) => el + case defn.ArrayOf(el) => el case JavaArrayType(el) => el case _ => ctx.error(s"expected Array $tpe") |