diff options
| author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-05-05 15:36:33 +0200 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-05-08 13:33:51 +0200 |
| commit | 38e4f578a68ede3f246484ad9f0354c21fe9015e (patch) | |
| tree | f3b04e37ea7ccc7cd78f9a0e47b3a3103f35886c /src/dotty/tools/backend | |
| parent | f15e9b2bd1ee0ade14216582f1726028a3dca8df (diff) | |
| download | dotty-38e4f578a68ede3f246484ad9f0354c21fe9015e.tar.gz dotty-38e4f578a68ede3f246484ad9f0354c21fe9015e.tar.bz2 dotty-38e4f578a68ede3f246484ad9f0354c21fe9015e.zip | |
Address some of dotty deviations in backend.
Implicit vals need explicit type, anonymous classes are widened.
Diffstat (limited to 'src/dotty/tools/backend')
| -rw-r--r-- | src/dotty/tools/backend/jvm/LabelDefs.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/backend/jvm/scalaPrimitives.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/backend/jvm/LabelDefs.scala b/src/dotty/tools/backend/jvm/LabelDefs.scala index 8f9e3bdcc..371396e36 100644 --- a/src/dotty/tools/backend/jvm/LabelDefs.scala +++ b/src/dotty/tools/backend/jvm/LabelDefs.scala @@ -164,7 +164,7 @@ class LabelDefs extends MiniPhaseTransform { } } - val collectLabelDefs = new TreeMap() { + object collectLabelDefs extends TreeMap() { // label calls from this DefDef var parentLabelCalls: mutable.Set[Tree] = new mutable.HashSet[Tree]() diff --git a/src/dotty/tools/backend/jvm/scalaPrimitives.scala b/src/dotty/tools/backend/jvm/scalaPrimitives.scala index 857a92d21..8e742faf1 100644 --- a/src/dotty/tools/backend/jvm/scalaPrimitives.scala +++ b/src/dotty/tools/backend/jvm/scalaPrimitives.scala @@ -125,7 +125,7 @@ class DottyPrimitives(ctx: Context) { /** Initialize the primitive map */ private def init: immutable.Map[Symbol, Int] = { - implicit val ctx = this.ctx + implicit val ctx: Context = this.ctx import core.Symbols.defn val primitives = new mutable.HashMap[Symbol, Int]() |