diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-09-20 08:08:15 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-09-20 08:08:15 -0700 |
| commit | 008db4088de98c52bb5ef673b74a9b11e4236d27 (patch) | |
| tree | c107e7a1bf8f5e86e2b100753912ed28ca3f3ea2 /src | |
| parent | 52ea3cc76f59e5518ef9ba5af8cb5819c41594c9 (diff) | |
| parent | 440d28d027f2a1910ec6c4c09ad02602b67c7ea9 (diff) | |
| download | scala-008db4088de98c52bb5ef673b74a9b11e4236d27.tar.gz scala-008db4088de98c52bb5ef673b74a9b11e4236d27.tar.bz2 scala-008db4088de98c52bb5ef673b74a9b11e4236d27.zip | |
Merge pull request #1331 from scalamacros/ticket/5943
SI-5943 toolboxes now autoimport Predef and scala
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/reflect/reify/package.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/reflect/ToolBoxFactory.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/reflect/reify/package.scala b/src/compiler/scala/reflect/reify/package.scala index 2600956805..5a23ab7214 100644 --- a/src/compiler/scala/reflect/reify/package.scala +++ b/src/compiler/scala/reflect/reify/package.scala @@ -72,7 +72,7 @@ package object reify { def reifyEnclosingRuntimeClass(global: Global)(typer0: global.analyzer.Typer): global.Tree = { import global._ import definitions._ - def isThisInScope = typer0.context.enclosingContextChain exists (_.tree.isInstanceOf[Template]) + def isThisInScope = typer0.context.enclosingContextChain exists (_.tree.isInstanceOf[ImplDef]) if (isThisInScope) { val enclosingClasses = typer0.context.enclosingContextChain map (_.tree) collect { case classDef: ClassDef => classDef } val classInScope = enclosingClasses.headOption getOrElse EmptyTree diff --git a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala index 6300297f65..f985eedf99 100644 --- a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala +++ b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala @@ -118,7 +118,7 @@ abstract class ToolBoxFactory[U <: JavaUniverse](val u: U) { factorySelf => val ownerClass = rootMirror.EmptyPackageClass.newClassSymbol(newTypeName("<expression-owner>")) build.setTypeSignature(ownerClass, ClassInfoType(List(ObjectClass.tpe), newScope, ownerClass)) val owner = ownerClass.newLocalDummy(expr.pos) - var currentTyper = typer.atOwner(expr, owner) + var currentTyper = analyzer.newTyper(analyzer.rootContext(NoCompilationUnit, EmptyTree).make(expr, owner)) val wrapper1 = if (!withImplicitViewsDisabled) (currentTyper.context.withImplicitsEnabled[Tree] _) else (currentTyper.context.withImplicitsDisabled[Tree] _) val wrapper2 = if (!withMacrosDisabled) (currentTyper.context.withMacrosEnabled[Tree] _) else (currentTyper.context.withMacrosDisabled[Tree] _) def wrapper (tree: => Tree) = wrapper1(wrapper2(tree)) |