improves showRaw

addresses concerns raised in http://groups.google.com/group/scala-user/browse_thread/thread/de5a5be2e083cf8e

5 files changed, 8 insertions, 43 deletions

diff --git a/src/compiler/scala/reflect/reify/utils/NodePrinters.scala b/src/compiler/scala/reflect/reify/utils/NodePrinters.scala
index ce0ab2196a..7214da597e 100644
--- a/src/compiler/scala/reflect/reify/utils/NodePrinters.scala
+++ b/src/compiler/scala/reflect/reify/utils/NodePrinters.scala
@@ -15,41 +15,6 @@ trait NodePrinters {
   import Flag._
 
   object reifiedNodeToString extends (Tree => String) {
-    // [Eugene++ to Martin] can we do better?
-    // didn't want to invent anything myself in order not to interfere with your line of thought
-    def bitsToFlags(bits: String): String = {
-      val flags = bits.toLong
-      if (flags == NoFlags) nme.NoFlags.toString
-      else {
-        val s_flags = new collection.mutable.ListBuffer[String]
-        if (flags containsAll TRAIT) s_flags += "TRAIT"
-        if (flags containsAll MODULE) s_flags += "MODULE"
-        if (flags containsAll MUTABLE) s_flags += "MUTABLE"
-        if (flags containsAll PACKAGE) s_flags += "PACKAGE"
-        if (flags containsAll METHOD) s_flags += "METHOD"
-        if (flags containsAll DEFERRED) s_flags += "DEFERRED"
-        if (flags containsAll ABSTRACT) s_flags += "ABSTRACT"
-        if (flags containsAll FINAL) s_flags += "FINAL"
-        if (flags containsAll SEALED) s_flags += "SEALED"
-        if (flags containsAll IMPLICIT) s_flags += "IMPLICIT"
-        if (flags containsAll LAZY) s_flags += "LAZY"
-        if (flags containsAll OVERRIDE) s_flags += "OVERRIDE"
-        if (flags containsAll PRIVATE) s_flags += "PRIVATE"
-        if (flags containsAll PROTECTED) s_flags += "PROTECTED"
-        if (flags containsAll CASE) s_flags += "CASE"
-        if (flags containsAll ABSOVERRIDE) s_flags += "ABSOVERRIDE"
-        if (flags containsAll BYNAMEPARAM) s_flags += "BYNAMEPARAM"
-        if (flags containsAll PARAM) s_flags += "PARAM"
-        if (flags containsAll PARAMACCESSOR) s_flags += "PARAMACCESSOR"
-        if (flags containsAll CASEACCESSOR) s_flags += "CASEACCESSOR"
-        if (flags containsAll COVARIANT) s_flags += "COVARIANT"
-        if (flags containsAll CONTRAVARIANT) s_flags += "CONTRAVARIANT"
-        if (flags containsAll DEFAULTPARAM) s_flags += "DEFAULTPARAM"
-        if (flags containsAll INTERFACE) s_flags += "INTERFACE"
-        s_flags mkString " | "
-      }
-    }
-
     def apply(tree: Tree): String = {
       var mirrorIsUsed = false
       var flagsAreUsed = false
@@ -70,7 +35,7 @@ trait NodePrinters {
         s = s.replace("immutable.this.Nil", "List()")
         s = """build\.flagsFromBits\((\d+)[lL]\)""".r.replaceAllIn(s, m => {
           flagsAreUsed = true
-          bitsToFlags(m.group(1))
+          show(m.group(1).toLong)
         })
         s = s.replace("Modifiers(0L, newTypeName(\"\"), List())", "Modifiers()")
         s = """Modifiers\((\d+)[lL], newTypeName\("(.*?)"\), List\((.*?)\)\)""".r.replaceAllIn(s, m => {
@@ -87,7 +52,7 @@ trait NodePrinters {
           val bits = m.group(1)
           if (buf.nonEmpty || bits != "0L") {
             flagsAreUsed = true
-            buf.append(bitsToFlags(bits))
+            buf.append(show(bits.toLong))
           }
 
           val replacement = "Modifiers(" + buf.reverse.mkString(", ")  + ")"
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index 787c9c7f57..38a08bbd60 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -39,7 +39,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
     with Plugins
     with PhaseAssembly
     with Trees
-    with TreePrinters
+    with Printers
     with DocComments
     with Positions { self =>
 
diff --git a/src/compiler/scala/tools/nsc/ast/NodePrinters.scala b/src/compiler/scala/tools/nsc/ast/NodePrinters.scala
index ba1f3b2e3c..4afd3545b9 100644
--- a/src/compiler/scala/tools/nsc/ast/NodePrinters.scala
+++ b/src/compiler/scala/tools/nsc/ast/NodePrinters.scala
@@ -146,7 +146,7 @@ abstract class NodePrinters {
     }
     def printModifiers(tree: MemberDef) {
       // [Eugene++] there's most likely a bug here (?)
-      // see `TreePrinters.printAnnotations` for more information
+      // see `Printers.printAnnotations` for more information
       val annots0 = tree.symbol.annotations match {
         case Nil  => tree.mods.annotations
         case xs   => xs map annotationInfoToString
diff --git a/src/compiler/scala/tools/nsc/ast/TreePrinters.scala b/src/compiler/scala/tools/nsc/ast/Printers.scala
index 3371353f25..94d0c4f45e 100644
--- a/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
+++ b/src/compiler/scala/tools/nsc/ast/Printers.scala
@@ -10,7 +10,7 @@ import java.io.{ OutputStream, PrintWriter, StringWriter, Writer }
 import symtab.Flags._
 import symtab.SymbolTable
 
-trait TreePrinters extends reflect.internal.TreePrinters { this: Global =>
+trait Printers extends reflect.internal.Printers { this: Global =>
 
   import treeInfo.{ IsTrue, IsFalse }
 
@@ -276,8 +276,8 @@ trait TreePrinters extends reflect.internal.TreePrinters { this: Global =>
     }
   }
 
-  def asString(t: Tree): String = show(t, newStandardTreePrinter)
-  def asCompactString(t: Tree): String = show(t, newCompactTreePrinter)
+  def asString(t: Tree): String = render(t, newStandardTreePrinter, settings.printtypes.value, settings.uniqid.value, settings.Yshowsymkinds.value)
+  def asCompactString(t: Tree): String = render(t, newCompactTreePrinter, settings.printtypes.value, settings.uniqid.value, settings.Yshowsymkinds.value)
 
   def newStandardTreePrinter(writer: PrintWriter): TreePrinter = new TreePrinter(writer)
   def newStandardTreePrinter(stream: OutputStream): TreePrinter = newStandardTreePrinter(new PrintWriter(stream))
diff --git a/src/compiler/scala/tools/nsc/matching/MatchSupport.scala b/src/compiler/scala/tools/nsc/matching/MatchSupport.scala
index 72e6f32af1..16761144d7 100644
--- a/src/compiler/scala/tools/nsc/matching/MatchSupport.scala
+++ b/src/compiler/scala/tools/nsc/matching/MatchSupport.scala
@@ -7,7 +7,7 @@ package scala.tools.nsc
 package matching
 
 import transform.ExplicitOuter
-import ast.{ TreePrinters, Trees }
+import ast.{ Printers, Trees }
 import java.io.{ StringWriter, PrintWriter }
 import annotation.elidable
 import language.postfixOps