changeset 1147:f2e7fad12285

Parser confused when parenthesized lambda expression occurs in a cast conversion context
author mcimadamore
date Fri, 09 Sep 2011 17:56:23 +0100
parents c2ce16bef6f9
children afd33b3093d3
files src/share/classes/com/sun/tools/javac/comp/Attr.java test/tools/javac/lambda/TargetType31.java
diffstat 2 files changed, 51 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Fri Sep 09 14:57:30 2011 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Fri Sep 09 17:56:23 2011 +0100
@@ -2439,8 +2439,8 @@
         //a fresh environment is required for 292 inference to work properly ---
         //see Infer.instantiatePolymorphicSignatureInstance()
         Env<AttrContext> localEnv = env.dup(tree);
-        boolean isLambdaOrReference = tree.expr.getTag() == JCTree.LAMBDA ||
-                tree.expr.getTag() == JCTree.REFERENCE; //this will eventually use polyType
+        boolean isLambdaOrReference = TreeInfo.skipParens(tree.expr).getTag() == JCTree.LAMBDA ||
+                TreeInfo.skipParens(tree.expr).getTag() == JCTree.REFERENCE; //this will eventually use polyType
         Type exprtype = attribExpr(tree.expr, localEnv, isLambdaOrReference ? clazztype : Type.noType);
         Type owntype = chk.checkCastable(tree.expr.pos(), env, exprtype, clazztype);
         if (exprtype.constValue() != null)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/lambda/TargetType31.java	Fri Sep 09 17:56:23 2011 +0100
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary check that target type of a cast is propagated through parenthesized expressions
+ * @compile TargetType31.java
+ */
+
+class TargetType31 {
+
+    interface SAM {
+        void m(int x);
+    }
+    
+    void m(SAM s) { }
+
+    void testAssignmentContext() {
+        SAM s1 = (SAM)(x-> System.out.println("Hello!"));
+        SAM s2 = (SAM)((x-> System.out.println("Hello!")));
+        SAM s3 = (SAM)(((x-> System.out.println("Hello!"))));
+    }
+    
+    void testMethodContext() {
+        m((SAM)(x-> System.out.println("Hello!")));
+        m((SAM)((x-> System.out.println("Hello!"))));
+        m((SAM)(((x-> System.out.println("Hello!")))));
+    }
+}