diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2014-02-06 19:01:49 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2014-02-15 09:23:57 +0100 |
| commit | 24780095d14938e60e28c710c47ed69629b7afc7 (patch) | |
| tree | 7be93fa0110afd06c76a158a378d098d39908399 /src/compiler/scala/reflect/macros | |
| parent | fa8f4022754356859f3af1c4ffbac02ab3dc3e7c (diff) | |
| download | scala-24780095d14938e60e28c710c47ed69629b7afc7.tar.gz scala-24780095d14938e60e28c710c47ed69629b7afc7.tar.bz2 scala-24780095d14938e60e28c710c47ed69629b7afc7.zip | |
addresses pull request feedback
Diffstat (limited to 'src/compiler/scala/reflect/macros')
3 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/reflect/macros/contexts/Enclosures.scala b/src/compiler/scala/reflect/macros/contexts/Enclosures.scala index 0b4aad85a3..5e931817b5 100644 --- a/src/compiler/scala/reflect/macros/contexts/Enclosures.scala +++ b/src/compiler/scala/reflect/macros/contexts/Enclosures.scala @@ -18,7 +18,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 enclosingOwner = site.owner def enclosingPackage: PackageDef = strictEnclosure[PackageDef] val enclosingClass: Tree = lenientEnclosure[ImplDef] def enclosingImpl: ImplDef = strictEnclosure[ImplDef] diff --git a/src/compiler/scala/reflect/macros/contexts/Internals.scala b/src/compiler/scala/reflect/macros/contexts/Internals.scala index e35a8ae034..cca6d957da 100644 --- a/src/compiler/scala/reflect/macros/contexts/Internals.scala +++ b/src/compiler/scala/reflect/macros/contexts/Internals.scala @@ -7,6 +7,8 @@ trait Internals extends scala.tools.nsc.transform.TypingTransformers { import global._ lazy val internal: ContextInternalApi = new global.SymbolTableInternal with ContextInternalApi { + val enclosingOwner = callsiteTyper.context.owner + class HofTransformer(hof: (Tree, TransformApi) => Tree) extends Transformer { val api = new TransformApi { def recur(tree: Tree): Tree = hof(tree, this) diff --git a/src/compiler/scala/reflect/macros/contexts/Typers.scala b/src/compiler/scala/reflect/macros/contexts/Typers.scala index 0c3881fdcf..f1620b764b 100644 --- a/src/compiler/scala/reflect/macros/contexts/Typers.scala +++ b/src/compiler/scala/reflect/macros/contexts/Typers.scala @@ -12,6 +12,7 @@ trait Typers { val TypecheckMode = scala.reflect.internal.Mode val TERMmode = TypecheckMode.EXPRmode val TYPEmode = TypecheckMode.TYPEmode | TypecheckMode.FUNmode + val PATTERNmode = TypecheckMode.PATTERNmode /** * @see [[scala.tools.reflect.ToolBox.typeCheck]] |