Merge branch 'master' into execution-context

Conflicts:
	src/library/scala/package.scala

1 files changed, 26 insertions, 0 deletions

diff --git a/test/files/run/reify_sort1.scala b/test/files/run/reify_sort1.scala
new file mode 100644
index 0000000000..6f365dea26
--- /dev/null
+++ b/test/files/run/reify_sort1.scala
@@ -0,0 +1,26 @@
+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{
+    def sort(a: List[Int]): List[Int] = {
+      if (a.length < 2)
+        a
+      else {
+        val pivot = a(a.length / 2)
+        sort(a.filter(_ < pivot)) :::
+             a.filter(_ == pivot) :::
+             sort(a.filter(_ > pivot))
+      }
+    }
+
+    val xs = List(6, 2, 8, 5, 1)
+    println(xs)
+    println(sort(xs))
+  };
+
+  val reporter = new ConsoleReporter(new Settings)
+  val toolbox = new ToolBox(reporter)
+  toolbox.runExpr(code.tree)
+}