SI-9277 Downgrade marginal javap features

Drop Java 6 support, -fun, -app, and -raw options.

9 files changed, 3 insertions, 107 deletions

diff --git a/test/files/run/repl-javap-def.scala b/test/files/run/repl-javap-def.scala
index dbd769613a..3994f06767 100644
--- a/test/files/run/repl-javap-def.scala
+++ b/test/files/run/repl-javap-def.scala
@@ -3,7 +3,7 @@ import scala.tools.partest.JavapTest
 object Test extends JavapTest {
   def code = """
     |def f = 7
-    |:javap -public -raw f
+    |:javap -public f
   """.stripMargin
 
   // it should find f wrapped in repl skins. replstiltskin.
diff --git a/test/files/run/repl-javap-fun.scala b/test/files/run/repl-javap-fun.scala
deleted file mode 100644
index 5c9a6b7691..0000000000
--- a/test/files/run/repl-javap-fun.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-import scala.tools.partest.JavapTest
-
-object Test extends JavapTest {
-  def code = """
-    |object Betty {
-    | List(1,2,3) filter (_ % 2 != 0) map (_ * 2)
-    |}
-    |:javap -fun Betty
-  """.stripMargin
-
-  // two anonfuns of Betty
-  override def yah(res: Seq[String]) = {
-    def filtered = res filter (_ contains "public final class Betty")
-    2 == filtered.size
-  }
-}
diff --git a/test/files/run/repl-javap-lambdas.scala b/test/files/run/repl-javap-lambdas.scala
deleted file mode 100644
index 76a6ec8450..0000000000
--- a/test/files/run/repl-javap-lambdas.scala
+++ /dev/null
@@ -1,23 +0,0 @@
-import scala.tools.partest.JavapTest
-import scala.tools.nsc.Settings
-
-// see repl-javap-memfun.java for the complementary version
-object Test extends JavapTest {
-  override def transformSettings(s: Settings) = { s.Ydelambdafy.value = "method" ; s }
-  def code = """
-    |object Betty {
-    | List(1,2,3) count (_ % 2 != 0)
-    | def f = List(1,2,3) filter ((x: Any) => true) map (x => "m1")
-    | def g = List(1,2,3) filter ((x: Any) => true) map (x => "m1") map (x => "m2")
-    |}
-    |:javap -fun Betty#g
-  """.stripMargin
-
-  // three anonfuns of Betty#g
-  override def yah(res: Seq[String]) = {
-    import PartialFunction.{ cond => when }
-    val r = """.*final .* .*\$anonfun\$\d+\(.*""".r
-    def filtered = res filter (when(_) { case r(_*) => true })
-    3 == filtered.size
-  }
-}
diff --git a/test/files/run/repl-javap-memfun.scala b/test/files/run/repl-javap-memfun.scala
deleted file mode 100644
index d10ebcb399..0000000000
--- a/test/files/run/repl-javap-memfun.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-import scala.tools.partest.JavapTest
-import scala.tools.nsc.Settings
-
-// see repl-javap-lambdas.scala for the complementary version
-object Test extends JavapTest {
-  // asserting the default
-  override def transformSettings(s: Settings) = { s.Ydelambdafy.value = "inline" ; s }
-  def code = """
-    |object Betty {
-    | List(1,2,3) count (_ % 2 != 0)
-    | def f = List(1,2,3) filter (_ % 2 != 0) map (_ * 2)
-    | def g = List(1,2,3) filter (_ % 2 == 0) map (_ * 3) map (_ + 1)
-    |}
-    |:javap -fun Betty#g
-  """.stripMargin
-
-  // three anonfuns of Betty#g
-  override def yah(res: Seq[String]) = {
-    def filtered = res filter (_ contains "public final class Betty")
-    3 == filtered.size
-  }
-}
diff --git a/test/files/run/repl-javap-more-fun.scala b/test/files/run/repl-javap-more-fun.scala
deleted file mode 100644
index e603faf75a..0000000000
--- a/test/files/run/repl-javap-more-fun.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-import scala.tools.partest.JavapTest
-
-object Test extends JavapTest {
-  def code = """
-    |object Betty {
-    |  val ds = List(1,2,3) filter (_ % 2 == 0) map (_ * 3)
-    |  def m(vs: List[Int]) = vs filter (_ % 2 != 0) map (_ * 2)
-    |}
-    |:javap -fun Betty
-  """.stripMargin
-
-  // two anonfuns of Betty
-  override def yah(res: Seq[String]) = {
-    def filtered = res filter (_ contains "public final class Betty")
-    4 == filtered.size
-  }
-}
diff --git a/test/files/run/repl-javap-outdir-funs.flags b/test/files/run/repl-javap-outdir-funs.flags
deleted file mode 100644
index ac96850b69..0000000000
--- a/test/files/run/repl-javap-outdir-funs.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ydelambdafy:inline
\ No newline at end of file
diff --git a/test/files/run/repl-javap-outdir-funs/foo_1.scala b/test/files/run/repl-javap-outdir-funs/foo_1.scala
deleted file mode 100644
index 9b98e94733..0000000000
--- a/test/files/run/repl-javap-outdir-funs/foo_1.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-
-package disktest
-
-class Foo {
-  def m(vs: List[Int]) = vs map (_ + 1)
-}
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
deleted file mode 100644
index af9651a8a3..0000000000
--- a/test/files/run/repl-javap-outdir-funs/run-repl_7.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-import scala.tools.partest.JavapTest
-
-object Test extends JavapTest {
-  // note the '-fun': it makes :javap search for some anonfun.
-  // for that reason, this test has a flags file that forces delambdafy:inline (doesn't allow :method)
-  def code = """
-    |:javap -fun disktest/Foo.class
-  """.stripMargin
-
-  override def yah(res: Seq[String]) =
-    // It's currently unknown why this test fails on Avian with
-    // “Failed: No anonfuns found.”, skip it for now. See SI-7630.
-    if (scala.tools.partest.utils.Properties.isAvian)
-      true
-    else {
-      val r = "public final class disktest.Foo.*extends scala.runtime.AbstractFunction1".r
-      def filtered = res filter (r.findFirstIn(_).nonEmpty)
-      1 == filtered.size
-    }
-}
diff --git a/test/files/run/repl-javap.scala b/test/files/run/repl-javap.scala
index 7a19852d4e..25e72f3b13 100644
--- a/test/files/run/repl-javap.scala
+++ b/test/files/run/repl-javap.scala
@@ -7,7 +7,8 @@ object Test extends JavapTest {
   """.stripMargin
 
   override def yah(res: Seq[String]) = {
-    def filtered = res filter (_ contains "public class Betty")
+    val r = """public class \S*Betty""".r.unanchored
+    def filtered = res filter { case r(_*) => true ; case _ => false }
     1 == filtered.size
   }
 }