upgrades typingTransform

typingTransform and typingTransform's atOwner now work both with
solitary trees and Tree+Symbol couples.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/compiler/scala/reflect/macros/contexts/Internals.scala b/src/compiler/scala/reflect/macros/contexts/Internals.scala
index cca6d957da..8c784d7e54 100644
--- a/src/compiler/scala/reflect/macros/contexts/Internals.scala
+++ b/src/compiler/scala/reflect/macros/contexts/Internals.scala
@@ -29,6 +29,7 @@ trait Internals extends scala.tools.nsc.transform.TypingTransformers {
         def recur(tree: Tree): Tree = hof(tree, this)
         def default(tree: Tree): Tree = superTransform(tree)
         def atOwner[T](owner: Symbol)(op: => T): T = self.atOwner(owner)(op)
+        def atOwner[T](tree: Tree, owner: Symbol)(op: => T): T = self.atOwner(tree, owner)(op)
         def currentOwner: Symbol = self.currentOwner
         def typecheck(tree: Tree): Tree = localTyper.typed(tree)
       }
@@ -37,5 +38,10 @@ trait Internals extends scala.tools.nsc.transform.TypingTransformers {
     }
 
     def typingTransform(tree: Tree)(transformer: (Tree, TypingTransformApi) => Tree): Tree = new HofTypingTransformer(transformer).transform(tree)
+
+    def typingTransform(tree: Tree, owner: Symbol)(transformer: (Tree, TypingTransformApi) => Tree): Tree = {
+      val trans = new HofTypingTransformer(transformer)
+      trans.atOwner(owner)(trans.transform(tree))
+    }
   }
 }
\ No newline at end of file