Bassic support for dotp flags

Author: nicolasstucki

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -96,6 +96,7 @@ class ScalaSettings extends Settings.SettingGroup {
   val YnoPatmatOpt = BooleanSetting("-Yno-patmat-opt", "disable all pattern matching optimizations.")
   val YplainPrinter = BooleanSetting("-Yplain-printer", "Pretty-print using a plain printer.")
   val YprintSyms = BooleanSetting("-Yprint-syms", "when printing trees print info in symbols instead of corresponding info in trees.")
+  val YprintNoPrivate = BooleanSetting("-Y-print-no-private", "when printing trees print do not print private/protected members.")
   val YprintDebug = BooleanSetting("-Yprint-debug", "when printing trees, print some extra information useful for debugging.")
   val YtestPickler = BooleanSetting("-Ytest-pickler", "self-test for pickling functionality; should be used with -Ystop-after:pickler")
   val YcheckReentrant = BooleanSetting("-Ycheck-reentrant", "check that compiled program does not contain vars that can be accessed from a global root.")

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -192,7 +192,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
   }
 
   def blockText[T >: Untyped](trees: List[Tree[T]]): Text =
-    ("{" ~ toText(trees, "\n") ~ "}").close
+    ("{" ~ toText(trees.filter(t => !t.symbol.isPrivate), "\n") ~ "}").close
 
   override def toText[T >: Untyped](tree: Tree[T]): Text = controlled {
 
@@ -318,6 +318,8 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
           case _ => false
         }
         params ::: rest
+      } else if (ctx.settings.YprintNoPrivate.value) {
+        impl.body.filter(t => !t.symbol.isPrivate && !t.symbol.is(Protected))
       } else impl.body
 
       val bodyText = "{" ~~ selfText ~~ toTextGlobal(primaryConstrs ::: body, "\n") ~ "}"

compiler/src/dotty/tools/dotp/Main.scala

@@ -13,8 +13,28 @@ object Main extends dotc.Driver {
     new TASTYDecompiler
   }
 
-  override def setup(args: Array[String], rootCtx: Context): (List[String], Context) = {
-    val args1 = if (args.contains("-tasty")) args else args :+ "-tasty"
-    super.setup(args1, rootCtx)
+  override def setup(args0: Array[String], rootCtx: Context): (List[String], Context) = {
+    var args = args0
+    args = if (args.contains("-tasty")) args else args :+ "-tasty"
+    args = if (args.exists(a => a == "-private" || a == "-p")) args.filter(a => a != "-private" && a != "-p") else args :+ "-Y-print-no-private"
+    args = if (args.exists(a => a == "-code" || a == "-c")) args.filter(a => a != "-code" && a != "-c") else args :+ "-Yprint-syms"
+
+    if (args.contains("-help")) {
+      printHelp()
+      sys.exit(0)
+    } else super.setup(args, rootCtx)
+  }
+
+  private def printHelp(): Unit = {
+    val msg =
+      """dotp <option|class>*
+        |
+        |options:
+        |  -private | -p        Print private and protected members
+        |  -code | -c           Print implementations (code disassembly)
+        |  -classpath <path>    Classpath where to find the classes
+        |  -help                Print this message
+      """.stripMargin
+    println(msg)
   }
 }

project/scripts/sbtBootstrappedTests

@@ -37,7 +37,7 @@ mkdir out/scriptedtest2
 # check that `dotp` runs
 echo "testing ./bin/dotp"
 ./bin/dotp -classpath out/scriptedtest1 dotrtest.Test >  sbtdotr3.out
-if grep -e "def main(args: Array\[String\]): Unit =" sbtdotr3.out; then
+if grep -e "def main(args: Array\[String\]): Unit" sbtdotr3.out; then
     echo "output ok"
 else
     echo "failed output check"

project/scripts/sbtTests

@@ -29,7 +29,7 @@ fi
 # check that `sbt dotp` runs
 echo "testing sbt dotp"
 ./project/scripts/sbt ";dotp -tasty -classpath out/scriptedtest1 dotrtest.Test" >  sbtdotr3.out
-if grep -e "def main(args: Array\[String\]): Unit =" sbtdotr3.out; then
+if grep -e "def main(args: Array\[String\]): Unit" sbtdotr3.out; then
     echo "output ok"
 else
     echo "failed output check"