- Moved interpreter-specific code out of class ...

- Moved interpreter-specific code out of class SymbolTablePrinter

2 files changed, 26 insertions, 16 deletions

diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java
index 51ecb2a7a6..d8c46c4df6 100644
--- a/sources/scalac/Global.java
+++ b/sources/scalac/Global.java
@@ -438,11 +438,33 @@ public class  Global {
     }
 
     private String show(Symbol symbol) {
-        return new SymbolTablePrinter("  ").printSignature(symbol).toString();
+        return new InterpreterPrinter().printSignature(symbol).toString();
     }
 
     private String show(Type type) {
-        return new SymbolTablePrinter("  ").printType(type).toString();
+        return new InterpreterPrinter().printType(type).toString();
+    }
+
+    private class InterpreterPrinter extends SymbolTablePrinter {
+        public InterpreterPrinter() {
+            super("  ");
+        }
+        public String getSymbolName(Symbol symbol) {
+            String string = super.getSymbolName(symbol);
+            if (!debug) {
+                int index = string.indexOf('$');
+                if (index > 0) string = string.substring(0, index);
+            }
+            return string;
+        }
+        public String getSymbolFullName(Symbol symbol) {
+            String string = super.getSymbolFullName(symbol);
+            if (!debug) {
+                int index = string.indexOf('$');
+                if (index > 0) string = string.substring(0, index);
+            }
+            return string;
+        }
     }
 
     // !!! >>> Interpreter stuff
diff --git a/sources/scalac/symtab/SymbolTablePrinter.java b/sources/scalac/symtab/SymbolTablePrinter.java
index 5b829d4722..bb54020050 100644
--- a/sources/scalac/symtab/SymbolTablePrinter.java
+++ b/sources/scalac/symtab/SymbolTablePrinter.java
@@ -298,26 +298,14 @@ public class SymbolTablePrinter {
     public String getSymbolName(Symbol symbol) {
         Name name = symbol.name;
         if (!global.debug) name = NameTransformer.decode(name);
-        String string = name.toString();
-        // !!! move into InterpreterPrinter ?
-        if (!global.debug) {
-            int index = string.indexOf('$');
-            if (index > 0) string = string.substring(0, index);
-        }
-        return string;
+        return name.toString();
     }
 
     /** Returns the full name of the given symbol. */
     public String getSymbolFullName(Symbol symbol) {
         Name name = symbol.fullName();
         if (!global.debug) name = NameTransformer.decode(name);
-        String string = name.toString();
-        // !!! move into InterpreterPrinter ?
-        if (!global.debug) {
-            int index = string.indexOf('$');
-            if (index > 0) string = string.substring(0, index);
-        }
-        return string;
+        return name.toString();
     }
 
     /** Returns the inner string of the given symbol. */