From 2b307b4551ea3cb5827ee6db2e0c08f5852b4770 Mon Sep 17 00:00:00 2001
From: Dmitry Petrashko <dmitry.petrashko@gmail.com>
Date: Wed, 15 Apr 2015 21:11:52 +0200
Subject: Make dotty Idents transparent for common interface

Scalac in some location(assigns for example) assumes that tree is a Select.
In dotty it could also be an Ident.
Simulate this.
Fixes #477
---
 src/dotty/tools/backend/jvm/DottyBackendInterface.scala | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
index e9c8dbc80..bdba2935e 100644
--- a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
+++ b/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
@@ -61,7 +61,7 @@ class DottyBackendInterface()(implicit ctx: Context) extends BackendInterface{
   type Alternative     = tpd.Alternative
   type DefDef          = tpd.DefDef
   type Template        = tpd.Template
-  type Select          = tpd.Select
+  type Select          = tpd.Tree // Actually tpd.Select || tpd.Ident
   type Bind            = tpd.Bind
   type New             = tpd.New
   type Super           = tpd.Super
@@ -857,8 +857,19 @@ class DottyBackendInterface()(implicit ctx: Context) extends BackendInterface{
   }
 
   object Select extends SelectDeconstructor {
-    def _1: Tree = field.qualifier
+
+    override def isEmpty: Boolean = field match {
+      case t: tpd.Select => false
+      case t: tpd.Ident  => desugarIdent(t).isEmpty
+      case _ => true
+    }
+
+    def _1: Tree = field match {
+      case t: tpd.Select => t.qualifier
+      case t: tpd.Ident => desugarIdent(t).get
+    }
     def _2: Name = field.name
+    
   }
 
   object Apply extends ApplyDeconstructor {
-- 
cgit v1.2.3


From 62ac97d16a9231b71de84a50b3c0d32f554b34e4 Mon Sep 17 00:00:00 2001
From: Dmitry Petrashko <dmitry.petrashko@gmail.com>
Date: Wed, 15 Apr 2015 21:15:05 +0200
Subject: Refactor BackendInterface.Select: desuggar only once.

---
 .../tools/backend/jvm/DottyBackendInterface.scala  | 30 ++++++++++++++--------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
index bdba2935e..a1137896b 100644
--- a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
+++ b/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
@@ -858,18 +858,28 @@ class DottyBackendInterface()(implicit ctx: Context) extends BackendInterface{
 
   object Select extends SelectDeconstructor {
 
-    override def isEmpty: Boolean = field match {
-      case t: tpd.Select => false
-      case t: tpd.Ident  => desugarIdent(t).isEmpty
-      case _ => true
-    }
+    var desugared: tpd.Select = null
+
+    override def isEmpty: Boolean =
+      desugared eq null
+
+    def _1: Tree =  desugared.qualifier
 
-    def _1: Tree = field match {
-      case t: tpd.Select => t.qualifier
-      case t: tpd.Ident => desugarIdent(t).get
+    def _2: Name = desugared.name
+
+    override def unapply(s: Select): this.type = {
+      s match {
+        case t: Select => desugared = t
+        case t: Ident  =>
+          desugarIdent(t) match {
+            case Some(t) => desugared = t
+            case None => desugared = null
+          }
+        case _ => desugared = null
+      }
+
+      this
     }
-    def _2: Name = field.name
-    
   }
 
   object Apply extends ApplyDeconstructor {
-- 
cgit v1.2.3


From 7a347a0c9b9e6c1030eff7d994bf3c502ee8d297 Mon Sep 17 00:00:00 2001
From: Dmitry Petrashko <dmitry.petrashko@gmail.com>
Date: Wed, 15 Apr 2015 21:18:18 +0200
Subject: Give more precise types in desugarIdent.

It is known to return an actual Select.
---
 src/dotty/tools/backend/jvm/DottyBackendInterface.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
index a1137896b..1df564688 100644
--- a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
+++ b/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
@@ -243,7 +243,7 @@ class DottyBackendInterface()(implicit ctx: Context) extends BackendInterface{
         }
       case t: TypeApply if (t.fun.symbol == Predef_classOf) =>
         av.visit(name, t.args.head.tpe.classSymbol.denot.info.toTypeKind(bcodeStore)(innerClasesStore).toASMType)
-      case t: Select =>
+      case t: tpd.Select =>
         if (t.symbol.denot.is(Flags.Enum)) {
           val edesc = innerClasesStore.typeDescriptor(t.tpe.asInstanceOf[bcodeStore.int.Type]) // the class descriptor of the enumeration class.
           val evalue = t.symbol.name.toString // value the actual enumeration value.
@@ -416,7 +416,7 @@ class DottyBackendInterface()(implicit ctx: Context) extends BackendInterface{
 
 
   def isQualifierSafeToElide(qual: Tree): Boolean = tpd.isIdempotentExpr(qual)
-  def desugarIdent(i: Ident): Option[Select] = {
+  def desugarIdent(i: Ident): Option[tpd.Select] = {
     i.tpe match {
       case TermRef(prefix: TermRef, name) =>
         Some(tpd.ref(prefix).select(i.symbol))
@@ -869,7 +869,7 @@ class DottyBackendInterface()(implicit ctx: Context) extends BackendInterface{
 
     override def unapply(s: Select): this.type = {
       s match {
-        case t: Select => desugared = t
+        case t: tpd.Select => desugared = t
         case t: Ident  =>
           desugarIdent(t) match {
             case Some(t) => desugared = t
-- 
cgit v1.2.3