author | sadayapalam |
Thu, 26 Nov 2015 17:38:15 +0530 | |
changeset 34474 | 14deea5f86f1 |
parent 30730 | d3ce7619db2c |
permissions | -rw-r--r-- |
7208
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
1 |
/* |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
2 |
* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. |
7208
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
4 |
* |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
8 |
* |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
13 |
* accompanied this code). |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
14 |
* |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
18 |
* |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
21 |
* questions. |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
22 |
*/ |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
23 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
24 |
/* |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
25 |
* @test |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
26 |
* @bug 6996914 7020044 8062373 |
7208
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
27 |
* @summary Diamond inference: problem when accessing protected constructor |
30730
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
29776
diff
changeset
|
28 |
* @modules jdk.compiler |
7208
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
29 |
* @run main T6996914a |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
30 |
*/ |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
31 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
32 |
import com.sun.source.util.JavacTask; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
33 |
import java.net.URI; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
34 |
import java.util.Arrays; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
35 |
import javax.tools.Diagnostic; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
36 |
import javax.tools.DiagnosticListener; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
37 |
import javax.tools.JavaCompiler; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
38 |
import javax.tools.JavaFileObject; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
39 |
import javax.tools.SimpleJavaFileObject; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
40 |
import javax.tools.ToolProvider; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
41 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
42 |
public class T6996914a { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
43 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
44 |
enum PackageKind { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
45 |
DEFAULT("", ""), |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
46 |
A("package a;", "import a.*;"); |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
47 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
48 |
String pkgDecl; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
49 |
String importDecl; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
50 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
51 |
PackageKind(String pkgDecl, String importDecl) { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
52 |
this.pkgDecl = pkgDecl; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
53 |
this.importDecl = importDecl; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
54 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
55 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
56 |
|
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
57 |
enum DiamondKind { |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
58 |
STANDARD("new Foo<>();"), |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
59 |
ANON("new Foo<>() {};"); |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
60 |
|
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
61 |
String expr; |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
62 |
|
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
63 |
DiamondKind(String expr) { |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
64 |
this.expr = expr; |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
65 |
} |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
66 |
} |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
67 |
|
7208
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
68 |
enum ConstructorKind { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
69 |
PACKAGE(""), |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
70 |
PROTECTED("protected"), |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
71 |
PRIVATE("private"), |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
72 |
PUBLIC("public"); |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
73 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
74 |
String mod; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
75 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
76 |
ConstructorKind(String mod) { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
77 |
this.mod = mod; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
78 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
79 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
80 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
81 |
static class FooClass extends SimpleJavaFileObject { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
82 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
83 |
final static String sourceStub = |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
84 |
"#P\n" + |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
85 |
"public class Foo<X> {\n" + |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
86 |
" #M Foo() {}\n" + |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
87 |
"}\n"; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
88 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
89 |
String source; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
90 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
91 |
public FooClass(PackageKind pk, ConstructorKind ck) { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
92 |
super(URI.create("myfo:/" + (pk != PackageKind.DEFAULT ? "a/Foo.java" : "Foo.java")), |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
93 |
JavaFileObject.Kind.SOURCE); |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
94 |
source = sourceStub.replace("#P", pk.pkgDecl).replace("#M", ck.mod); |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
95 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
96 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
97 |
@Override |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
98 |
public CharSequence getCharContent(boolean ignoreEncodingErrors) { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
99 |
return source; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
100 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
101 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
102 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
103 |
static class ClientClass extends SimpleJavaFileObject { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
104 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
105 |
final static String sourceStub = |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
106 |
"#I\n" + |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
107 |
"class Test {\n" + |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
108 |
" Foo<String> fs = #D\n" + |
7208
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
109 |
"}\n"; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
110 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
111 |
String source; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
112 |
|
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
113 |
public ClientClass(PackageKind pk, DiamondKind dk) { |
7208
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
114 |
super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE); |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
115 |
source = sourceStub.replace("#I", pk.importDecl).replace("#D", dk.expr); |
7208
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
116 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
117 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
118 |
@Override |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
119 |
public CharSequence getCharContent(boolean ignoreEncodingErrors) { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
120 |
return source; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
121 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
122 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
123 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
124 |
public static void main(String... args) throws Exception { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
125 |
for (PackageKind pk : PackageKind.values()) { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
126 |
for (ConstructorKind ck : ConstructorKind.values()) { |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
127 |
for (DiamondKind dk : DiamondKind.values()) { |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
128 |
compileAndCheck(pk, ck, dk); |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
129 |
} |
7208
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
130 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
131 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
132 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
133 |
|
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
134 |
static void compileAndCheck(PackageKind pk, ConstructorKind ck, DiamondKind dk) throws Exception { |
7208
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
135 |
FooClass foo = new FooClass(pk, ck); |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
136 |
ClientClass client = new ClientClass(pk, dk); |
7208
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
137 |
final JavaCompiler tool = ToolProvider.getSystemJavaCompiler(); |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
138 |
ErrorListener el = new ErrorListener(); |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
139 |
JavacTask ct = (JavacTask)tool.getTask(null, null, el, |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
140 |
null, null, Arrays.asList(foo, client)); |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
141 |
ct.analyze(); |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
142 |
if (el.errors > 0 == check(pk, ck, dk)) { |
7208
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
143 |
String msg = el.errors > 0 ? |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
144 |
"Error compiling files" : |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
145 |
"No error when compiling files"; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
146 |
throw new AssertionError(msg + ": \n" + foo.source + "\n" + client.source); |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
147 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
148 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
149 |
|
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
150 |
static boolean check(PackageKind pk, ConstructorKind ck, DiamondKind dk) { |
7208
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
151 |
switch (pk) { |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
152 |
case A: return ck == ConstructorKind.PUBLIC || |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
8635
diff
changeset
|
153 |
(ck == ConstructorKind.PROTECTED && dk == DiamondKind.ANON); |
7208
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
154 |
case DEFAULT: return ck != ConstructorKind.PRIVATE; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
155 |
default: throw new AssertionError("Unknown package kind"); |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
156 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
157 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
158 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
159 |
/** |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
160 |
* DiagnosticListener to count any errors that occur |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
161 |
*/ |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
162 |
private static class ErrorListener implements DiagnosticListener<JavaFileObject> { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
163 |
|
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
164 |
public void report(Diagnostic<? extends JavaFileObject> diagnostic) { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
165 |
switch (diagnostic.getKind()) { |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
166 |
case ERROR: |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
167 |
errors++; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
168 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
169 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
170 |
int errors; |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
171 |
} |
5db8147393ec
6996914: Diamond inference: problem when accessing protected constructor
mcimadamore
parents:
diff
changeset
|
172 |
} |