summaryrefslogtreecommitdiff
path: root/sources/scalac/Global.java
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-03-24 17:04:05 +0000
committerpaltherr <paltherr@epfl.ch>2003-03-24 17:04:05 +0000
commite1dcdf1a7b57e0faa62af80e8454f2e612c93c93 (patch)
tree206b7f62bf80c4346a2e7a94b0d05ee8730bba6b /sources/scalac/Global.java
parent9cfe96647bc3d349d05f88ba058de807236603ff (diff)
downloadscala-e1dcdf1a7b57e0faa62af80e8454f2e612c93c93.tar.gz
scala-e1dcdf1a7b57e0faa62af80e8454f2e612c93c93.tar.bz2
scala-e1dcdf1a7b57e0faa62af80e8454f2e612c93c93.zip
- Removed $console$* from siris-printed types
Diffstat (limited to 'sources/scalac/Global.java')
-rw-r--r--sources/scalac/Global.java4
1 files changed, 3 insertions, 1 deletions
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('.');
}