summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-07-18 08:50:35 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-07-18 08:50:35 -0700
commitcb342c8807a25b881468a9f073cb756973df7561 (patch)
treed567cced6ea07525972cd98c0926598ef4f695a3 /src
parentc3b6d69939aa40412a1166647f95fcb9553e11e4 (diff)
parent38aaa3a24ae8081c7552eede4f805e8ff063b49d (diff)
downloadscala-cb342c8807a25b881468a9f073cb756973df7561.tar.gz
scala-cb342c8807a25b881468a9f073cb756973df7561.tar.bz2
scala-cb342c8807a25b881468a9f073cb756973df7561.zip
Merge pull request #935 from scalamacros/ticket/5695
SI-5695 removes Context.enclosingApplication
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/reflect/makro/runtime/Enclosures.scala1
-rw-r--r--src/reflect/scala/reflect/makro/Enclosures.scala4
2 files changed, 0 insertions, 5 deletions
diff --git a/src/compiler/scala/reflect/makro/runtime/Enclosures.scala b/src/compiler/scala/reflect/makro/runtime/Enclosures.scala
index 80c35d22ff..360a4b8e8a 100644
--- a/src/compiler/scala/reflect/makro/runtime/Enclosures.scala
+++ b/src/compiler/scala/reflect/makro/runtime/Enclosures.scala
@@ -14,7 +14,6 @@ trait Enclosures {
// vals are eager to simplify debugging
// after all we wouldn't save that much time by making them lazy
val macroApplication: Tree = expandee
- val enclosingApplication: Tree = enclTrees collectFirst { case t: Apply => t } getOrElse EmptyTree
val enclosingClass: Tree = site.enclClass.tree
val enclosingImplicits: List[(Type, Tree)] = site.openImplicits
val enclosingMacros: List[Context] = this :: universe.analyzer.openMacros // include self
diff --git a/src/reflect/scala/reflect/makro/Enclosures.scala b/src/reflect/scala/reflect/makro/Enclosures.scala
index 69bd8d09c7..ff5c13a785 100644
--- a/src/reflect/scala/reflect/makro/Enclosures.scala
+++ b/src/reflect/scala/reflect/makro/Enclosures.scala
@@ -36,10 +36,6 @@ trait Enclosures {
*/
val enclosingPosition: Position
- /** Tree that corresponds to the enclosing application, or EmptyTree if not applicable.
- */
- val enclosingApplication: Tree
-
/** Tree that corresponds to the enclosing method, or EmptyTree if not applicable.
*/
val enclosingMethod: Tree