diff options
author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-18 08:50:35 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-18 08:50:35 -0700 |
commit | cb342c8807a25b881468a9f073cb756973df7561 (patch) | |
tree | d567cced6ea07525972cd98c0926598ef4f695a3 | |
parent | c3b6d69939aa40412a1166647f95fcb9553e11e4 (diff) | |
parent | 38aaa3a24ae8081c7552eede4f805e8ff063b49d (diff) | |
download | scala-cb342c8807a25b881468a9f073cb756973df7561.tar.gz scala-cb342c8807a25b881468a9f073cb756973df7561.tar.bz2 scala-cb342c8807a25b881468a9f073cb756973df7561.zip |
Merge pull request #935 from scalamacros/ticket/5695
SI-5695 removes Context.enclosingApplication
-rw-r--r-- | src/compiler/scala/reflect/makro/runtime/Enclosures.scala | 1 | ||||
-rw-r--r-- | src/reflect/scala/reflect/makro/Enclosures.scala | 4 | ||||
-rw-r--r-- | test/pending/run/t5695.check | 2 | ||||
-rw-r--r-- | test/pending/run/t5695/part_1.scala | 12 | ||||
-rw-r--r-- | test/pending/run/t5695/part_2.scala | 8 |
5 files changed, 0 insertions, 27 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 diff --git a/test/pending/run/t5695.check b/test/pending/run/t5695.check deleted file mode 100644 index d50069ab4f..0000000000 --- a/test/pending/run/t5695.check +++ /dev/null @@ -1,2 +0,0 @@ -.. -.. diff --git a/test/pending/run/t5695/part_1.scala b/test/pending/run/t5695/part_1.scala deleted file mode 100644 index b8e8f8e52f..0000000000 --- a/test/pending/run/t5695/part_1.scala +++ /dev/null @@ -1,12 +0,0 @@ -import language.experimental.macros -import scala.reflect.makro.Context - -object Defs { - - def mkInt = macro mkIntImpl - def mkIntImpl(c: Context): c.Expr[Any] = { - println(c.enclosingApplication) - c.reify{ 23 } - } - -} diff --git a/test/pending/run/t5695/part_2.scala b/test/pending/run/t5695/part_2.scala deleted file mode 100644 index d34219437d..0000000000 --- a/test/pending/run/t5695/part_2.scala +++ /dev/null @@ -1,8 +0,0 @@ -import Defs._ - -object Test extends App { - - val i1 = mkInt - val i2 = identity(mkInt) - -} |