Merge pull request #1327 from scalamacros/ticket/6287

SI-6287 fixes synthetic symbol clashes in toolbox

5 files changed, 52 insertions, 3 deletions

diff --git a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala
index d941519958..091224c88a 100644
--- a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala
+++ b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala
@@ -175,7 +175,7 @@ abstract class ToolBoxFactory[U <: JavaUniverse](val u: U) { factorySelf =>
         val thunks = freeTerms map (fte => () => fte.value) // need to be lazy in order not to distort evaluation order
         verify(expr)
 
-        def wrap(expr0: Tree): Tree = {
+        def wrap(expr0: Tree): ModuleDef = {
           val (expr, freeTerms) = extractFreeTerms(expr0, wrapFreeTermRefs = true)
 
           val (obj, mclazz) = rootMirror.EmptyPackageClass.newModuleAndClassSymbol(
@@ -213,11 +213,11 @@ abstract class ToolBoxFactory[U <: JavaUniverse](val u: U) { factorySelf =>
 
           var cleanedUp = resetLocalAttrs(moduledef)
           trace("cleaned up: ")(showAttributed(cleanedUp, true, true, settings.Yshowsymkinds.value))
-          cleanedUp
+          cleanedUp.asInstanceOf[ModuleDef]
         }
 
         val mdef = wrap(expr)
-        val pdef = PackageDef(Ident(nme.EMPTY_PACKAGE_NAME), List(mdef))
+        val pdef = PackageDef(Ident(mdef.name), List(mdef))
         val unit = new CompilationUnit(NoSourceFile)
         unit.body = pdef
 
diff --git a/test/files/run/t5770.check b/test/files/run/t5770.check
new file mode 100644
index 0000000000..eeb1d55321
--- /dev/null
+++ b/test/files/run/t5770.check
@@ -0,0 +1,10 @@
+1

+2

+3

+4

+5

+6

+7

+8

+9

+10

diff --git a/test/files/run/t5770.scala b/test/files/run/t5770.scala
new file mode 100644
index 0000000000..b6c9236844
--- /dev/null
+++ b/test/files/run/t5770.scala
@@ -0,0 +1,25 @@
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect._
+
+object Test extends App {
+  var i = 0
+  val action = reify { i += 1; println(i) }.tree
+
+  val tb1 = cm.mkToolBox()
+  tb1.eval(action)
+  tb1.eval(action)
+  tb1.eval(action)
+  tb1.frontEnd.reset()
+  tb1.eval(action)
+  tb1.eval(action)
+
+  val tb2 = cm.mkToolBox()
+  tb2.eval(action)
+  tb2.frontEnd.reset()
+  tb2.eval(action)
+  tb2.eval(action)
+  tb2.frontEnd.reset()
+  tb2.eval(action)
+  tb2.eval(action)
+}
diff --git a/test/files/run/t6287.check b/test/files/run/t6287.check
new file mode 100644
index 0000000000..2a783704a2
--- /dev/null
+++ b/test/files/run/t6287.check
@@ -0,0 +1,3 @@
+Vector(2, 3, 4)

+Vector(2, 3, 4)

+Vector(2, 3, 4)

diff --git a/test/files/run/t6287.scala b/test/files/run/t6287.scala
new file mode 100644
index 0000000000..0c75d1081b
--- /dev/null
+++ b/test/files/run/t6287.scala
@@ -0,0 +1,11 @@
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect._
+
+object Test extends App {
+  val tb = cm.mkToolBox()
+  val t1 = tb.parse("1 to 3 map (_+1)")
+  println(tb.eval(t1))
+  println(tb.eval(t1))
+  println(tb.eval(t1))
+}
\ No newline at end of file