From e1dcdf1a7b57e0faa62af80e8454f2e612c93c93 Mon Sep 17 00:00:00 2001
From: paltherr <paltherr@epfl.ch>
Date: Mon, 24 Mar 2003 17:04:05 +0000
Subject: - Removed $console$* from siris-printed types

---
 sources/scalac/Global.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java
index c90332137b..20f66566bb 100644
--- a/sources/scalac/Global.java
+++ b/sources/scalac/Global.java
@@ -292,6 +292,7 @@ public class  Global {
     // !!! <<< Interpreter stuff
     public static final String CONSOLE_S = "$console$";
     private static final Name
+        CONSOLE_N               = Name.fromString(CONSOLE_S),
         INTERPRETER_N           = Name.fromString("Interpreter"),
         SCALA_INTERPRETER_N     = Name.fromString("scala.Interpreter"),
         SHOW_DEFINITION_N       = Name.fromString("showDefinition"),
@@ -361,7 +362,7 @@ public class  Global {
         for (int i = 0; i < unit.body.length; i++) {
             switch (unit.body[i]) {
             case ModuleDef(_, Name name, _, Tree.Template impl):
-                if (!name.toString().startsWith(CONSOLE_S)) break;
+                if (!name.startsWith(CONSOLE_N)) break;
                 if (impl.body.length <= 0) break;
                 imports.add(unit.body[i].symbol());
                 Tree last = impl.body[impl.body.length - 1];
@@ -477,6 +478,7 @@ public class  Global {
     private StringBuffer appendPrefix(StringBuffer buffer, Type prefix) {
         if (prefix.isSameAs(definitions.ROOT_TYPE)) return buffer;
         if (prefix.isSameAs(definitions.SCALA_TYPE)) return buffer;
+        if (prefix.symbol().name.startsWith(CONSOLE_N)) return buffer;
         return append(buffer, prefix).append('.');
     }
 
-- 
cgit v1.2.3