author | vromero |
Tue, 08 Jan 2013 13:47:57 +0000 | |
changeset 15040 | 99fd9483d3f0 |
parent 11381 | 890ea587d133 |
child 15384 | 5a8d00abf076 |
permissions | -rw-r--r-- |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
1 |
/* |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
2 |
* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
4 |
* |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
8 |
* |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
13 |
* accompanied this code). |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
14 |
* |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
18 |
* |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
21 |
* questions. |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
22 |
*/ |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
23 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
24 |
/* |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
25 |
* @test |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
26 |
* @bug 7046778 |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
27 |
* @summary Project Coin: problem with diamond and member inner classes |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
28 |
* @library ../../../lib |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
29 |
* @build JavacTestingAbstractThreadedTest |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
30 |
* @run main DiamondAndInnerClassTest |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
31 |
*/ |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
32 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
33 |
import com.sun.source.util.JavacTask; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
34 |
import java.net.URI; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
35 |
import java.util.Arrays; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
36 |
import javax.tools.Diagnostic; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
37 |
import javax.tools.JavaFileObject; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
38 |
import javax.tools.SimpleJavaFileObject; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
39 |
|
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
40 |
public class DiamondAndInnerClassTest |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
41 |
extends JavacTestingAbstractThreadedTest |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
42 |
implements Runnable { |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
43 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
44 |
enum TypeArgumentKind { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
45 |
NONE(""), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
46 |
STRING("<String>"), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
47 |
INTEGER("<Integer>"), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
48 |
DIAMOND("<>"); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
49 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
50 |
String typeargStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
51 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
52 |
private TypeArgumentKind(String typeargStr) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
53 |
this.typeargStr = typeargStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
54 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
55 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
56 |
boolean compatible(TypeArgumentKind that) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
57 |
switch (this) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
58 |
case NONE: return true; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
59 |
case STRING: return that != INTEGER; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
60 |
case INTEGER: return that != STRING; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
61 |
default: throw new AssertionError("Unexpected decl kind: " + this); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
62 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
63 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
64 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
65 |
boolean compatible(ArgumentKind that) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
66 |
switch (this) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
67 |
case NONE: return true; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
68 |
case STRING: return that == ArgumentKind.STRING; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
69 |
case INTEGER: return that == ArgumentKind.INTEGER; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
70 |
default: throw new AssertionError("Unexpected decl kind: " + this); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
71 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
72 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
73 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
74 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
75 |
enum ArgumentKind { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
76 |
OBJECT("(Object)null"), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
77 |
STRING("(String)null"), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
78 |
INTEGER("(Integer)null"); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
79 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
80 |
String argStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
81 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
82 |
private ArgumentKind(String argStr) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
83 |
this.argStr = argStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
84 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
85 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
86 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
87 |
enum TypeQualifierArity { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
88 |
ONE(1, "A1#TA1"), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
89 |
TWO(2, "A1#TA1.A2#TA2"), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
90 |
THREE(3, "A1#TA1.A2#TA2.A3#TA3"); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
91 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
92 |
int n; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
93 |
String qualifierStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
94 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
95 |
private TypeQualifierArity(int n, String qualifierStr) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
96 |
this.n = n; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
97 |
this.qualifierStr = qualifierStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
98 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
99 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
100 |
String getType(TypeArgumentKind... typeArgumentKinds) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
101 |
String res = qualifierStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
102 |
for (int i = 1 ; i <= typeArgumentKinds.length ; i++) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
103 |
res = res.replace("#TA" + i, typeArgumentKinds[i-1].typeargStr); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
104 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
105 |
return res; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
106 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
107 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
108 |
boolean matches(InnerClassDeclArity innerClassDeclArity) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
109 |
return n ==innerClassDeclArity.n; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
110 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
111 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
112 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
113 |
enum InnerClassDeclArity { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
114 |
ONE(1, "class A1<X> { A1(X x1) { } #B }"), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
115 |
TWO(2, "class A1<X1> { class A2<X2> { A2(X1 x1, X2 x2) { } #B } }"), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
116 |
THREE(3, "class A1<X1> { class A2<X2> { class A3<X3> { A3(X1 x1, X2 x2, X3 x3) { } #B } } }"); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
117 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
118 |
int n; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
119 |
String classDeclStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
120 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
121 |
private InnerClassDeclArity(int n, String classDeclStr) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
122 |
this.n = n; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
123 |
this.classDeclStr = classDeclStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
124 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
125 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
126 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
127 |
enum ArgumentListArity { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
128 |
ONE(1, "(#A1)"), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
129 |
TWO(2, "(#A1,#A2)"), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
130 |
THREE(3, "(#A1,#A2,#A3)"); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
131 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
132 |
int n; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
133 |
String argListStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
134 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
135 |
private ArgumentListArity(int n, String argListStr) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
136 |
this.n = n; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
137 |
this.argListStr = argListStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
138 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
139 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
140 |
String getArgs(ArgumentKind... argumentKinds) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
141 |
String res = argListStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
142 |
for (int i = 1 ; i <= argumentKinds.length ; i++) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
143 |
res = res.replace("#A" + i, argumentKinds[i-1].argStr); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
144 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
145 |
return res; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
146 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
147 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
148 |
boolean matches(InnerClassDeclArity innerClassDeclArity) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
149 |
return n ==innerClassDeclArity.n; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
150 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
151 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
152 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
153 |
public static void main(String... args) throws Exception { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
154 |
for (InnerClassDeclArity innerClassDeclArity : InnerClassDeclArity.values()) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
155 |
for (TypeQualifierArity declType : TypeQualifierArity.values()) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
156 |
if (!declType.matches(innerClassDeclArity)) continue; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
157 |
for (TypeQualifierArity newClassType : TypeQualifierArity.values()) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
158 |
if (!newClassType.matches(innerClassDeclArity)) continue; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
159 |
for (ArgumentListArity argList : ArgumentListArity.values()) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
160 |
if (!argList.matches(innerClassDeclArity)) continue; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
161 |
for (TypeArgumentKind taDecl1 : TypeArgumentKind.values()) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
162 |
boolean isDeclRaw = taDecl1 == TypeArgumentKind.NONE; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
163 |
//no diamond on decl site |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
164 |
if (taDecl1 == TypeArgumentKind.DIAMOND) continue; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
165 |
for (TypeArgumentKind taSite1 : TypeArgumentKind.values()) { |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
166 |
boolean isSiteRaw = |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
167 |
taSite1 == TypeArgumentKind.NONE; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
168 |
//diamond only allowed on the last type qualifier |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
169 |
if (taSite1 == TypeArgumentKind.DIAMOND && |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
170 |
innerClassDeclArity != |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
171 |
InnerClassDeclArity.ONE) |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
172 |
continue; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
173 |
for (ArgumentKind arg1 : ArgumentKind.values()) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
174 |
if (innerClassDeclArity == innerClassDeclArity.ONE) { |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
175 |
pool.execute( |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
176 |
new DiamondAndInnerClassTest( |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
177 |
innerClassDeclArity, declType, |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
178 |
newClassType, argList, |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
179 |
new TypeArgumentKind[] {taDecl1}, |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
180 |
new TypeArgumentKind[] {taSite1}, |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
181 |
new ArgumentKind[] {arg1})); |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
182 |
continue; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
183 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
184 |
for (TypeArgumentKind taDecl2 : TypeArgumentKind.values()) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
185 |
//no rare types |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
186 |
if (isDeclRaw != (taDecl2 == TypeArgumentKind.NONE)) |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
187 |
continue; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
188 |
//no diamond on decl site |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
189 |
if (taDecl2 == TypeArgumentKind.DIAMOND) |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
190 |
continue; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
191 |
for (TypeArgumentKind taSite2 : TypeArgumentKind.values()) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
192 |
//no rare types |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
193 |
if (isSiteRaw != (taSite2 == TypeArgumentKind.NONE)) |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
194 |
continue; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
195 |
//diamond only allowed on the last type qualifier |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
196 |
if (taSite2 == TypeArgumentKind.DIAMOND && |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
197 |
innerClassDeclArity != InnerClassDeclArity.TWO) |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
198 |
continue; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
199 |
for (ArgumentKind arg2 : ArgumentKind.values()) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
200 |
if (innerClassDeclArity == innerClassDeclArity.TWO) { |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
201 |
pool.execute( |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
202 |
new DiamondAndInnerClassTest( |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
203 |
innerClassDeclArity, |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
204 |
declType, |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
205 |
newClassType, |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
206 |
argList, |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
207 |
new TypeArgumentKind[] {taDecl1, taDecl2}, |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
208 |
new TypeArgumentKind[] {taSite1, taSite2}, |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
209 |
new ArgumentKind[] {arg1, arg2})); |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
210 |
continue; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
211 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
212 |
for (TypeArgumentKind taDecl3 : TypeArgumentKind.values()) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
213 |
//no rare types |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
214 |
if (isDeclRaw != (taDecl3 == TypeArgumentKind.NONE)) |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
215 |
continue; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
216 |
//no diamond on decl site |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
217 |
if (taDecl3 == TypeArgumentKind.DIAMOND) |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
218 |
continue; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
219 |
for (TypeArgumentKind taSite3 : TypeArgumentKind.values()) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
220 |
//no rare types |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
221 |
if (isSiteRaw != (taSite3 == TypeArgumentKind.NONE)) |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
222 |
continue; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
223 |
//diamond only allowed on the last type qualifier |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
224 |
if (taSite3 == TypeArgumentKind.DIAMOND && |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
225 |
innerClassDeclArity != InnerClassDeclArity.THREE) |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
226 |
continue; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
227 |
for (ArgumentKind arg3 : ArgumentKind.values()) { |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
228 |
if (innerClassDeclArity == |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
229 |
innerClassDeclArity.THREE) { |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
230 |
pool.execute( |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
231 |
new DiamondAndInnerClassTest( |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
232 |
innerClassDeclArity, |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
233 |
declType, |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
234 |
newClassType, |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
235 |
argList, |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
236 |
new TypeArgumentKind[] {taDecl1, taDecl2, taDecl3}, |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
237 |
new TypeArgumentKind[] {taSite1, taSite2, taSite3}, |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
238 |
new ArgumentKind[] {arg1, arg2, arg3})); |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
239 |
continue; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
240 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
241 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
242 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
243 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
244 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
245 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
246 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
247 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
248 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
249 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
250 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
251 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
252 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
253 |
} |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
254 |
|
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
255 |
checkAfterExec(); |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
256 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
257 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
258 |
InnerClassDeclArity innerClassDeclArity; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
259 |
TypeQualifierArity declType; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
260 |
TypeQualifierArity siteType; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
261 |
ArgumentListArity argList; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
262 |
TypeArgumentKind[] declTypeArgumentKinds; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
263 |
TypeArgumentKind[] siteTypeArgumentKinds; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
264 |
ArgumentKind[] argumentKinds; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
265 |
JavaSource source; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
266 |
DiagnosticChecker diagChecker; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
267 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
268 |
DiamondAndInnerClassTest(InnerClassDeclArity innerClassDeclArity, |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
269 |
TypeQualifierArity declType, TypeQualifierArity siteType, |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
270 |
ArgumentListArity argList, TypeArgumentKind[] declTypeArgumentKinds, |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
271 |
TypeArgumentKind[] siteTypeArgumentKinds, ArgumentKind[] argumentKinds) { |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
272 |
this.innerClassDeclArity = innerClassDeclArity; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
273 |
this.declType = declType; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
274 |
this.siteType = siteType; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
275 |
this.argList = argList; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
276 |
this.declTypeArgumentKinds = declTypeArgumentKinds; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
277 |
this.siteTypeArgumentKinds = siteTypeArgumentKinds; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
278 |
this.argumentKinds = argumentKinds; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
279 |
this.source = new JavaSource(); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
280 |
this.diagChecker = new DiagnosticChecker(); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
281 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
282 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
283 |
class JavaSource extends SimpleJavaFileObject { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
284 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
285 |
String bodyTemplate = "#D res = new #S#AL;"; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
286 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
287 |
String source; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
288 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
289 |
public JavaSource() { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
290 |
super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
291 |
source = innerClassDeclArity.classDeclStr.replace("#B", bodyTemplate) |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
292 |
.replace("#D", declType.getType(declTypeArgumentKinds)) |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
293 |
.replace("#S", siteType.getType(siteTypeArgumentKinds)) |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
294 |
.replace("#AL", argList.getArgs(argumentKinds)); |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
295 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
296 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
297 |
@Override |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
298 |
public CharSequence getCharContent(boolean ignoreEncodingErrors) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
299 |
return source; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
300 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
301 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
302 |
|
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
303 |
@Override |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
304 |
public void run() { |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
305 |
JavacTask ct = (JavacTask)comp.getTask(null, fm.get(), diagChecker, |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
306 |
null, null, Arrays.asList(source)); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
307 |
try { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
308 |
ct.analyze(); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
309 |
} catch (Throwable ex) { |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
310 |
throw new AssertionError("Error thrown when compiling the following code:\n" + |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
311 |
source.getCharContent(true)); |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
312 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
313 |
check(); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
314 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
315 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
316 |
void check() { |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
317 |
checkCount.incrementAndGet(); |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
318 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
319 |
boolean errorExpected = false; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
320 |
|
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
321 |
TypeArgumentKind[] expectedArgKinds = |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
322 |
new TypeArgumentKind[innerClassDeclArity.n]; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
323 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
324 |
for (int i = 0 ; i < innerClassDeclArity.n ; i++) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
325 |
if (!declTypeArgumentKinds[i].compatible(siteTypeArgumentKinds[i])) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
326 |
errorExpected = true; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
327 |
break; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
328 |
} |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
329 |
expectedArgKinds[i] = siteTypeArgumentKinds[i] == |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
330 |
TypeArgumentKind.DIAMOND ? |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
331 |
declTypeArgumentKinds[i] : siteTypeArgumentKinds[i]; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
332 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
333 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
334 |
if (!errorExpected) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
335 |
for (int i = 0 ; i < innerClassDeclArity.n ; i++) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
336 |
if (!expectedArgKinds[i].compatible(argumentKinds[i])) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
337 |
errorExpected = true; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
338 |
break; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
339 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
340 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
341 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
342 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
343 |
if (errorExpected != diagChecker.errorFound) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
344 |
throw new Error("invalid diagnostics for source:\n" + |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
345 |
source.getCharContent(true) + |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
346 |
"\nFound error: " + diagChecker.errorFound + |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
347 |
"\nExpected error: " + errorExpected); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
348 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
349 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
350 |
|
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
351 |
static class DiagnosticChecker |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
352 |
implements javax.tools.DiagnosticListener<JavaFileObject> { |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
353 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
354 |
boolean errorFound; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
355 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
356 |
public void report(Diagnostic<? extends JavaFileObject> diagnostic) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
357 |
if (diagnostic.getKind() == Diagnostic.Kind.ERROR) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
358 |
errorFound = true; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
359 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
360 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
361 |
} |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
362 |
|
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
363 |
} |