diff options
author | Den Shabalin <den.shabalin@gmail.com> | 2012-12-08 19:43:06 +0100 |
---|---|---|
committer | Eugene Burmako <xeno.by@gmail.com> | 2012-12-25 01:58:40 +0100 |
commit | 136bf70d79df1d8a65b98e094bbbc26cb5e3a96b (patch) | |
tree | c3a1b3bedd0ab8422a196cec0f2468de0e8e8f12 | |
parent | c2297185296d68006dc07a86b35ca4ca0ebbdff7 (diff) | |
download | scala-136bf70d79df1d8a65b98e094bbbc26cb5e3a96b.tar.gz scala-136bf70d79df1d8a65b98e094bbbc26cb5e3a96b.tar.bz2 scala-136bf70d79df1d8a65b98e094bbbc26cb5e3a96b.zip |
Changes tree pretty printer to use shorter name constructors
-rw-r--r-- | src/compiler/scala/reflect/reify/utils/NodePrinters.scala | 6 | ||||
-rw-r--r-- | src/reflect/scala/reflect/internal/Printers.scala | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/reflect/reify/utils/NodePrinters.scala b/src/compiler/scala/reflect/reify/utils/NodePrinters.scala index 86e50e0a68..0740f8d0b6 100644 --- a/src/compiler/scala/reflect/reify/utils/NodePrinters.scala +++ b/src/compiler/scala/reflect/reify/utils/NodePrinters.scala @@ -36,8 +36,8 @@ trait NodePrinters { flagsAreUsed = true show(m.group(1).toLong) }) - s = s.replace("Modifiers(0L, newTypeName(\"\"), List())", "Modifiers()") - s = """Modifiers\((\d+)[lL], newTypeName\("(.*?)"\), List\((.*?)\)\)""".r.replaceAllIn(s, m => { + s = s.replace("Modifiers(0L, TypeName(\"\"), List())", "Modifiers()") + s = """Modifiers\((\d+)[lL], TypeName\("(.*?)"\), List\((.*?)\)\)""".r.replaceAllIn(s, m => { val buf = new scala.collection.mutable.ListBuffer[String] val annotations = m.group(3) @@ -46,7 +46,7 @@ trait NodePrinters { val privateWithin = "" + m.group(2) if (buf.nonEmpty || privateWithin != "") - buf.append("newTypeName(\"" + privateWithin + "\")") + buf.append("TypeName(\"" + privateWithin + "\")") val bits = m.group(1) if (buf.nonEmpty || bits != "0L") { diff --git a/src/reflect/scala/reflect/internal/Printers.scala b/src/reflect/scala/reflect/internal/Printers.scala index 2a3525206f..d36d439077 100644 --- a/src/reflect/scala/reflect/internal/Printers.scala +++ b/src/reflect/scala/reflect/internal/Printers.scala @@ -672,7 +672,7 @@ trait Printers extends api.Printers { self: SymbolTable => case nme.CONSTRUCTOR => "nme.CONSTRUCTOR" case nme.ROOTPKG => "nme.ROOTPKG" case _ => - val prefix = if (name.isTermName) "newTermName(\"" else "newTypeName(\"" + val prefix = if (name.isTermName) "TermName(\"" else "TypeName(\"" prefix + name.toString + "\")" } |