summaryrefslogtreecommitdiff
path: root/test/pending
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-03 09:39:56 -0800
committerPaul Phillips <paulp@improving.org>2012-02-03 09:39:56 -0800
commit7ec4ba5ea921eafb092b05f580ba7381edcd8427 (patch)
tree18d2553403b64ee683536f61b59ce62035305699 /test/pending
parentb4cfd1161e9f549a909d9f563f557c17dbddad00 (diff)
parent58ab20ba9b6a17c81f2f89f31f7265d2ed3b166b (diff)
downloadscala-7ec4ba5ea921eafb092b05f580ba7381edcd8427.tar.gz
scala-7ec4ba5ea921eafb092b05f580ba7381edcd8427.tar.bz2
scala-7ec4ba5ea921eafb092b05f580ba7381edcd8427.zip
Merge branch 'master' into topic/inline
Diffstat (limited to 'test/pending')
-rw-r--r--test/pending/run/reify_closure1.check2
-rw-r--r--test/pending/run/reify_closure1.scala20
-rw-r--r--test/pending/run/reify_closure2a.check2
-rw-r--r--test/pending/run/reify_closure3a.check2
-rw-r--r--test/pending/run/reify_closure4a.check2
-rw-r--r--test/pending/run/reify_closure4a.scala22
-rw-r--r--test/pending/run/reify_closure5a.check2
-rw-r--r--test/pending/run/reify_closure5a.scala20
-rw-r--r--test/pending/run/reify_closure6.check3
-rw-r--r--test/pending/run/reify_closure6.scala26
-rw-r--r--test/pending/run/reify_closure8b.check1
-rw-r--r--test/pending/run/reify_closure8b.scala17
-rw-r--r--test/pending/run/reify_closure9a.check1
-rw-r--r--test/pending/run/reify_closure9a.scala (renamed from test/pending/run/reify_closure2a.scala)14
-rw-r--r--test/pending/run/reify_closure9b.check1
-rw-r--r--test/pending/run/reify_closure9b.scala (renamed from test/pending/run/reify_closure3a.scala)16
-rw-r--r--test/pending/run/reify_closures11.check1
-rw-r--r--test/pending/run/reify_closures11.scala (renamed from test/pending/run/t5277_2.scala)18
-rw-r--r--test/pending/run/reify_complex.check1
-rw-r--r--test/pending/run/reify_complex.scala31
-rw-r--r--test/pending/run/reify_extendbuiltins.check1
-rw-r--r--test/pending/run/reify_extendbuiltins.scala21
-rw-r--r--test/pending/run/reify_implicits.check1
-rw-r--r--test/pending/run/reify_implicits.scala21
-rw-r--r--test/pending/run/reify_sort.check2
-rw-r--r--test/pending/run/reify_sort.scala57
-rw-r--r--test/pending/run/reify_sort1.check2
-rw-r--r--test/pending/run/reify_sort1.scala27
-rw-r--r--test/pending/run/t5256c.check0
-rw-r--r--test/pending/run/t5256c.scala10
-rw-r--r--test/pending/run/t5256g.check0
-rw-r--r--test/pending/run/t5256g.scala11
-rw-r--r--test/pending/run/t5256h.check8
-rw-r--r--test/pending/run/t5256h.scala8
-rw-r--r--test/pending/run/t5258b.check1
-rw-r--r--test/pending/run/t5258b.scala (renamed from test/pending/run/t5279.scala)5
-rw-r--r--test/pending/run/t5258c.check1
-rw-r--r--test/pending/run/t5258c.scala (renamed from test/pending/run/t5275.scala)6
-rw-r--r--test/pending/run/t5269.check1
-rw-r--r--test/pending/run/t5269.scala22
-rw-r--r--test/pending/run/t5274_1.check3
-rw-r--r--test/pending/run/t5274_1.scala20
-rw-r--r--test/pending/run/t5274_2.check2
-rw-r--r--test/pending/run/t5274_2.scala57
-rw-r--r--test/pending/run/t5275.check1
-rw-r--r--test/pending/run/t5277_1.check1
-rw-r--r--test/pending/run/t5277_1.scala21
-rw-r--r--test/pending/run/t5277_2.check2
-rw-r--r--test/pending/run/t5279.check1
-rw-r--r--test/pending/run/t5427a.check1
-rw-r--r--test/pending/run/t5427a.scala10
-rw-r--r--test/pending/run/t5427b.check1
-rw-r--r--test/pending/run/t5427b.scala11
-rw-r--r--test/pending/run/t5427c.check1
-rw-r--r--test/pending/run/t5427c.scala13
-rw-r--r--test/pending/run/t5427d.check1
-rw-r--r--test/pending/run/t5427d.scala11
57 files changed, 138 insertions, 426 deletions
diff --git a/test/pending/run/reify_closure1.check b/test/pending/run/reify_closure1.check
deleted file mode 100644
index b2f7f08c17..0000000000
--- a/test/pending/run/reify_closure1.check
+++ /dev/null
@@ -1,2 +0,0 @@
-10
-10
diff --git a/test/pending/run/reify_closure1.scala b/test/pending/run/reify_closure1.scala
deleted file mode 100644
index 825a38dc1d..0000000000
--- a/test/pending/run/reify_closure1.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-import scala.tools.nsc.reporters._
-import scala.tools.nsc.Settings
-import reflect.runtime.Mirror.ToolBox
-
-object Test extends App {
- def foo[T](ys: List[T]): Int => Int = {
- val fun: reflect.Code[Int => Int] = x => {
- x
- }
-
- val reporter = new ConsoleReporter(new Settings)
- val toolbox = new ToolBox(reporter)
- val ttree = toolbox.typeCheck(fun.tree)
- val dyn = toolbox.runExpr(ttree)
- dyn.asInstanceOf[Int => Int]
- }
-
- println(foo(List(1, 2, 3))(10))
- println(foo(List(1, 2, 3, 4))(10))
-}
diff --git a/test/pending/run/reify_closure2a.check b/test/pending/run/reify_closure2a.check
deleted file mode 100644
index c1f3abd7e6..0000000000
--- a/test/pending/run/reify_closure2a.check
+++ /dev/null
@@ -1,2 +0,0 @@
-11
-12
diff --git a/test/pending/run/reify_closure3a.check b/test/pending/run/reify_closure3a.check
deleted file mode 100644
index c1f3abd7e6..0000000000
--- a/test/pending/run/reify_closure3a.check
+++ /dev/null
@@ -1,2 +0,0 @@
-11
-12
diff --git a/test/pending/run/reify_closure4a.check b/test/pending/run/reify_closure4a.check
deleted file mode 100644
index c1f3abd7e6..0000000000
--- a/test/pending/run/reify_closure4a.check
+++ /dev/null
@@ -1,2 +0,0 @@
-11
-12
diff --git a/test/pending/run/reify_closure4a.scala b/test/pending/run/reify_closure4a.scala
deleted file mode 100644
index 99e9d82706..0000000000
--- a/test/pending/run/reify_closure4a.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-import scala.tools.nsc.reporters._
-import scala.tools.nsc.Settings
-import reflect.runtime.Mirror.ToolBox
-
-object Test extends App {
- def foo(y: Int): Int => Int = {
- val y1 = y
-
- val fun: reflect.Code[Int => Int] = x => {
- x + y1
- }
-
- val reporter = new ConsoleReporter(new Settings)
- val toolbox = new ToolBox(reporter)
- val ttree = toolbox.typeCheck(fun.tree)
- val dyn = toolbox.runExpr(ttree)
- dyn.asInstanceOf[Int => Int]
- }
-
- println(foo(1)(10))
- println(foo(2)(10))
-}
diff --git a/test/pending/run/reify_closure5a.check b/test/pending/run/reify_closure5a.check
deleted file mode 100644
index df9e19c591..0000000000
--- a/test/pending/run/reify_closure5a.check
+++ /dev/null
@@ -1,2 +0,0 @@
-13
-14
diff --git a/test/pending/run/reify_closure5a.scala b/test/pending/run/reify_closure5a.scala
deleted file mode 100644
index 0ac53d5479..0000000000
--- a/test/pending/run/reify_closure5a.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-import scala.tools.nsc.reporters._
-import scala.tools.nsc.Settings
-import reflect.runtime.Mirror.ToolBox
-
-object Test extends App {
- def foo[T](ys: List[T]): Int => Int = {
- val fun: reflect.Code[Int => Int] = x => {
- x + ys.length
- }
-
- val reporter = new ConsoleReporter(new Settings)
- val toolbox = new ToolBox(reporter)
- val ttree = toolbox.typeCheck(fun.tree)
- val dyn = toolbox.runExpr(ttree)
- dyn.asInstanceOf[Int => Int]
- }
-
- println(foo(List(1, 2, 3))(10))
- println(foo(List(1, 2, 3, 4))(10))
-}
diff --git a/test/pending/run/reify_closure6.check b/test/pending/run/reify_closure6.check
deleted file mode 100644
index 3526d04b0e..0000000000
--- a/test/pending/run/reify_closure6.check
+++ /dev/null
@@ -1,3 +0,0 @@
-first invocation = 15
-second invocation = 18
-q after second invocation = 2
diff --git a/test/pending/run/reify_closure6.scala b/test/pending/run/reify_closure6.scala
deleted file mode 100644
index 909071aa44..0000000000
--- a/test/pending/run/reify_closure6.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-import scala.tools.nsc.reporters._
-import scala.tools.nsc.Settings
-import reflect.runtime.Mirror.ToolBox
-
-object Test extends App {
- var q = 0
- def foo[T](ys: List[T]): Int => Int = {
- val z = 1
- var y = 0
- val fun: reflect.Code[Int => Int] = x => {
- y += 1
- q += 1
- x + ys.length * z + q + y
- }
-
- val reporter = new ConsoleReporter(new Settings)
- val toolbox = new ToolBox(reporter)
- val ttree = toolbox.typeCheck(fun.tree)
- val dyn = toolbox.runExpr(ttree)
- dyn.asInstanceOf[Int => Int]
- }
-
- println("first invocation = " + foo(List(1, 2, 3))(10))
- println("second invocation = " + foo(List(1, 2, 3, 4))(10))
- println("q after second invocation = " + q)
-}
diff --git a/test/pending/run/reify_closure8b.check b/test/pending/run/reify_closure8b.check
new file mode 100644
index 0000000000..9a037142aa
--- /dev/null
+++ b/test/pending/run/reify_closure8b.check
@@ -0,0 +1 @@
+10 \ No newline at end of file
diff --git a/test/pending/run/reify_closure8b.scala b/test/pending/run/reify_closure8b.scala
new file mode 100644
index 0000000000..9e37e4e09a
--- /dev/null
+++ b/test/pending/run/reify_closure8b.scala
@@ -0,0 +1,17 @@
+import scala.reflect.Code._
+import scala.tools.nsc.reporters._
+import scala.tools.nsc.Settings
+import reflect.runtime.Mirror.ToolBox
+
+object Test extends App {
+ class Foo(y: Int) {
+ def fun = lift{y}
+ }
+
+ val reporter = new ConsoleReporter(new Settings)
+ val toolbox = new ToolBox(reporter)
+ val ttree = toolbox.typeCheck(new Foo(10).fun.tree)
+ val dyn = toolbox.runExpr(ttree)
+ val foo = dyn.asInstanceOf[Int]
+ println(foo)
+}
diff --git a/test/pending/run/reify_closure9a.check b/test/pending/run/reify_closure9a.check
new file mode 100644
index 0000000000..9a037142aa
--- /dev/null
+++ b/test/pending/run/reify_closure9a.check
@@ -0,0 +1 @@
+10 \ No newline at end of file
diff --git a/test/pending/run/reify_closure2a.scala b/test/pending/run/reify_closure9a.scala
index b88bec005d..f3ee153d3c 100644
--- a/test/pending/run/reify_closure2a.scala
+++ b/test/pending/run/reify_closure9a.scala
@@ -1,20 +1,20 @@
+import scala.reflect.Code._
import scala.tools.nsc.reporters._
import scala.tools.nsc.Settings
import reflect.runtime.Mirror.ToolBox
object Test extends App {
- def foo(y: Int): Int => Int = {
- val fun: reflect.Code[Int => Int] = x => {
- x + y
+ def foo(y: Int) = {
+ class Foo(val y: Int) {
+ def fun = lift{y}
}
val reporter = new ConsoleReporter(new Settings)
val toolbox = new ToolBox(reporter)
- val ttree = toolbox.typeCheck(fun.tree)
+ val ttree = toolbox.typeCheck(new Foo(y).fun.tree)
val dyn = toolbox.runExpr(ttree)
- dyn.asInstanceOf[Int => Int]
+ dyn.asInstanceOf[Int]
}
- println(foo(1)(10))
- println(foo(2)(10))
+ println(foo(10))
}
diff --git a/test/pending/run/reify_closure9b.check b/test/pending/run/reify_closure9b.check
new file mode 100644
index 0000000000..9a037142aa
--- /dev/null
+++ b/test/pending/run/reify_closure9b.check
@@ -0,0 +1 @@
+10 \ No newline at end of file
diff --git a/test/pending/run/reify_closure3a.scala b/test/pending/run/reify_closure9b.scala
index 6414fa58a3..8d349e8701 100644
--- a/test/pending/run/reify_closure3a.scala
+++ b/test/pending/run/reify_closure9b.scala
@@ -1,22 +1,20 @@
+import scala.reflect.Code._
import scala.tools.nsc.reporters._
import scala.tools.nsc.Settings
import reflect.runtime.Mirror.ToolBox
object Test extends App {
- def foo(y: Int): Int => Int = {
- def y1 = y
-
- val fun: reflect.Code[Int => Int] = x => {
- x + y1
+ def foo(y: Int) = {
+ class Foo(y: Int) {
+ def fun = lift{y}
}
val reporter = new ConsoleReporter(new Settings)
val toolbox = new ToolBox(reporter)
- val ttree = toolbox.typeCheck(fun.tree)
+ val ttree = toolbox.typeCheck(new Foo(y).fun.tree)
val dyn = toolbox.runExpr(ttree)
- dyn.asInstanceOf[Int => Int]
+ dyn.asInstanceOf[Int]
}
- println(foo(1)(10))
- println(foo(2)(10))
+ println(foo(10))
}
diff --git a/test/pending/run/reify_closures11.check b/test/pending/run/reify_closures11.check
new file mode 100644
index 0000000000..d8263ee986
--- /dev/null
+++ b/test/pending/run/reify_closures11.check
@@ -0,0 +1 @@
+2 \ No newline at end of file
diff --git a/test/pending/run/t5277_2.scala b/test/pending/run/reify_closures11.scala
index 67b6b000bc..42053bd029 100644
--- a/test/pending/run/t5277_2.scala
+++ b/test/pending/run/reify_closures11.scala
@@ -1,18 +1,18 @@
+import scala.reflect.Code._
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 p(implicit i: Int) = print(i)
- implicit val v = 2
-
- println(p)
- println(p(1))
- };
+ def fun() = {
+ def z() = 2
+ lift{z}
+ }
val reporter = new ConsoleReporter(new Settings)
val toolbox = new ToolBox(reporter)
- val ttree = toolbox.typeCheck(code.tree)
- toolbox.runExpr(ttree)
+ val ttree = toolbox.typeCheck(fun().tree)
+ val dyn = toolbox.runExpr(ttree)
+ val foo = dyn.asInstanceOf[Int]
+ println(foo)
}
diff --git a/test/pending/run/reify_complex.check b/test/pending/run/reify_complex.check
deleted file mode 100644
index 7df35e33a0..0000000000
--- a/test/pending/run/reify_complex.check
+++ /dev/null
@@ -1 +0,0 @@
-3.0+4.0*i
diff --git a/test/pending/run/reify_complex.scala b/test/pending/run/reify_complex.scala
deleted file mode 100644
index aae4d558cf..0000000000
--- a/test/pending/run/reify_complex.scala
+++ /dev/null
@@ -1,31 +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 Complex(val re: Double, val im: Double) {
- def + (that: Complex) =
- new Complex(re + that.re, im + that.im)
- def - (that: Complex) =
- new Complex(re - that.re, im - that.im)
- def * (that: Complex) =
- new Complex(re * that.re - im * that.im,
- re * that.im + im * that.re)
- def / (that: Complex) = {
- val denom = that.re * that.re + that.im * that.im
- new Complex((re * that.re + im * that.im) / denom,
- (im * that.re - re * that.im) / denom)
- }
- override def toString =
- re + (if (im < 0) "-" + (-im) else "+" + im) + "*i"
- }
- val x = new Complex(2, 1); val y = new Complex(1, 3)
- println(x + y)
- };
-
- 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/reify_extendbuiltins.check b/test/pending/run/reify_extendbuiltins.check
deleted file mode 100644
index a48033a30d..0000000000
--- a/test/pending/run/reify_extendbuiltins.check
+++ /dev/null
@@ -1 +0,0 @@
-10! = 3628800
diff --git a/test/pending/run/reify_extendbuiltins.scala b/test/pending/run/reify_extendbuiltins.scala
deleted file mode 100644
index 57acd699ff..0000000000
--- a/test/pending/run/reify_extendbuiltins.scala
+++ /dev/null
@@ -1,21 +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{
- def fact(n: Int): BigInt =
- if (n == 0) 1 else fact(n-1) * n
- class Factorizer(n: Int) {
- def ! = fact(n)
- }
- implicit def int2fact(n: Int) = new Factorizer(n)
-
- println("10! = " + (10!))
- };
-
- 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/reify_implicits.check b/test/pending/run/reify_implicits.check
deleted file mode 100644
index e3aeb20f6b..0000000000
--- a/test/pending/run/reify_implicits.check
+++ /dev/null
@@ -1 +0,0 @@
-x = List(1, 2, 3, 4)
diff --git a/test/pending/run/reify_implicits.scala b/test/pending/run/reify_implicits.scala
deleted file mode 100644
index a15cef9c97..0000000000
--- a/test/pending/run/reify_implicits.scala
+++ /dev/null
@@ -1,21 +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{
- implicit def arrayWrapper[A : ClassManifest](x: Array[A]) =
- new {
- def sort(p: (A, A) => Boolean) = {
- util.Sorting.stableSort(x, p); x
- }
- }
- val x = Array(2, 3, 1, 4)
- println("x = "+ x.sort((x: Int, y: Int) => x < y).toList)
- };
-
- 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/reify_sort.check b/test/pending/run/reify_sort.check
deleted file mode 100644
index 375536cc29..0000000000
--- a/test/pending/run/reify_sort.check
+++ /dev/null
@@ -1,2 +0,0 @@
-[6,2,8,5,1]
-[1,2,5,6,8]
diff --git a/test/pending/run/reify_sort.scala b/test/pending/run/reify_sort.scala
deleted file mode 100644
index 42991fe5d2..0000000000
--- a/test/pending/run/reify_sort.scala
+++ /dev/null
@@ -1,57 +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{
- /** Nested methods can use and even update everything
- * visible in their scope (including local variables or
- * arguments of enclosing methods).
- */
- def sort(a: Array[Int]) {
-
- def swap(i: Int, j: Int) {
- val t = a(i); a(i) = a(j); a(j) = t
- }
-
- def sort1(l: Int, r: Int) {
- val pivot = a((l + r) / 2)
- var i = l
- var j = r
- while (i <= j) {
- while (a(i) < pivot) i += 1
- while (a(j) > pivot) j -= 1
- if (i <= j) {
- swap(i, j)
- i += 1
- j -= 1
- }
- }
- if (l < j) sort1(l, j)
- if (j < r) sort1(i, r)
- }
-
- if (a.length > 0)
- sort1(0, a.length - 1)
- }
-
- def println(ar: Array[Int]) {
- def print1 = {
- def iter(i: Int): String =
- ar(i) + (if (i < ar.length-1) "," + iter(i+1) else "")
- if (ar.length == 0) "" else iter(0)
- }
- Console.println("[" + print1 + "]")
- }
-
- val ar = Array(6, 2, 8, 5, 1)
- println(ar)
- sort(ar)
- println(ar)
- };
-
- 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/reify_sort1.check b/test/pending/run/reify_sort1.check
deleted file mode 100644
index 0d30805141..0000000000
--- a/test/pending/run/reify_sort1.check
+++ /dev/null
@@ -1,2 +0,0 @@
-List(6, 2, 8, 5, 1)
-List(1, 2, 5, 6, 8)
diff --git a/test/pending/run/reify_sort1.scala b/test/pending/run/reify_sort1.scala
deleted file mode 100644
index 42f4c824a5..0000000000
--- a/test/pending/run/reify_sort1.scala
+++ /dev/null
@@ -1,27 +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{
- 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)
- val ttree = toolbox.typeCheck(code.tree)
- toolbox.runExpr(ttree)
-}
diff --git a/test/pending/run/t5256c.check b/test/pending/run/t5256c.check
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/pending/run/t5256c.check
diff --git a/test/pending/run/t5256c.scala b/test/pending/run/t5256c.scala
new file mode 100644
index 0000000000..8ebb51a009
--- /dev/null
+++ b/test/pending/run/t5256c.scala
@@ -0,0 +1,10 @@
+import scala.reflect.mirror._
+
+object Test extends App {
+ {
+ class A
+ val c = classToType(classOf[A])
+ println(c)
+ println(c.typeSymbol == classToSymbol(classOf[A]))
+ }
+}
diff --git a/test/pending/run/t5256g.check b/test/pending/run/t5256g.check
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/pending/run/t5256g.check
diff --git a/test/pending/run/t5256g.scala b/test/pending/run/t5256g.scala
new file mode 100644
index 0000000000..6158a9281d
--- /dev/null
+++ b/test/pending/run/t5256g.scala
@@ -0,0 +1,11 @@
+import scala.reflect.mirror._
+
+class A
+trait B
+
+object Test extends App {
+ val mutant = new A with B
+ val c = classToType(mutant.getClass)
+ println(c)
+ println(c.typeSymbol == classToSymbol(mutant.getClass))
+}
diff --git a/test/pending/run/t5256h.check b/test/pending/run/t5256h.check
new file mode 100644
index 0000000000..4f9b8faf71
--- /dev/null
+++ b/test/pending/run/t5256h.check
@@ -0,0 +1,8 @@
+import scala.reflect.mirror._
+
+object Test extends App {
+ val mutant = new { val x = 2 }
+ val c = classToType(mutant.getClass)
+ println(c)
+ println(c.typeSymbol == classToSymbol(mutant.getClass))
+}
diff --git a/test/pending/run/t5256h.scala b/test/pending/run/t5256h.scala
new file mode 100644
index 0000000000..4f9b8faf71
--- /dev/null
+++ b/test/pending/run/t5256h.scala
@@ -0,0 +1,8 @@
+import scala.reflect.mirror._
+
+object Test extends App {
+ val mutant = new { val x = 2 }
+ val c = classToType(mutant.getClass)
+ println(c)
+ println(c.typeSymbol == classToSymbol(mutant.getClass))
+}
diff --git a/test/pending/run/t5258b.check b/test/pending/run/t5258b.check
new file mode 100644
index 0000000000..283b4225fb
--- /dev/null
+++ b/test/pending/run/t5258b.check
@@ -0,0 +1 @@
+TBI \ No newline at end of file
diff --git a/test/pending/run/t5279.scala b/test/pending/run/t5258b.scala
index 39e7dd2c66..70cb4a7f4e 100644
--- a/test/pending/run/t5279.scala
+++ b/test/pending/run/t5258b.scala
@@ -4,11 +4,12 @@ import reflect.runtime.Mirror.ToolBox
object Test extends App {
val code = scala.reflect.Code.lift{
- println(new Integer(10))
+ class C
+ println(classOf[C])
};
val reporter = new ConsoleReporter(new Settings)
val toolbox = new ToolBox(reporter)
val ttree = toolbox.typeCheck(code.tree)
toolbox.runExpr(ttree)
-}
+} \ No newline at end of file
diff --git a/test/pending/run/t5258c.check b/test/pending/run/t5258c.check
new file mode 100644
index 0000000000..283b4225fb
--- /dev/null
+++ b/test/pending/run/t5258c.check
@@ -0,0 +1 @@
+TBI \ No newline at end of file
diff --git a/test/pending/run/t5275.scala b/test/pending/run/t5258c.scala
index d419834ded..a93170d0d6 100644
--- a/test/pending/run/t5275.scala
+++ b/test/pending/run/t5258c.scala
@@ -4,12 +4,12 @@ import reflect.runtime.Mirror.ToolBox
object Test extends App {
val code = scala.reflect.Code.lift{
- class C(val foo: Int)
- println(new C(2).foo)
+ object E extends Enumeration { val foo, bar = Value }
+ println(E.foo)
};
val reporter = new ConsoleReporter(new Settings)
val toolbox = new ToolBox(reporter)
val ttree = toolbox.typeCheck(code.tree)
toolbox.runExpr(ttree)
-}
+} \ No newline at end of file
diff --git a/test/pending/run/t5269.check b/test/pending/run/t5269.check
deleted file mode 100644
index 0cfbf08886..0000000000
--- a/test/pending/run/t5269.check
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/test/pending/run/t5269.scala b/test/pending/run/t5269.scala
deleted file mode 100644
index a30509f3fe..0000000000
--- a/test/pending/run/t5269.scala
+++ /dev/null
@@ -1,22 +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{
- trait Z {
- val z = 2
- }
-
- class X extends Z {
- def println() = Predef.println(z)
- }
-
- new X().println()
- };
-
- 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/t5274_1.check b/test/pending/run/t5274_1.check
deleted file mode 100644
index fca8bc3d3e..0000000000
--- a/test/pending/run/t5274_1.check
+++ /dev/null
@@ -1,3 +0,0 @@
-50! = 30414093201713378043612608166064768844377641568960512000000000000
-49! = 608281864034267560872252163321295376887552831379210240000000000
-50!/49! = 50
diff --git a/test/pending/run/t5274_1.scala b/test/pending/run/t5274_1.scala
deleted file mode 100644
index c501172518..0000000000
--- a/test/pending/run/t5274_1.scala
+++ /dev/null
@@ -1,20 +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{
- def factorial(n: BigInt): BigInt =
- if (n == 0) 1 else n * factorial(n-1)
-
- val f50 = factorial(50); val f49 = factorial(49)
- println("50! = " + f50)
- println("49! = " + f49)
- println("50!/49! = " + (f50 / f49))
- };
-
- 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/t5274_2.check b/test/pending/run/t5274_2.check
deleted file mode 100644
index 375536cc29..0000000000
--- a/test/pending/run/t5274_2.check
+++ /dev/null
@@ -1,2 +0,0 @@
-[6,2,8,5,1]
-[1,2,5,6,8]
diff --git a/test/pending/run/t5274_2.scala b/test/pending/run/t5274_2.scala
deleted file mode 100644
index 42991fe5d2..0000000000
--- a/test/pending/run/t5274_2.scala
+++ /dev/null
@@ -1,57 +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{
- /** Nested methods can use and even update everything
- * visible in their scope (including local variables or
- * arguments of enclosing methods).
- */
- def sort(a: Array[Int]) {
-
- def swap(i: Int, j: Int) {
- val t = a(i); a(i) = a(j); a(j) = t
- }
-
- def sort1(l: Int, r: Int) {
- val pivot = a((l + r) / 2)
- var i = l
- var j = r
- while (i <= j) {
- while (a(i) < pivot) i += 1
- while (a(j) > pivot) j -= 1
- if (i <= j) {
- swap(i, j)
- i += 1
- j -= 1
- }
- }
- if (l < j) sort1(l, j)
- if (j < r) sort1(i, r)
- }
-
- if (a.length > 0)
- sort1(0, a.length - 1)
- }
-
- def println(ar: Array[Int]) {
- def print1 = {
- def iter(i: Int): String =
- ar(i) + (if (i < ar.length-1) "," + iter(i+1) else "")
- if (ar.length == 0) "" else iter(0)
- }
- Console.println("[" + print1 + "]")
- }
-
- val ar = Array(6, 2, 8, 5, 1)
- println(ar)
- sort(ar)
- println(ar)
- };
-
- 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/t5275.check b/test/pending/run/t5275.check
deleted file mode 100644
index 0cfbf08886..0000000000
--- a/test/pending/run/t5275.check
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/test/pending/run/t5277_1.check b/test/pending/run/t5277_1.check
deleted file mode 100644
index a48033a30d..0000000000
--- a/test/pending/run/t5277_1.check
+++ /dev/null
@@ -1 +0,0 @@
-10! = 3628800
diff --git a/test/pending/run/t5277_1.scala b/test/pending/run/t5277_1.scala
deleted file mode 100644
index 57acd699ff..0000000000
--- a/test/pending/run/t5277_1.scala
+++ /dev/null
@@ -1,21 +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{
- def fact(n: Int): BigInt =
- if (n == 0) 1 else fact(n-1) * n
- class Factorizer(n: Int) {
- def ! = fact(n)
- }
- implicit def int2fact(n: Int) = new Factorizer(n)
-
- println("10! = " + (10!))
- };
-
- 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/t5277_2.check b/test/pending/run/t5277_2.check
deleted file mode 100644
index 5f1d0ecea5..0000000000
--- a/test/pending/run/t5277_2.check
+++ /dev/null
@@ -1,2 +0,0 @@
-2
-1
diff --git a/test/pending/run/t5279.check b/test/pending/run/t5279.check
deleted file mode 100644
index f599e28b8a..0000000000
--- a/test/pending/run/t5279.check
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/test/pending/run/t5427a.check b/test/pending/run/t5427a.check
new file mode 100644
index 0000000000..d8263ee986
--- /dev/null
+++ b/test/pending/run/t5427a.check
@@ -0,0 +1 @@
+2 \ No newline at end of file
diff --git a/test/pending/run/t5427a.scala b/test/pending/run/t5427a.scala
new file mode 100644
index 0000000000..27b28da0ac
--- /dev/null
+++ b/test/pending/run/t5427a.scala
@@ -0,0 +1,10 @@
+import scala.reflect.mirror._
+
+object Foo { val bar = 2 }
+
+object Test extends App {
+ val tpe = getType(Foo)
+ val bar = tpe.nonPrivateMember(newTermName("bar"))
+ val value = getValue(Foo, bar)
+ println(value)
+} \ No newline at end of file
diff --git a/test/pending/run/t5427b.check b/test/pending/run/t5427b.check
new file mode 100644
index 0000000000..d8263ee986
--- /dev/null
+++ b/test/pending/run/t5427b.check
@@ -0,0 +1 @@
+2 \ No newline at end of file
diff --git a/test/pending/run/t5427b.scala b/test/pending/run/t5427b.scala
new file mode 100644
index 0000000000..7a92b6ebbe
--- /dev/null
+++ b/test/pending/run/t5427b.scala
@@ -0,0 +1,11 @@
+import scala.reflect.mirror._
+
+class Foo { val bar = 2 }
+
+object Test extends App {
+ val foo = new Foo
+ val tpe = getType(foo)
+ val bar = tpe.nonPrivateMember(newTermName("bar"))
+ val value = getValue(foo, bar)
+ println(value)
+} \ No newline at end of file
diff --git a/test/pending/run/t5427c.check b/test/pending/run/t5427c.check
new file mode 100644
index 0000000000..32c91abbd6
--- /dev/null
+++ b/test/pending/run/t5427c.check
@@ -0,0 +1 @@
+no public member \ No newline at end of file
diff --git a/test/pending/run/t5427c.scala b/test/pending/run/t5427c.scala
new file mode 100644
index 0000000000..ab41d8b8cd
--- /dev/null
+++ b/test/pending/run/t5427c.scala
@@ -0,0 +1,13 @@
+import scala.reflect.mirror._
+
+class Foo(bar: Int)
+
+object Test extends App {
+ val foo = new Foo(2)
+ val tpe = getType(foo)
+ val bar = tpe.nonPrivateMember(newTermName("bar"))
+ bar match {
+ case NoSymbol => println("no public member")
+ case _ => println("i'm screwed")
+ }
+} \ No newline at end of file
diff --git a/test/pending/run/t5427d.check b/test/pending/run/t5427d.check
new file mode 100644
index 0000000000..d8263ee986
--- /dev/null
+++ b/test/pending/run/t5427d.check
@@ -0,0 +1 @@
+2 \ No newline at end of file
diff --git a/test/pending/run/t5427d.scala b/test/pending/run/t5427d.scala
new file mode 100644
index 0000000000..fd4c62e876
--- /dev/null
+++ b/test/pending/run/t5427d.scala
@@ -0,0 +1,11 @@
+import scala.reflect.mirror._
+
+class Foo(val bar: Int)
+
+object Test extends App {
+ val foo = new Foo(2)
+ val tpe = getType(foo)
+ val bar = tpe.nonPrivateMember(newTermName("bar"))
+ val value = getValue(foo, bar)
+ println(value)
+} \ No newline at end of file