Merge pull request #1880 from som-snytt/issue/6894-javap-app

Fixes and features for javap (fixing SI-6894)

10 files changed, 18 insertions, 0 deletions

diff --git a/test/pending/run/repl-javap-def.scala b/test/files/run/repl-javap-def.scala
index dbd769613a..dbd769613a 100644
--- a/test/pending/run/repl-javap-def.scala
+++ b/test/files/run/repl-javap-def.scala
diff --git a/test/pending/run/repl-javap-fun.scala b/test/files/run/repl-javap-fun.scala
index 5c9a6b7691..5c9a6b7691 100644
--- a/test/pending/run/repl-javap-fun.scala
+++ b/test/files/run/repl-javap-fun.scala
diff --git a/test/pending/run/repl-javap-mem.scala b/test/files/run/repl-javap-mem.scala
index 8db30e835c..8db30e835c 100644
--- a/test/pending/run/repl-javap-mem.scala
+++ b/test/files/run/repl-javap-mem.scala
diff --git a/test/pending/run/repl-javap-memfun.scala b/test/files/run/repl-javap-memfun.scala
index d2b4243c8b..d2b4243c8b 100644
--- a/test/pending/run/repl-javap-memfun.scala
+++ b/test/files/run/repl-javap-memfun.scala
diff --git a/test/pending/run/repl-javap-more-fun.scala b/test/files/run/repl-javap-more-fun.scala
index e603faf75a..e603faf75a 100644
--- a/test/pending/run/repl-javap-more-fun.scala
+++ b/test/files/run/repl-javap-more-fun.scala
diff --git a/test/pending/run/repl-javap-outdir/foo_1.scala b/test/files/run/repl-javap-outdir-funs/foo_1.scala
index 9b98e94733..9b98e94733 100644
--- a/test/pending/run/repl-javap-outdir/foo_1.scala
+++ b/test/files/run/repl-javap-outdir-funs/foo_1.scala
diff --git a/test/files/run/repl-javap-outdir-funs/run-repl_7.scala b/test/files/run/repl-javap-outdir-funs/run-repl_7.scala
new file mode 100644
index 0000000000..dfe3dae270
--- /dev/null
+++ b/test/files/run/repl-javap-outdir-funs/run-repl_7.scala
@@ -0,0 +1,12 @@
+import scala.tools.partest.JavapTest
+
+object Test extends JavapTest {
+  def code = """
+    |:javap -fun disktest/Foo.class
+  """.stripMargin
+
+  override def yah(res: Seq[String]) = {
+    def filtered = res filter (_ contains "public final class disktest.Foo")
+    1 == filtered.size
+  }
+}
diff --git a/test/files/run/repl-javap-outdir/foo_1.scala b/test/files/run/repl-javap-outdir/foo_1.scala
new file mode 100644
index 0000000000..9b98e94733
--- /dev/null
+++ b/test/files/run/repl-javap-outdir/foo_1.scala
@@ -0,0 +1,6 @@
+
+package disktest
+
+class Foo {
+  def m(vs: List[Int]) = vs map (_ + 1)
+}
diff --git a/test/pending/run/repl-javap-outdir/run-repl_7.scala b/test/files/run/repl-javap-outdir/run-repl_7.scala
index dc2c5719ff..dc2c5719ff 100644
--- a/test/pending/run/repl-javap-outdir/run-repl_7.scala
+++ b/test/files/run/repl-javap-outdir/run-repl_7.scala
diff --git a/test/pending/run/repl-javap.scala b/test/files/run/repl-javap.scala
index 7a19852d4e..7a19852d4e 100644
--- a/test/pending/run/repl-javap.scala
+++ b/test/files/run/repl-javap.scala