diff options
author | paltherr <paltherr@epfl.ch> | 2004-02-29 23:48:34 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2004-02-29 23:48:34 +0000 |
commit | dc15aa8a2727e184157da4fdd8f1b718fd9b2b0a (patch) | |
tree | bddf2b80c0e3306a8c79d9e20af359c0fd209bc2 /sources/scalac | |
parent | 6034828756b48406cae1c0e08ab00c9c4de43ea8 (diff) | |
download | scala-dc15aa8a2727e184157da4fdd8f1b718fd9b2b0a.tar.gz scala-dc15aa8a2727e184157da4fdd8f1b718fd9b2b0a.tar.bz2 scala-dc15aa8a2727e184157da4fdd8f1b718fd9b2b0a.zip |
- Replaced Symbol.fullNameString calls by Primi...
- Replaced Symbol.fullNameString calls by Primitives.getCLRClassName
calls
Diffstat (limited to 'sources/scalac')
-rw-r--r-- | sources/scalac/backend/msil/TypeCreator.java | 6 | ||||
-rw-r--r-- | sources/scalac/symtab/classfile/CLRClassParser.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sources/scalac/backend/msil/TypeCreator.java b/sources/scalac/backend/msil/TypeCreator.java index 63f44bf3f8..4dc64783fd 100644 --- a/sources/scalac/backend/msil/TypeCreator.java +++ b/sources/scalac/backend/msil/TypeCreator.java @@ -431,7 +431,7 @@ final class TypeCreator { type = (Type)m; else if (sym.isJava()) { // if (sym.isExternal()) { - type = getType(sym.fullNameString()); + type = getType(global.primitives.getCLRClassName(sym)); } if (type == null) { final Symbol owner = sym.owner(); @@ -451,7 +451,7 @@ final class TypeCreator { + (sym.isModuleClass() ? "$" : ""); type = outer.GetNestedType(name); } else { - String fullname = sym.type().symbol().fullNameString() + + String fullname = global.primitives.getCLRClassName(sym.type().symbol()) + (sym.isModuleClass() ? "$" : ""); type = getType(fullname); } @@ -512,7 +512,7 @@ final class TypeCreator { final Symbol owner = clazz.owner(); final String typeName = - (owner.isClass() ? clazz.nameString() : clazz.fullNameString()) + + (owner.isClass() ? clazz.nameString() : global.primitives.getCLRClassName(clazz)) + (clazz.isModuleClass() ? "$" : ""); final ModuleBuilder module = gen.getCurrentModule(); diff --git a/sources/scalac/symtab/classfile/CLRClassParser.java b/sources/scalac/symtab/classfile/CLRClassParser.java index e3dff6047a..1190da66c5 100644 --- a/sources/scalac/symtab/classfile/CLRClassParser.java +++ b/sources/scalac/symtab/classfile/CLRClassParser.java @@ -57,7 +57,7 @@ public class CLRClassParser extends ClassParser { Type type = (Type)importer.getMember(clazz); if (type == null) - type = Type.GetType(clazz.fullNameString()); + type = Type.GetType(global.primitives.getCLRClassName(clazz)); clazz.flags = translateAttributes(type); Type[] ifaces = type.getInterfaces(); scalac.symtab.Type[] baseTypes = new scalac.symtab.Type[ifaces.length+1]; |