diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2014-02-21 21:31:52 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2014-02-21 21:32:01 +0100 |
| commit | 6ce573b491160c0998a35579cc83a4cee2592803 (patch) | |
| tree | 7913f6f956353ae8fd07295c4356708b0e4f7b73 | |
| parent | 00624a39ed84c3fd245dd9df7454d4cec4399e13 (diff) | |
| download | scala-6ce573b491160c0998a35579cc83a4cee2592803.tar.gz scala-6ce573b491160c0998a35579cc83a4cee2592803.tar.bz2 scala-6ce573b491160c0998a35579cc83a4cee2592803.zip | |
minor code cleanup in the macro engine
| -rw-r--r-- | src/compiler/scala/reflect/macros/compiler/Resolvers.scala | 4 | ||||
| -rw-r--r-- | src/compiler/scala/reflect/macros/compiler/Validators.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/reflect/macros/compiler/Resolvers.scala b/src/compiler/scala/reflect/macros/compiler/Resolvers.scala index 807fb688a0..05e229c51c 100644 --- a/src/compiler/scala/reflect/macros/compiler/Resolvers.scala +++ b/src/compiler/scala/reflect/macros/compiler/Resolvers.scala @@ -35,10 +35,10 @@ trait Resolvers { // lazy val (_, macroImplOwner, macroImpl, macroImplTargs) = private lazy val dissectedMacroImplRef = macroImplRef match { - case MacroImplReference(isBundle, isBlackbox, owner, meth, targs) => (isBlackbox, owner, meth, targs) + case MacroImplReference(_, isBlackbox, owner, meth, targs) => (isBlackbox, owner, meth, targs) case _ => MacroImplReferenceWrongShapeError() } - lazy val isImplBlackbox = dissectedMacroImplRef._1 + lazy val isBlackbox = dissectedMacroImplRef._1 lazy val macroImplOwner = dissectedMacroImplRef._2 lazy val macroImpl = dissectedMacroImplRef._3 lazy val targs = dissectedMacroImplRef._4 diff --git a/src/compiler/scala/reflect/macros/compiler/Validators.scala b/src/compiler/scala/reflect/macros/compiler/Validators.scala index fc118028dd..a146818ae3 100644 --- a/src/compiler/scala/reflect/macros/compiler/Validators.scala +++ b/src/compiler/scala/reflect/macros/compiler/Validators.scala @@ -147,7 +147,7 @@ trait Validators { // had to move method's body to an object because of the recursive dependencies between sigma and param object SigGenerator { val cache = scala.collection.mutable.Map[Symbol, Symbol]() - val ctxTpe = if (isImplBlackbox) BlackboxContextClass.tpe else WhiteboxContextClass.tpe + val ctxTpe = if (isBlackbox) BlackboxContextClass.tpe else WhiteboxContextClass.tpe val ctxPrefix = if (isImplMethod) singleType(NoPrefix, makeParam(nme.macroContext, macroDdef.pos, ctxTpe, SYNTHETIC)) else singleType(ThisType(macroImpl.owner), macroImpl.owner.tpe.member(nme.c)) |