Attachment #193439 for bug #342671

Lines 1-5 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/ast/ParameterizedQualifiedTypeReference.java (-8 / +9 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2010 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 128-133 Link Here
128	}	128	}
129	}	129	}
130	this.bits \|= ASTNode.DidResolve;	130	this.bits \|= ASTNode.DidResolve;
		131	TypeBinding type = internalResolveLeafType(scope, checkBounds);
		132	createArrayType(scope);
		133	return type == null ? type : this.resolvedType;
		134	}
		135	private TypeBinding internalResolveLeafType(Scope scope, boolean checkBounds) {
131	boolean isClassScope = scope.kind == Scope.CLASS_SCOPE;	136	boolean isClassScope = scope.kind == Scope.CLASS_SCOPE;
132	Binding binding = scope.getPackage(this.tokens);	137	Binding binding = scope.getPackage(this.tokens);
133	if (binding != null && !binding.isValidBinding()) {	138	if (binding != null && !binding.isValidBinding()) {
Lines 236-246 Link Here
236	this.resolvedType = (qualifyingType != null && qualifyingType.isParameterizedType())	241	this.resolvedType = (qualifyingType != null && qualifyingType.isParameterizedType())
237	? scope.environment().createParameterizedType(currentOriginal, null, qualifyingType)	242	? scope.environment().createParameterizedType(currentOriginal, null, qualifyingType)
238	: currentType;	243	: currentType;
239	if (this.dimensions > 0) {
240	if (this.dimensions > 255)
241	scope.problemReporter().tooManyDimensions(this);
242	this.resolvedType = scope.createArrayType(this.resolvedType, this.dimensions);
243	}
244	return this.resolvedType;	244	return this.resolvedType;
245	} else if (argLength != typeVariables.length) { // check arity	245	} else if (argLength != typeVariables.length) { // check arity
246	scope.problemReporter().incorrectArityForParameterizedType(this, currentType, argTypes, i);	246	scope.problemReporter().incorrectArityForParameterizedType(this, currentType, argTypes, i);
Lines 283-295 Link Here
283	reportDeprecatedType(qualifyingType, scope, i);	283	reportDeprecatedType(qualifyingType, scope, i);
284	this.resolvedType = qualifyingType;	284	this.resolvedType = qualifyingType;
285	}	285	}
286	// array type ?	286	return this.resolvedType;
		287	}
		288	public void createArrayType(Scope scope) {
287	if (this.dimensions > 0) {	289	if (this.dimensions > 0) {
288	if (this.dimensions > 255)	290	if (this.dimensions > 255)
289	scope.problemReporter().tooManyDimensions(this);	291	scope.problemReporter().tooManyDimensions(this);
290	this.resolvedType = scope.createArrayType(this.resolvedType, this.dimensions);	292	this.resolvedType = scope.createArrayType(this.resolvedType, this.dimensions);
291	}	293	}
292	return this.resolvedType;
293	}	294	}
294		295
295	public StringBuffer printExpression(int indent, StringBuffer output) {	296	public StringBuffer printExpression(int indent, StringBuffer output) {




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

				}
			}
		}
		boolean hasGenericError = false;
		ReferenceBinding currentType;
		this.bits |= ASTNode.DidResolve;
		TypeBinding type = internalResolveLeafType(scope, enclosingType, checkBounds);
		// handle three different outcomes:
		if (type == null) {		 
			this.resolvedType = createArrayType(scope, this.resolvedType);
			return null;							// no useful type, but still captured dimensions into this.resolvedType
		} else {
			type = createArrayType(scope, type);
			if (!this.resolvedType.isValidBinding())
				return type;						// found some error, but could recover useful type (like closestMatch)	
			else 
				return this.resolvedType = type; 	// no complaint, keep fully resolved type (incl. dimensions)
		}
	}
	private TypeBinding internalResolveLeafType(Scope scope, ReferenceBinding enclosingType, boolean checkBounds) {
		ReferenceBinding currentType;
		if (enclosingType == null) {
			this.resolvedType = scope.getType(this.token);
			if (this.resolvedType.isValidBinding()) {
				currentType = (ReferenceBinding) this.resolvedType;
			} else {
				
				reportInvalidType(scope);
				switch (this.resolvedType.problemId()) {
					case ProblemReasons.NotFound :

		} else { // resolving member type (relatively to enclosingType)
			this.resolvedType = currentType = scope.getMemberType(this.token, enclosingType);
			if (!this.resolvedType.isValidBinding()) {
				hasGenericError = true;
				scope.problemReporter().invalidEnclosingType(this, currentType, enclosingType);
				return null;
			}

			}
			// resilience do not rebuild a parameterized type unless compliance is allowing it
			if (!isCompliant15) {
				if (!this.resolvedType.isValidBinding())
					return currentType;
				return this.resolvedType = currentType;
					if (this.dimensions > 255)
						scope.problemReporter().tooManyDimensions(this);
					type = scope.createArrayType(type, this.dimensions);
				}
				if (hasGenericError)
					return type;
				return this.resolvedType = type;
			}
			// if missing generic type, and compliance >= 1.5, then will rebuild a parameterized binding
		} else if (argLength != typeVariables.length) { // check arity

		if (isTypeUseDeprecated(parameterizedType, scope))
			reportDeprecatedType(parameterizedType, scope);

		if (!this.resolvedType.isValidBinding()) {
			return parameterizedType;
		}
		return this.resolvedType = parameterizedType;
	}
	public TypeBinding createArrayType(Scope scope, TypeBinding type) {
		if (this.dimensions > 0) {
			if (this.dimensions > 255)
				scope.problemReporter().tooManyDimensions(this);
			return scope.createArrayType(type, this.dimensions);
		}
		if (hasGenericError) {
			return type;
		}
		return type;
	}

	public StringBuffer printExpression(int indent, StringBuffer output){




						return null;
					}
					ArrayType arrayType = (ArrayType) type;
					ArrayBinding arrayBinding = (ArrayBinding) typeBinding;
					return getTypeBinding(this.scope.createArrayType(arrayBinding.leafComponentType, arrayType.getDimensions()));
						return getTypeBinding(this.scope.createArrayType(arrayBinding.leafComponentType, arrayType.getDimensions()));
					}
					return getTypeBinding(this.scope.createArrayType(typeBinding, arrayType.getDimensions()));
				}
				if (typeBinding.isArrayType()) {
					typeBinding = ((ArrayBinding) typeBinding).leafComponentType;

					if (this.scope == null) {
						return null;
					}
					ArrayBinding arrayBinding = (ArrayBinding) binding;
					return getTypeBinding(this.scope.createArrayType(arrayBinding.leafComponentType, arrayType.getDimensions()));
						return getTypeBinding(this.scope.createArrayType(arrayBinding.leafComponentType, arrayType.getDimensions()));
					}
					return getTypeBinding(this.scope.createArrayType(binding, arrayType.getDimensions()));
				} else if (binding.isArrayType()) {
					ArrayBinding arrayBinding = (ArrayBinding) binding;
					return getTypeBinding(arrayBinding.leafComponentType);




	static {
//		TESTS_NUMBERS = new int[] { 351, 352 };
//		TESTS_RANGE = new int[] { 325, -1 };
//		TESTS_NAMES = new String[] {"test035"};
	}
	public static Test suite() {
		return buildModelTestSuite(ASTConverter15Test.class);

		assertEquals("Wrong fully qualified name", "test0351.I1[]", typeBinding.getQualifiedName());
	}
	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=342671
	public void test0351a() throws JavaModelException {
		ICompilationUnit sourceUnit = getCompilationUnit("Converter15" , "src", "test0351", "X.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
		ASTNode result = runJLS3Conversion(sourceUnit, true, true);
		assertTrue("Not a compilation unit", result.getNodeType() == ASTNode.COMPILATION_UNIT);
		CompilationUnit unit = (CompilationUnit) result;
		MethodDeclaration methodDeclaration = (MethodDeclaration) getASTNode(unit, 0, 0);
		Type componentType = ((ArrayType)methodDeclaration.getReturnType2()).getComponentType();
		ITypeBinding typeBinding = componentType.resolveBinding();
		assertEquals("Wrong fully qualified name", "test0351.I1", typeBinding.getQualifiedName());
	}
	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=342671
	public void test0352() throws JavaModelException {
		ICompilationUnit sourceUnit = getCompilationUnit("Converter15" , "src", "test0352", "X.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
		ASTNode result = runJLS3Conversion(sourceUnit, true, true);

Return to bug 342671

Lines 1523-1533 Link Here

(-)dom/org/eclipse/jdt/core/dom/DefaultBindingResolver.java (-10 / +4 lines)
1523	return null;	1523	return null;
1524	}	1524	}
1525	ArrayType arrayType = (ArrayType) type;	1525	ArrayType arrayType = (ArrayType) type;
1526	if (typeBinding.isArrayType()) {	1526	ArrayBinding arrayBinding = (ArrayBinding) typeBinding;
1527	ArrayBinding arrayBinding = (ArrayBinding) typeBinding;	1527	return getTypeBinding(this.scope.createArrayType(arrayBinding.leafComponentType, arrayType.getDimensions()));
1528	return getTypeBinding(this.scope.createArrayType(arrayBinding.leafComponentType, arrayType.getDimensions()));
1529	}
1530	return getTypeBinding(this.scope.createArrayType(typeBinding, arrayType.getDimensions()));
1531	}	1528	}
1532	if (typeBinding.isArrayType()) {	1529	if (typeBinding.isArrayType()) {
1533	typeBinding = ((ArrayBinding) typeBinding).leafComponentType;	1530	typeBinding = ((ArrayBinding) typeBinding).leafComponentType;
Lines 1567-1577 Link Here
1567	if (this.scope == null) {	1564	if (this.scope == null) {
1568	return null;	1565	return null;
1569	}	1566	}
1570	if (binding.isArrayType()) {	1567	ArrayBinding arrayBinding = (ArrayBinding) binding;
1571	ArrayBinding arrayBinding = (ArrayBinding) binding;	1568	return getTypeBinding(this.scope.createArrayType(arrayBinding.leafComponentType, arrayType.getDimensions()));
1572	return getTypeBinding(this.scope.createArrayType(arrayBinding.leafComponentType, arrayType.getDimensions()));
1573	}
1574	return getTypeBinding(this.scope.createArrayType(binding, arrayType.getDimensions()));
1575	} else if (binding.isArrayType()) {	1569	} else if (binding.isArrayType()) {
1576	ArrayBinding arrayBinding = (ArrayBinding) binding;	1570	ArrayBinding arrayBinding = (ArrayBinding) binding;
1577	return getTypeBinding(arrayBinding.leafComponentType);	1571	return getTypeBinding(arrayBinding.leafComponentType);

Lines 49-55 Link Here

(-)src/org/eclipse/jdt/core/tests/dom/ASTConverter15Test.java (-1 / +12 lines)
49	static {	49	static {
50	// TESTS_NUMBERS = new int[] { 351, 352 };	50	// TESTS_NUMBERS = new int[] { 351, 352 };
51	// TESTS_RANGE = new int[] { 325, -1 };	51	// TESTS_RANGE = new int[] { 325, -1 };
52	// TESTS_NAMES = new String[] {"test0204"};	52	// TESTS_NAMES = new String[] {"test035"};
53	}	53	}
54	public static Test suite() {	54	public static Test suite() {
55	return buildModelTestSuite(ASTConverter15Test.class);	55	return buildModelTestSuite(ASTConverter15Test.class);
Lines 11295-11300 Link Here
11295	assertEquals("Wrong fully qualified name", "test0351.I1[]", typeBinding.getQualifiedName());	11295	assertEquals("Wrong fully qualified name", "test0351.I1[]", typeBinding.getQualifiedName());
11296	}	11296	}
11297	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=342671	11297	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=342671
		11298	public void test0351a() throws JavaModelException {
		11299	ICompilationUnit sourceUnit = getCompilationUnit("Converter15" , "src", "test0351", "X.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
		11300	ASTNode result = runJLS3Conversion(sourceUnit, true, true);
		11301	assertTrue("Not a compilation unit", result.getNodeType() == ASTNode.COMPILATION_UNIT);
		11302	CompilationUnit unit = (CompilationUnit) result;
		11303	MethodDeclaration methodDeclaration = (MethodDeclaration) getASTNode(unit, 0, 0);
		11304	Type componentType = ((ArrayType)methodDeclaration.getReturnType2()).getComponentType();
		11305	ITypeBinding typeBinding = componentType.resolveBinding();
		11306	assertEquals("Wrong fully qualified name", "test0351.I1", typeBinding.getQualifiedName());
		11307	}
		11308	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=342671
11298	public void test0352() throws JavaModelException {	11309	public void test0352() throws JavaModelException {
11299	ICompilationUnit sourceUnit = getCompilationUnit("Converter15" , "src", "test0352", "X.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$	11310	ICompilationUnit sourceUnit = getCompilationUnit("Converter15" , "src", "test0352", "X.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
11300	ASTNode result = runJLS3Conversion(sourceUnit, true, true);	11311	ASTNode result = runJLS3Conversion(sourceUnit, true, true);