From 75696bc3d310a53594d97853f38bb0dbfef42390 Mon Sep 17 00:00:00 2001
From: Eugene Burmako <xeno.by@gmail.com>
Date: Sun, 5 Feb 2012 16:56:48 +0100
Subject: Fixes https://issues.scala-lang.org/browse/SI-5334

New version of reification isn't susceptible to this bug.

The problem was with Code.lift generating not only a tree, but also
a manifest with the type of that tree. That led to an issue in the case
of the type of the manifest depending on a class declared inside the
quasiquote.

Now manifests in reification are gone, so is the problem.
---
 test/files/run/t5334_1.check   |  2 ++
 test/files/run/t5334_1.scala   | 16 ++++++++++++++++
 test/files/run/t5334_2.check   |  2 ++
 test/files/run/t5334_2.scala   | 16 ++++++++++++++++
 test/pending/run/t5334_1.scala | 15 ---------------
 test/pending/run/t5334_2.scala | 15 ---------------
 6 files changed, 36 insertions(+), 30 deletions(-)
 create mode 100644 test/files/run/t5334_1.check
 create mode 100644 test/files/run/t5334_1.scala
 create mode 100644 test/files/run/t5334_2.check
 create mode 100644 test/files/run/t5334_2.scala
 delete mode 100644 test/pending/run/t5334_1.scala
 delete mode 100644 test/pending/run/t5334_2.scala

(limited to 'test')

diff --git a/test/files/run/t5334_1.check b/test/files/run/t5334_1.check
new file mode 100644
index 0000000000..e09aedaede
--- /dev/null
+++ b/test/files/run/t5334_1.check
@@ -0,0 +1,2 @@
+C
+C
\ No newline at end of file
diff --git a/test/files/run/t5334_1.scala b/test/files/run/t5334_1.scala
new file mode 100644
index 0000000000..7acf282bb8
--- /dev/null
+++ b/test/files/run/t5334_1.scala
@@ -0,0 +1,16 @@
+import scala.tools.nsc.reporters._
+import scala.tools.nsc.Settings
+import reflect.runtime.Mirror.ToolBox
+
+object Test extends App {
+  val code = scala.reflect.Code.lift{
+    class C { override def toString = "C" }
+    new C
+  };
+
+  val reporter = new ConsoleReporter(new Settings)
+  val toolbox = new ToolBox(reporter)
+  val ttree = toolbox.typeCheck(code.tree)
+  println(ttree.tpe)
+  println(toolbox.runExpr(ttree))
+}
diff --git a/test/files/run/t5334_2.check b/test/files/run/t5334_2.check
new file mode 100644
index 0000000000..2ae76754c0
--- /dev/null
+++ b/test/files/run/t5334_2.check
@@ -0,0 +1,2 @@
+List[(C, C)]
+List((C,C))
\ No newline at end of file
diff --git a/test/files/run/t5334_2.scala b/test/files/run/t5334_2.scala
new file mode 100644
index 0000000000..26f0778400
--- /dev/null
+++ b/test/files/run/t5334_2.scala
@@ -0,0 +1,16 @@
+import scala.tools.nsc.reporters._
+import scala.tools.nsc.Settings
+import reflect.runtime.Mirror.ToolBox
+
+object Test extends App {
+  val code = scala.reflect.Code.lift{
+    class C { override def toString() = "C" }
+    List((new C, new C))
+  };
+
+  val reporter = new ConsoleReporter(new Settings)
+  val toolbox = new ToolBox(reporter)
+  val ttree = toolbox.typeCheck(code.tree)
+  println(ttree.tpe)
+  println(toolbox.runExpr(ttree))
+}
diff --git a/test/pending/run/t5334_1.scala b/test/pending/run/t5334_1.scala
deleted file mode 100644
index c1eba89c2b..0000000000
--- a/test/pending/run/t5334_1.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-import scala.tools.nsc.reporters._
-import scala.tools.nsc.Settings
-import reflect.runtime.Mirror.ToolBox
-
-object Test extends App {
-  val code = scala.reflect.Code.lift{
-    class C
-    new C
-  };
-
-  val reporter = new ConsoleReporter(new Settings)
-  val toolbox = new ToolBox(reporter)
-  val ttree = toolbox.typeCheck(code.tree)
-  toolbox.runExpr(ttree)
-}
diff --git a/test/pending/run/t5334_2.scala b/test/pending/run/t5334_2.scala
deleted file mode 100644
index 361b8c85f2..0000000000
--- a/test/pending/run/t5334_2.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-import scala.tools.nsc.reporters._
-import scala.tools.nsc.Settings
-import reflect.runtime.Mirror.ToolBox
-
-object Test extends App {
-  val code = scala.reflect.Code.lift{
-    class C
-    List((new C, new C))
-  };
-
-  val reporter = new ConsoleReporter(new Settings)
-  val toolbox = new ToolBox(reporter)
-  val ttree = toolbox.typeCheck(code.tree)
-  toolbox.runExpr(ttree)
-}
-- 
cgit v1.2.3