From 90d52624b93ef1102421a84a9971bd91640cc5ef Mon Sep 17 00:00:00 2001 From: mihaylov Date: Tue, 20 Jul 2004 16:40:18 +0000 Subject: - Hard coded the types of java.lang.Object and ... - Hard coded the types of java.lang.Object and java.lang.String --- sources/scalac/symtab/classfile/JavaTypeCreator.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'sources') diff --git a/sources/scalac/symtab/classfile/JavaTypeCreator.java b/sources/scalac/symtab/classfile/JavaTypeCreator.java index c5fb665696..d01f1923e2 100644 --- a/sources/scalac/symtab/classfile/JavaTypeCreator.java +++ b/sources/scalac/symtab/classfile/JavaTypeCreator.java @@ -100,6 +100,10 @@ public class JavaTypeCreator implements JavaTypeFactory { } public Type classType(String classname) { + if (classname.equals("java.lang.Object")) + return objectType(); + if (classname.equals("java.lang.String")) + return stringType(); return classType(definitions.getClass(classname)); } @@ -121,10 +125,7 @@ public class JavaTypeCreator implements JavaTypeFactory { return new MethodType(args, restpe); } private Type objToAny(Type tp) { - if (tp.isSameAs(OBJECT_TYPE)) - return ANY_TYPE; - else - return tp; + return tp.isSameAs(OBJECT_TYPE) ? ANY_TYPE : tp; } public Type packageType(Name packagename) { -- cgit v1.2.3