Sat, 06 Oct 2012 10:35:38 +0100
7177386: Add attribution support for method references
Summary: Add type-checking/lookup routines for method references
Reviewed-by: jjg, dlsmith
mcimadamore@1145 | 1 | /* |
mcimadamore@1352 | 2 | * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
mcimadamore@1145 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
mcimadamore@1145 | 4 | * |
mcimadamore@1145 | 5 | * This code is free software; you can redistribute it and/or modify it |
mcimadamore@1145 | 6 | * under the terms of the GNU General Public License version 2 only, as |
mcimadamore@1145 | 7 | * published by the Free Software Foundation. |
mcimadamore@1145 | 8 | * |
mcimadamore@1145 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
mcimadamore@1145 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
mcimadamore@1145 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
mcimadamore@1145 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
mcimadamore@1145 | 13 | * accompanied this code). |
mcimadamore@1145 | 14 | * |
mcimadamore@1145 | 15 | * You should have received a copy of the GNU General Public License version |
mcimadamore@1145 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
mcimadamore@1145 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
mcimadamore@1145 | 18 | * |
mcimadamore@1145 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
mcimadamore@1145 | 20 | * or visit www.oracle.com if you need additional information or have any |
mcimadamore@1145 | 21 | * questions. |
mcimadamore@1145 | 22 | */ |
mcimadamore@1145 | 23 | |
mcimadamore@1145 | 24 | /* |
mcimadamore@1145 | 25 | * @test |
mcimadamore@1145 | 26 | * @bug 7115052 |
mcimadamore@1145 | 27 | * @summary Add parser support for method references |
mcimadamore@1145 | 28 | */ |
mcimadamore@1145 | 29 | |
mcimadamore@1145 | 30 | import com.sun.source.util.JavacTask; |
mcimadamore@1145 | 31 | import java.net.URI; |
mcimadamore@1145 | 32 | import java.util.Arrays; |
mcimadamore@1145 | 33 | import javax.tools.Diagnostic; |
mcimadamore@1145 | 34 | import javax.tools.JavaCompiler; |
mcimadamore@1145 | 35 | import javax.tools.JavaFileObject; |
mcimadamore@1145 | 36 | import javax.tools.SimpleJavaFileObject; |
mcimadamore@1145 | 37 | import javax.tools.StandardJavaFileManager; |
mcimadamore@1145 | 38 | import javax.tools.ToolProvider; |
mcimadamore@1145 | 39 | |
mcimadamore@1145 | 40 | public class MethodReferenceParserTest { |
mcimadamore@1145 | 41 | |
mcimadamore@1145 | 42 | static int checkCount = 0; |
mcimadamore@1145 | 43 | |
mcimadamore@1145 | 44 | enum ReferenceKind { |
mcimadamore@1352 | 45 | METHOD_REF("#Q::#Gm"), |
mcimadamore@1352 | 46 | CONSTRUCTOR_REF("#Q::#Gnew"), |
mcimadamore@1165 | 47 | FALSE_REF("min < max"), |
mcimadamore@1352 | 48 | ERR_SUPER("#Q::#Gsuper"), |
mcimadamore@1352 | 49 | ERR_METH0("#Q::#Gm()"), |
mcimadamore@1352 | 50 | ERR_METH1("#Q::#Gm(X)"), |
mcimadamore@1352 | 51 | ERR_CONSTR0("#Q::#Gnew()"), |
mcimadamore@1352 | 52 | ERR_CONSTR1("#Q::#Gnew(X)"); |
mcimadamore@1145 | 53 | |
mcimadamore@1145 | 54 | String referenceTemplate; |
mcimadamore@1145 | 55 | |
mcimadamore@1145 | 56 | ReferenceKind(String referenceTemplate) { |
mcimadamore@1145 | 57 | this.referenceTemplate = referenceTemplate; |
mcimadamore@1145 | 58 | } |
mcimadamore@1145 | 59 | |
mcimadamore@1145 | 60 | String getReferenceString(QualifierKind qk, GenericKind gk) { |
mcimadamore@1145 | 61 | return referenceTemplate |
mcimadamore@1145 | 62 | .replaceAll("#Q", qk.qualifier) |
mcimadamore@1145 | 63 | .replaceAll("#G", gk.typeParameters); |
mcimadamore@1145 | 64 | } |
mcimadamore@1145 | 65 | |
mcimadamore@1145 | 66 | boolean erroneous() { |
mcimadamore@1145 | 67 | switch (this) { |
mcimadamore@1145 | 68 | case ERR_SUPER: |
mcimadamore@1145 | 69 | case ERR_METH0: |
mcimadamore@1145 | 70 | case ERR_METH1: |
mcimadamore@1145 | 71 | case ERR_CONSTR0: |
mcimadamore@1145 | 72 | case ERR_CONSTR1: |
mcimadamore@1145 | 73 | return true; |
mcimadamore@1145 | 74 | default: return false; |
mcimadamore@1145 | 75 | } |
mcimadamore@1145 | 76 | } |
mcimadamore@1145 | 77 | } |
mcimadamore@1145 | 78 | |
mcimadamore@1165 | 79 | enum ContextKind { |
mcimadamore@1165 | 80 | ASSIGN("SAM s = #E;"), |
mcimadamore@1165 | 81 | METHOD("m(#E, i);"); |
mcimadamore@1165 | 82 | |
mcimadamore@1165 | 83 | String contextTemplate; |
mcimadamore@1165 | 84 | |
mcimadamore@1165 | 85 | ContextKind(String contextTemplate) { |
mcimadamore@1165 | 86 | this.contextTemplate = contextTemplate; |
mcimadamore@1165 | 87 | } |
mcimadamore@1165 | 88 | |
mcimadamore@1165 | 89 | String contextString(ExprKind ek, ReferenceKind rk, QualifierKind qk, GenericKind gk, SubExprKind sk) { |
mcimadamore@1165 | 90 | return contextTemplate.replaceAll("#E", ek.expressionString(rk, qk, gk, sk)); |
mcimadamore@1165 | 91 | } |
mcimadamore@1165 | 92 | } |
mcimadamore@1165 | 93 | |
mcimadamore@1145 | 94 | enum GenericKind { |
mcimadamore@1145 | 95 | NONE(""), |
mcimadamore@1145 | 96 | ONE("<X>"), |
mcimadamore@1145 | 97 | TWO("<X,Y>"); |
mcimadamore@1145 | 98 | |
mcimadamore@1145 | 99 | String typeParameters; |
mcimadamore@1145 | 100 | |
mcimadamore@1145 | 101 | GenericKind(String typeParameters) { |
mcimadamore@1145 | 102 | this.typeParameters = typeParameters; |
mcimadamore@1145 | 103 | } |
mcimadamore@1145 | 104 | } |
mcimadamore@1145 | 105 | |
mcimadamore@1145 | 106 | enum QualifierKind { |
mcimadamore@1145 | 107 | THIS("this"), |
mcimadamore@1145 | 108 | SUPER("super"), |
mcimadamore@1145 | 109 | NEW("new Foo()"), |
mcimadamore@1145 | 110 | METHOD("m()"), |
mcimadamore@1145 | 111 | FIELD("a.f"), |
mcimadamore@1145 | 112 | UBOUND_SIMPLE("A"), |
mcimadamore@1352 | 113 | UNBOUND_ARRAY1("int[]"), |
mcimadamore@1352 | 114 | UNBOUND_ARRAY2("A<G>[][]"), |
mcimadamore@1145 | 115 | UNBOUND_GENERIC1("A<X>"), |
mcimadamore@1145 | 116 | UNBOUND_GENERIC2("A<X, Y>"), |
mcimadamore@1165 | 117 | UNBOUND_GENERIC3("A<? extends X, ? super Y>"), |
mcimadamore@1165 | 118 | UNBOUND_GENERIC4("A<int[], short[][]>"), |
mcimadamore@1165 | 119 | NESTED_GENERIC1("A<A<X,Y>, A<X,Y>>"), |
mcimadamore@1165 | 120 | NESTED_GENERIC2("A<A<A<X,Y>,A<X,Y>>, A<A<X,Y>,A<X,Y>>>"); |
mcimadamore@1145 | 121 | |
mcimadamore@1145 | 122 | String qualifier; |
mcimadamore@1145 | 123 | |
mcimadamore@1145 | 124 | QualifierKind(String qualifier) { |
mcimadamore@1145 | 125 | this.qualifier = qualifier; |
mcimadamore@1145 | 126 | } |
mcimadamore@1145 | 127 | } |
mcimadamore@1145 | 128 | |
mcimadamore@1145 | 129 | enum ExprKind { |
mcimadamore@1352 | 130 | NONE("#R::S"), |
mcimadamore@1145 | 131 | SINGLE_PAREN1("(#R#S)"), |
mcimadamore@1145 | 132 | SINGLE_PAREN2("(#R)#S"), |
mcimadamore@1145 | 133 | DOUBLE_PAREN1("((#R#S))"), |
mcimadamore@1145 | 134 | DOUBLE_PAREN2("((#R)#S)"), |
mcimadamore@1145 | 135 | DOUBLE_PAREN3("((#R))#S"); |
mcimadamore@1145 | 136 | |
mcimadamore@1145 | 137 | String expressionTemplate; |
mcimadamore@1145 | 138 | |
mcimadamore@1145 | 139 | ExprKind(String expressionTemplate) { |
mcimadamore@1145 | 140 | this.expressionTemplate = expressionTemplate; |
mcimadamore@1145 | 141 | } |
mcimadamore@1145 | 142 | |
mcimadamore@1145 | 143 | String expressionString(ReferenceKind rk, QualifierKind qk, GenericKind gk, SubExprKind sk) { |
mcimadamore@1145 | 144 | return expressionTemplate |
mcimadamore@1145 | 145 | .replaceAll("#R", rk.getReferenceString(qk, gk)) |
mcimadamore@1145 | 146 | .replaceAll("#S", sk.subExpression); |
mcimadamore@1145 | 147 | } |
mcimadamore@1145 | 148 | } |
mcimadamore@1145 | 149 | |
mcimadamore@1145 | 150 | enum SubExprKind { |
mcimadamore@1145 | 151 | NONE(""), |
mcimadamore@1145 | 152 | SELECT_FIELD(".f"), |
mcimadamore@1145 | 153 | SELECT_METHOD(".f()"), |
mcimadamore@1145 | 154 | SELECT_NEW(".new Foo()"), |
mcimadamore@1145 | 155 | POSTINC("++"), |
mcimadamore@1145 | 156 | POSTDEC("--"); |
mcimadamore@1145 | 157 | |
mcimadamore@1145 | 158 | String subExpression; |
mcimadamore@1145 | 159 | |
mcimadamore@1145 | 160 | SubExprKind(String subExpression) { |
mcimadamore@1145 | 161 | this.subExpression = subExpression; |
mcimadamore@1145 | 162 | } |
mcimadamore@1145 | 163 | } |
mcimadamore@1145 | 164 | |
mcimadamore@1145 | 165 | public static void main(String... args) throws Exception { |
mcimadamore@1145 | 166 | |
mcimadamore@1145 | 167 | //create default shared JavaCompiler - reused across multiple compilations |
mcimadamore@1145 | 168 | JavaCompiler comp = ToolProvider.getSystemJavaCompiler(); |
mcimadamore@1145 | 169 | StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null); |
mcimadamore@1145 | 170 | |
mcimadamore@1145 | 171 | for (ReferenceKind rk : ReferenceKind.values()) { |
mcimadamore@1145 | 172 | for (QualifierKind qk : QualifierKind.values()) { |
mcimadamore@1145 | 173 | for (GenericKind gk : GenericKind.values()) { |
mcimadamore@1145 | 174 | for (SubExprKind sk : SubExprKind.values()) { |
mcimadamore@1145 | 175 | for (ExprKind ek : ExprKind.values()) { |
mcimadamore@1165 | 176 | for (ContextKind ck : ContextKind.values()) { |
mcimadamore@1165 | 177 | new MethodReferenceParserTest(rk, qk, gk, sk, ek, ck).run(comp, fm); |
mcimadamore@1165 | 178 | } |
mcimadamore@1145 | 179 | } |
mcimadamore@1145 | 180 | } |
mcimadamore@1145 | 181 | } |
mcimadamore@1145 | 182 | } |
mcimadamore@1145 | 183 | } |
mcimadamore@1145 | 184 | System.out.println("Total check executed: " + checkCount); |
mcimadamore@1145 | 185 | } |
mcimadamore@1145 | 186 | |
mcimadamore@1145 | 187 | ReferenceKind rk; |
mcimadamore@1145 | 188 | QualifierKind qk; |
mcimadamore@1145 | 189 | GenericKind gk; |
mcimadamore@1145 | 190 | SubExprKind sk; |
mcimadamore@1145 | 191 | ExprKind ek; |
mcimadamore@1165 | 192 | ContextKind ck; |
mcimadamore@1145 | 193 | JavaSource source; |
mcimadamore@1145 | 194 | DiagnosticChecker diagChecker; |
mcimadamore@1145 | 195 | |
mcimadamore@1165 | 196 | MethodReferenceParserTest(ReferenceKind rk, QualifierKind qk, GenericKind gk, SubExprKind sk, ExprKind ek, ContextKind ck) { |
mcimadamore@1145 | 197 | this.rk = rk; |
mcimadamore@1145 | 198 | this.qk = qk; |
mcimadamore@1145 | 199 | this.gk = gk; |
mcimadamore@1145 | 200 | this.sk = sk; |
mcimadamore@1145 | 201 | this.ek = ek; |
mcimadamore@1165 | 202 | this.ck = ck; |
mcimadamore@1145 | 203 | this.source = new JavaSource(); |
mcimadamore@1145 | 204 | this.diagChecker = new DiagnosticChecker(); |
mcimadamore@1145 | 205 | } |
mcimadamore@1145 | 206 | |
mcimadamore@1145 | 207 | class JavaSource extends SimpleJavaFileObject { |
mcimadamore@1145 | 208 | |
mcimadamore@1145 | 209 | String template = "class Test {\n" + |
mcimadamore@1165 | 210 | " void test() {\n" + |
mcimadamore@1165 | 211 | " #C\n" + |
mcimadamore@1165 | 212 | " }" + |
mcimadamore@1145 | 213 | "}"; |
mcimadamore@1145 | 214 | |
mcimadamore@1145 | 215 | String source; |
mcimadamore@1145 | 216 | |
mcimadamore@1145 | 217 | public JavaSource() { |
mcimadamore@1145 | 218 | super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE); |
mcimadamore@1165 | 219 | source = template.replaceAll("#C", ck.contextString(ek, rk, qk, gk, sk)); |
mcimadamore@1145 | 220 | } |
mcimadamore@1145 | 221 | |
mcimadamore@1145 | 222 | @Override |
mcimadamore@1145 | 223 | public CharSequence getCharContent(boolean ignoreEncodingErrors) { |
mcimadamore@1145 | 224 | return source; |
mcimadamore@1145 | 225 | } |
mcimadamore@1145 | 226 | } |
mcimadamore@1145 | 227 | |
mcimadamore@1145 | 228 | void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception { |
mcimadamore@1145 | 229 | JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker, |
mcimadamore@1145 | 230 | Arrays.asList("-XDallowMethodReferences"), null, Arrays.asList(source)); |
mcimadamore@1145 | 231 | try { |
mcimadamore@1145 | 232 | ct.parse(); |
mcimadamore@1145 | 233 | } catch (Throwable ex) { |
mcimadamore@1145 | 234 | throw new AssertionError("Error thrown when parsing the following source:\n" + source.getCharContent(true)); |
mcimadamore@1145 | 235 | } |
mcimadamore@1145 | 236 | check(); |
mcimadamore@1145 | 237 | } |
mcimadamore@1145 | 238 | |
mcimadamore@1145 | 239 | void check() { |
mcimadamore@1145 | 240 | checkCount++; |
mcimadamore@1145 | 241 | |
mcimadamore@1145 | 242 | if (diagChecker.errorFound != rk.erroneous()) { |
mcimadamore@1145 | 243 | throw new Error("invalid diagnostics for source:\n" + |
mcimadamore@1145 | 244 | source.getCharContent(true) + |
mcimadamore@1145 | 245 | "\nFound error: " + diagChecker.errorFound + |
mcimadamore@1145 | 246 | "\nExpected error: " + rk.erroneous()); |
mcimadamore@1145 | 247 | } |
mcimadamore@1145 | 248 | } |
mcimadamore@1145 | 249 | |
mcimadamore@1145 | 250 | static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> { |
mcimadamore@1145 | 251 | |
mcimadamore@1145 | 252 | boolean errorFound; |
mcimadamore@1145 | 253 | |
mcimadamore@1145 | 254 | public void report(Diagnostic<? extends JavaFileObject> diagnostic) { |
mcimadamore@1145 | 255 | if (diagnostic.getKind() == Diagnostic.Kind.ERROR) { |
mcimadamore@1145 | 256 | errorFound = true; |
mcimadamore@1145 | 257 | } |
mcimadamore@1145 | 258 | } |
mcimadamore@1145 | 259 | } |
mcimadamore@1145 | 260 | } |