Skip to content

Fix #4395: Handle ## when it is an Ident #4474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 7, 2018
Merged

Fix #4395: Handle ## when it is an Ident #4474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8803595
Fix #4395: Handle ## when it is an Ident
nicolasstucki May 7, 2018
d32bd8d
Add tests for intercepted method handled as Ident
nicolasstucki May 7, 2018
d95f8d4
Use tpd.desugarIdentPrefix
nicolasstucki May 7, 2018
02cbf1f
Factor out more code
nicolasstucki May 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 20 additions & 26 deletions compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,15 @@
package dotty.tools.dotc
package transform

import MegaPhase._
import core.Denotations._
import core.SymDenotations._
import core.Contexts._
import core.Types._
import ast.Trees._
import ast.tpd.{Apply, Tree, cpy}
import dotty.tools.dotc.ast.tpd
import scala.collection.mutable
import dotty.tools.dotc._
import core._
import Contexts._
import Symbols._
import Decorators._
import NameOps._
import dotty.tools.dotc.ast.Trees._
import dotty.tools.dotc.ast.{untpd, tpd}
import dotty.tools.dotc.ast.tpd
import dotty.tools.dotc.core.Constants.Constant
import dotty.tools.dotc.core.Types.MethodType
import dotty.tools.dotc.core.Names.{ Name, TermName }
import scala.collection.mutable.ListBuffer
import dotty.tools.dotc.core.Denotations.SingleDenotation
import dotty.tools.dotc.core.SymDenotations.SymDenotation
import StdNames._
import Phases.Phase
import dotty.tools.dotc.core.Contexts._
import dotty.tools.dotc.core.Names.TermName
import dotty.tools.dotc.core.StdNames._
import dotty.tools.dotc.core.Symbols._
import dotty.tools.dotc.core.Types._
import dotty.tools.dotc.transform.MegaPhase.MiniPhase

object InterceptedMethods {
val name = "intercepted"
Expand All @@ -45,9 +29,19 @@ class InterceptedMethods extends MiniPhase {
override def phaseName: String = InterceptedMethods.name

// this should be removed if we have guarantee that ## will get Apply node
override def transformSelect(tree: tpd.Select)(implicit ctx: Context): Tree = {
if (tree.symbol.isTerm && (defn.Any_## eq tree.symbol.asTerm)) {
val rewrite = poundPoundValue(tree.qualifier)
override def transformSelect(tree: tpd.Select)(implicit ctx: Context): Tree =
transformRefTree(tree)

override def transformIdent(tree: tpd.Ident)(implicit ctx: Context): Tree =
transformRefTree(tree)

private def transformRefTree(tree: RefTree)(implicit ctx: Context): Tree = {
if (tree.symbol.isTerm && (defn.Any_## eq tree.symbol)) {
val qual = tree match {
case id: Ident => tpd.desugarIdentPrefix(id)
case sel: Select => sel.qualifier
}
val rewrite = poundPoundValue(qual)
ctx.log(s"$phaseName rewrote $tree to $rewrite")
rewrite
}
Expand Down
4 changes: 4 additions & 0 deletions tests/pos/i4395.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
object Test {
val res0 = ##
val res1 = this.##
}
5 changes: 5 additions & 0 deletions tests/pos/i4395b.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
object Test {
val res0 = ==(null)
val res1 = !=(null)
val res4 = getClass
}