- Changed name of ROOT to "<root>"

- Removed special cases for ROOT in SymbolTablePrinter

2 files changed, 1 insertions, 5 deletions

diff --git a/sources/scalac/symtab/Definitions.java b/sources/scalac/symtab/Definitions.java
index cd2299b4e6..f4dfe9560b 100644
--- a/sources/scalac/symtab/Definitions.java
+++ b/sources/scalac/symtab/Definitions.java
@@ -202,7 +202,7 @@ public class Definitions {
         // this is the root value; all top-level functions,
         // modules etc. are a member of this value
         ROOT = TermSymbol.newJavaPackageModule(
-            Names.EMPTY, Symbol.NONE, pparser);
+            Names.ROOT, Symbol.NONE, pparser);
         ROOT_CLASS = ROOT.moduleClass();
         // this is a prefix for all types inside of the anonymous package
         ROOT_TYPE = ROOT_CLASS.thisType();
diff --git a/sources/scalac/symtab/SymbolTablePrinter.java b/sources/scalac/symtab/SymbolTablePrinter.java
index 8c155b5e5c..d5ab0a2e41 100644
--- a/sources/scalac/symtab/SymbolTablePrinter.java
+++ b/sources/scalac/symtab/SymbolTablePrinter.java
@@ -360,7 +360,6 @@ public class SymbolTablePrinter {
 
     /** Prints the given symbol */
     public SymbolTablePrinter printSymbol(Symbol symbol) {
-        if (symbol.isRoot()) return print("<root package>");
         if (symbol.isAnonymousClass()) {
             print("<template>");
             return printSymbolUniqueId(symbol);
@@ -504,12 +503,10 @@ public class SymbolTablePrinter {
             return print("<notype>");
         case ThisType(Symbol sym):
             if (sym == Symbol.NONE) return print("<local>.this");
-            if (sym.isRoot()) return print("<root>.this");
             if ((sym.isAnonymousClass() || sym.isCompoundSym()) && !global.debug)
                 return print("this");
             return printSymbolName(sym).print(".this");
         case TypeRef(Type pre, Symbol sym, Type[] args):
-            if (sym.isRoot()) return print("<root>");
             if (!global.debug) {
                 if (type.isFunctionType())
                     return printFunctionType(args);
@@ -521,7 +518,6 @@ public class SymbolTablePrinter {
             if (args.length != 0) print('[').printTypes(args, ",").print(']');
             return this;
         case SingleType(Type pre, Symbol sym):
-            if (sym.isRoot()) return print("<root>");
             return printPrefix(pre).printSymbolName(sym);
         case CompoundType(Type[] parts, Scope members):
             return printTypes(parts," with ").space()