- Removed method symbolString

- Changed method print for Identifier

2 files changed, 28 insertions, 28 deletions

diff --git a/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala b/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
index 261325e178..58c1ffa7a9 100644
--- a/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
+++ b/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
@@ -114,10 +114,18 @@ class TextTreePrinter(_out: PrintWriter, autoFlush: boolean) with TreePrinter {
     case Simple(str) => printString(str)
     case Literal(str) => printString(str)
     case Keyword(name) => printString(name)
-    case Identifier(sym, name, _) =>
-      printString(name);
-      if (sym != null && scalac_Global.instance.uniqid)
-	printString("#" + scalac_Global.instance.uniqueID.id(sym))
+    case Identifier(sym, name, usage) =>
+
+      if (sym != null) {
+        if (usage == SymbolUsage.Use)
+          printString(sym.simpleName().toString());
+        else
+          printString(sym.name.toString());
+        if (scalac_Global.instance.uniqid)
+	  printString("#" + scalac_Global.instance.uniqueID.id(sym))
+      } else {
+        printString(name);
+      }
     case Sequence(elements) => print(elements)
   }
 
@@ -543,15 +551,11 @@ class TextTreePrinter(_out: PrintWriter, autoFlush: boolean) with TreePrinter {
 
   // Printing of symbols
 
-  protected def symbolString(symbol: Symbol, name: Name): String =
-    if (symbol != null) symbol.simpleName().toString()
-    else name.toString();
-
   protected def printSymbolDefinition(symbol: Symbol, name: Name): unit =
-    print(Identifier(symbol, symbolString(symbol, name), Definition));
+    print(Identifier(symbol, name, Definition));
 
   protected def printSymbolUse(symbol: Symbol, name: Name): unit =
-    print(Identifier(symbol, symbolString(symbol, name), Use));
+    print(Identifier(symbol, name, Use));
 
   // Printing of trees
 
diff --git a/sources/scalac/ast/printer/TextTreePrinter.java b/sources/scalac/ast/printer/TextTreePrinter.java
index 9a8afbb1fc..f4aa3cc6ff 100644
--- a/sources/scalac/ast/printer/TextTreePrinter.java
+++ b/sources/scalac/ast/printer/TextTreePrinter.java
@@ -120,7 +120,7 @@ public class TextTreePrinter implements TreePrinter {
         public case Simple(String str);
         public case Literal(String str);
         public case Keyword(String name);
-        public case Identifier(Symbol symbol, String name, SymbolUsage usage);
+        public case Identifier(Symbol symbol, Name name, SymbolUsage usage);
         public case Sequence(Text[] elements);
     }
 
@@ -132,10 +132,17 @@ public class TextTreePrinter implements TreePrinter {
         case Simple(String str) : printString(str); break;
         case Literal(String str) : printString(str); break;
         case Keyword(String name) : printString(name); break;
-        case Identifier(Symbol sym, String name, _) :
-            printString(name);
-            if (sym != null && Global.instance.uniqid)
-                printString("#" + Global.instance.uniqueID.id(sym));
+        case Identifier(Symbol sym, Name name, SymbolUsage usage) :
+            if (sym != null) {
+                if (usage == SymbolUsage.Use)
+                    printString(sym.simpleName().toString());
+                else
+                    printString(sym.name.toString());
+                if (Global.instance.uniqid)
+                    printString("#" + Global.instance.uniqueID.id(sym));
+            } else {
+                printString(name.toString());
+            }
             break;
         case Sequence(Text[] elements) : print(elements); break;
         }
@@ -644,23 +651,12 @@ public class TextTreePrinter implements TreePrinter {
 
     // Printing of symbols
 
-    protected String symbolString(Symbol symbol, Name name) {
-        if (symbol != null)
-            return symbol.simpleName().toString();
-        else
-            return name.toString();
-    }
-
     protected void printSymbolDefinition(Symbol symbol, Name name) {
-        print(Text.Identifier(symbol,
-                              symbolString(symbol, name),
-                              SymbolUsage.Definition));
+        print(Text.Identifier(symbol, name, SymbolUsage.Definition));
     }
 
     protected void printSymbolUse(Symbol symbol, Name name) {
-        print(Text.Identifier(symbol,
-                              symbolString(symbol, name),
-                              SymbolUsage.Use));
+        print(Text.Identifier(symbol, name, SymbolUsage.Use));
     }
 
     // Printing of trees