Attachment #226328 for bug #399453

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 399453
Collapse All | Expand All




/*******************************************************************************
 * Copyright (c) 2009, 2013 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

			"}\n";
	checkParse(CHECK_PARSER, source.toCharArray(), null, "test0137", expectedUnitToString);
}
public void test0138() throws IOException {
	String source = 
			"import java.lang.annotation.Target;\n" +
			"import static java.lang.annotation.ElementType.*;\n" +
			"public class X {\n" +
			"	public void foo() {\n" +
			"		int @Marker [][][] i = new @Marker2 int @Marker @Marker2 [2] @Marker @Marker2 [bar()] @Marker @Marker2 [];\n" +
			"		int @Marker [][][] j = new @Marker2 int @Marker @Marker2 [2] @Marker @Marker2 [X.bar2(2)] @Marker @Marker2 [];\n" +
			"	}\n" +
			"	public int bar() {\n" +
			"		return 2;\n" +
			"	}\n" +
			"	public static int bar2(int k) {\n" +
			"		return k;\n" + 
			"	}\n" +
			"}\n" +
			"@Target (java.lang.annotation.ElementType.TYPE_USE)\n" +
			"@interface Marker {}\n" +
			"@Target (java.lang.annotation.ElementType.TYPE_USE)\n" +
			"@interface Marker2 {}\n";
	String expectedUnitToString = 
			"import java.lang.annotation.Target;\n" + 
			"import static java.lang.annotation.ElementType.*;\n" + 
			"public class X {\n" + 
			"  public X() {\n" + 
			"    super();\n" + 
			"  }\n" + 
			"  public void foo() {\n" + 
			"    int @Marker [][][] i = new @Marker2 int @Marker @Marker2 [2] @Marker @Marker2 [bar()] @Marker @Marker2 [];\n" + 
			"    int @Marker [][][] j = new @Marker2 int @Marker @Marker2 [2] @Marker @Marker2 [X.bar2(2)] @Marker @Marker2 [];\n" + 
			"  }\n" + 
			"  public int bar() {\n" + 
			"    return 2;\n" + 
			"  }\n" + 
			"  public static int bar2(int k) {\n" + 
			"    return k;\n" + 
			"  }\n" + 
			"}\n" + 
			"@Target(java.lang.annotation.ElementType.TYPE_USE) @interface Marker {\n" + 
			"}\n" + 
			"@Target(java.lang.annotation.ElementType.TYPE_USE) @interface Marker2 {\n" + 
			"}\n";
	checkParse(CHECK_PARSER, source.toCharArray(), null, "test0137", expectedUnitToString);
}
}




			"The annotation @Marker2 is disallowed for this location\n" + 
			"----------\n"); 
	}
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=399453
	public void testBug399453() {
		this.runNegativeTest(
				new String[]{
					"X.java",
					"import java.lang.annotation.Target;\n" +
					"import static java.lang.annotation.ElementType.*;\n" +
					"public class X {\n" +
					"	public void foo() {\n" +
					"		int @Marker [][][] i = new @Marker2 int @Marker @Marker2 [2] @Marker @Marker2 [@Marker bar()] @Marker @Marker2 [];\n" +
					"		int @Marker [][][] j = new @Marker2 int @Marker @Marker2 [2] @Marker @Marker2 [@Marker X.bar2(2)] @Marker @Marker2 [];\n" +
					"	}\n" +
					"	public int bar() {\n" +
					"		return 2;\n" +
					"	}\n" +
					"	public static int bar2(int k) {\n" +
					"		return k;\n" + 
					"	}\n" +
					"}\n" +
					"@Target (java.lang.annotation.ElementType.TYPE_USE)\n" +
					"@interface Marker {}\n" +
					"@Target (java.lang.annotation.ElementType.TYPE_USE)\n" +
					"@interface Marker2 {}\n"
				},
				"----------\n" + 
				"1. ERROR in X.java (at line 5)\n" + 
				"	int @Marker [][][] i = new @Marker2 int @Marker @Marker2 [2] @Marker @Marker2 [@Marker bar()] @Marker @Marker2 [];\n" + 
				"	                                                                               ^^^^^^^\n" + 
				"Syntax error, type annotations are illegal here\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 6)\n" + 
				"	int @Marker [][][] j = new @Marker2 int @Marker @Marker2 [2] @Marker @Marker2 [@Marker X.bar2(2)] @Marker @Marker2 [];\n" + 
				"	                                                                               ^^^^^^^\n" + 
				"Syntax error, type annotations are illegal here\n" + 
				"----------\n"); 
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2013 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

		this.identifierLengthPtr--;
	} else {
		this.identifierLengthStack[this.identifierLengthPtr]--;
		int length = this.typeAnnotationLengthStack[this.typeAnnotationLengthPtr--];
		Annotation [] typeAnnotations;
		if (length != 0) {
			System.arraycopy(
					this.typeAnnotationStack,
					(this.typeAnnotationPtr -= length) + 1,
					typeAnnotations = new Annotation[length],
					0,
					length);
			problemReporter().misplacedTypeAnnotations(typeAnnotations[0], typeAnnotations[typeAnnotations.length - 1]);
		}
		m.receiver = getUnspecifiedReference();
		m.sourceStart = m.receiver.sourceStart;
	}
	rejectTypeAnnotationsOnMethodInvocation();
	pushOnExpressionStack(m);
}
private void rejectTypeAnnotationsOnMethodInvocation() {
	int length = this.typeAnnotationLengthStack[this.typeAnnotationLengthPtr--];
	Annotation [] typeAnnotations;
	if (length != 0) {
		System.arraycopy(
				this.typeAnnotationStack,
				(this.typeAnnotationPtr -= length) + 1,
				typeAnnotations = new Annotation[length],
				0,
				length);
		problemReporter().misplacedTypeAnnotations(typeAnnotations[0], typeAnnotations[typeAnnotations.length - 1]);
	}
}
protected void consumeMethodInvocationNameWithTypeArguments() {
	// MethodInvocation ::= Name '.' TypeArguments 'Identifier' '(' ArgumentListopt ')'


Return to bug 399453

Lines 3117-3120 Link Here

(-)a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NegativeTypeAnnotationTest.java (+36 lines)
3117	"The annotation @Marker2 is disallowed for this location\n" +	3117	"The annotation @Marker2 is disallowed for this location\n" +
3118	"----------\n");	3118	"----------\n");
3119	}	3119	}
		3120	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=399453
		3121	public void testBug399453() {
		3122	this.runNegativeTest(
		3123	new String[]{
		3124	"X.java",
		3125	"import java.lang.annotation.Target;\n" +
		3126	"import static java.lang.annotation.ElementType.*;\n" +
		3127	"public class X {\n" +
		3128	" public void foo() {\n" +
		3129	" int @Marker [][][] i = new @Marker2 int @Marker @Marker2 [2] @Marker @Marker2 [@Marker bar()] @Marker @Marker2 [];\n" +
		3130	" int @Marker [][][] j = new @Marker2 int @Marker @Marker2 [2] @Marker @Marker2 [@Marker X.bar2(2)] @Marker @Marker2 [];\n" +
		3131	" }\n" +
		3132	" public int bar() {\n" +
		3133	" return 2;\n" +
		3134	" }\n" +
		3135	" public static int bar2(int k) {\n" +
		3136	" return k;\n" +
		3137	" }\n" +
		3138	"}\n" +
		3139	"@Target (java.lang.annotation.ElementType.TYPE_USE)\n" +
		3140	"@interface Marker {}\n" +
		3141	"@Target (java.lang.annotation.ElementType.TYPE_USE)\n" +
		3142	"@interface Marker2 {}\n"
		3143	},
		3144	"----------\n" +
		3145	"1. ERROR in X.java (at line 5)\n" +
		3146	" int @Marker [][][] i = new @Marker2 int @Marker @Marker2 [2] @Marker @Marker2 [@Marker bar()] @Marker @Marker2 [];\n" +
		3147	" ^^^^^^^\n" +
		3148	"Syntax error, type annotations are illegal here\n" +
		3149	"----------\n" +
		3150	"2. ERROR in X.java (at line 6)\n" +
		3151	" int @Marker [][][] j = new @Marker2 int @Marker @Marker2 [2] @Marker @Marker2 [@Marker X.bar2(2)] @Marker @Marker2 [];\n" +
		3152	" ^^^^^^^\n" +
		3153	"Syntax error, type annotations are illegal here\n" +
		3154	"----------\n");
		3155	}
3120	}	3156	}

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java (-12 / +15 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2012 IBM Corporation and others.	2	* Copyright (c) 2000, 2013 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 5126-5147 Link Here
5126	this.identifierLengthPtr--;	5126	this.identifierLengthPtr--;
5127	} else {	5127	} else {
5128	this.identifierLengthStack[this.identifierLengthPtr]--;	5128	this.identifierLengthStack[this.identifierLengthPtr]--;
5129	int length = this.typeAnnotationLengthStack[this.typeAnnotationLengthPtr--];
5130	Annotation [] typeAnnotations;
5131	if (length != 0) {
5132	System.arraycopy(
5133	this.typeAnnotationStack,
5134	(this.typeAnnotationPtr -= length) + 1,
5135	typeAnnotations = new Annotation[length],
5136	0,
5137	length);
5138	problemReporter().misplacedTypeAnnotations(typeAnnotations[0], typeAnnotations[typeAnnotations.length - 1]);
5139	}
5140	m.receiver = getUnspecifiedReference();	5129	m.receiver = getUnspecifiedReference();
5141	m.sourceStart = m.receiver.sourceStart;	5130	m.sourceStart = m.receiver.sourceStart;
5142	}	5131	}
		5132	rejectTypeAnnotationsOnMethodInvocation();
5143	pushOnExpressionStack(m);	5133	pushOnExpressionStack(m);
5144	}	5134	}
		5135	private void rejectTypeAnnotationsOnMethodInvocation() {
		5136	int length = this.typeAnnotationLengthStack[this.typeAnnotationLengthPtr--];
		5137	Annotation [] typeAnnotations;
		5138	if (length != 0) {
		5139	System.arraycopy(
		5140	this.typeAnnotationStack,
		5141	(this.typeAnnotationPtr -= length) + 1,
		5142	typeAnnotations = new Annotation[length],
		5143	0,
		5144	length);
		5145	problemReporter().misplacedTypeAnnotations(typeAnnotations[0], typeAnnotations[typeAnnotations.length - 1]);
		5146	}
		5147	}
5145	protected void consumeMethodInvocationNameWithTypeArguments() {	5148	protected void consumeMethodInvocationNameWithTypeArguments() {
5146	// MethodInvocation ::= Name '.' TypeArguments 'Identifier' '(' ArgumentListopt ')'	5149	// MethodInvocation ::= Name '.' TypeArguments 'Identifier' '(' ArgumentListopt ')'
5147		5150