SI-9277 Downgrade marginal javap features

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

Author: som-snytt

src/repl/scala/tools/nsc/interpreter/ILoop.scala

@@ -275,8 +275,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter)
     }
   }
 
-  protected def newJavap() =
-    JavapClass(addToolsJarToLoader(), new IMain.ReplStrippingWriter(intp), Some(intp))
+  protected def newJavap() = JavapClass(addToolsJarToLoader(), new IMain.ReplStrippingWriter(intp), intp)
 
   private lazy val javap = substituteAndLog[Javap]("javap", NoJavap)(newJavap())
 
@@ -315,7 +314,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter)
     if (javap == null)
       s":javap unavailable, no tools.jar at $jdkHome.  Set JDK_HOME."
     else if (line == "")
-      ":javap [-lcsvp] [path1 path2 ...]"
+      Javap.helpText
     else
       javap(words(line)) foreach { res =>
         if (res.isError) return s"Failed: ${res.value}"

src/repl/scala/tools/nsc/interpreter/JavapClass.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.

test/files/run/repl-javap-def.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
   }
 }