MetaType.getPreferredTypeSystem(Type)

Author: panchenko

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/TypeSystemImpl.java

@@ -96,8 +96,37 @@ public IValue valueOf(IRMember member) {
 	private final Map<Type, RTypeDeclaration> declarations = new HashMap<Type, RTypeDeclaration>();
 
 	public IRTypeDeclaration convert(Type type) {
+		return convert0(resolveType(type));
+	}
+
+	final IRTypeDeclaration convert0(Type type) {
+		final ITypeSystem preferred = type.getMetaType()
+				.getPreferredTypeSystem(type);
+		if (preferred != null && preferred != this) {
+			if (preferred instanceof TypeSystemImpl) {
+				return ((TypeSystemImpl) preferred).convert1(type);
+			} else {
+				return preferred.convert(type);
+			}
+		}
+		return convert1(type);
+	}
+
+	final IRTypeDeclaration convert1(Type type) {
+		synchronized (lock) {
+			return convertType(type, null);
+		}
+	}
+
+	/**
+	 * Clears the cached data of this type system.
+	 */
+	public void reset() {
 		synchronized (lock) {
-			return convertType(type, new HashSet<Type>());
+			declarations.clear();
+			parameterized.clear();
+			contextualized.clear();
+			values.clear();
 		}
 	}
 
@@ -108,6 +137,9 @@ private RTypeDeclaration convertType(Type type, Set<Type> processedTypes) {
 				return declaration;
 			}
 		}
+		if (processedTypes == null) {
+			processedTypes = new HashSet<Type>();
+		}
 		if (!processedTypes.add(type)) {
 			return null;
 		}
@@ -131,9 +163,12 @@ private void buildType(final RTypeDeclaration declaration, Type type,
 					declaration.setSuperType(parameterizeType(generic, RTypes
 							.convert(this, ((ParameterizedType) superType)
 									.getActualTypeArguments())));
-				} else {
+				} else if (declaration.isParameterized()) {
 					declaration.setSuperType(parameterizeType(generic,
 							declaration.getActualTypeArguments()));
+				} else {
+					declaration.setSuperType(convertType(generic,
+							processedTypes));
 				}
 			} else {
 				declaration.setSuperType(convertType(superType.getTarget(),
@@ -304,12 +339,11 @@ public String toString() {
 	 */
 	public IRTypeDeclaration parameterize(Type target, List<IRType> parameters) {
 		target = resolveType(target);
+		if (!(target instanceof GenericType)) {
+			return convert0(target);
+		}
 		synchronized (lock) {
-			if (target instanceof GenericType) {
-				return parameterizeType((GenericType) target, parameters);
-			} else {
-				return convertType(target, new HashSet<Type>());
-			}
+			return parameterizeType((GenericType) target, parameters);
 		}
 	}
 

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/DefaultMetaType.java

@@ -11,7 +11,10 @@
  *******************************************************************************/
 package org.eclipse.dltk.javascript.typeinfo;
 
+import org.eclipse.dltk.javascript.core.Types;
+import org.eclipse.dltk.javascript.internal.core.TypeSystems;
 import org.eclipse.dltk.javascript.typeinfo.model.Type;
+import org.eclipse.emf.ecore.resource.Resource;
 
 public abstract class DefaultMetaType implements MetaType {
 
@@ -36,4 +39,12 @@ public String toString() {
 		return getId();
 	}
 
+	public ITypeSystem getPreferredTypeSystem(Type type) {
+		final Resource resource = type.eResource();
+		if (resource != null && resource == Types.OBJECT.eResource()) {
+			return TypeSystems.GLOBAL;
+		}
+		return null;
+	}
+
 }

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/MetaType.java

@@ -44,4 +44,10 @@ public interface MetaType {
 	 */
 	IRType toRType(ITypeSystem typeSystem, IRTypeDeclaration declaration);
 
+	/**
+	 * Returns the preferred type system for converting the specified type to
+	 * {@link IRTypeDeclaration} or <code>null</code> if no preference.
+	 */
+	ITypeSystem getPreferredTypeSystem(Type type);
+
 }

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/model/impl/ClassTypeImpl.java

@@ -147,7 +147,7 @@ public IRType toRType(ITypeSystem typeSystem) {
 		if (t != null && t.isProxy() && typeSystem != null) {
 			t = typeSystem.resolveType(t);
 		}
-		return RTypes.classType(t);
+		return RTypes.classType(typeSystem, t);
     }
 
     /**

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/model/impl/SimpleTypeImpl.java

@@ -131,7 +131,7 @@ public IRType toRType(ITypeSystem typeSystem) {
 		if (t.isProxy() && typeSystem != null) {
 			t = typeSystem.resolveType(t);
 		}
-		return RTypes.simple(t);
+		return RTypes.simple(typeSystem, t);
     }
 
 	@Override