# HG changeset patch
# User vromero
# Date 1386094398 0
# Node ID 203318f0799d58b96529a9947192b2109e919335
# Parent  ed437c411fbd5710acb48b57d8d516fcc1e1d389
8029179: javac produces a compile error for valid boolean expressions
Reviewed-by: jjg, jlahoda

diff -r ed437c411fbd -r 203318f0799d langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java	Tue Dec 03 18:50:26 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java	Tue Dec 03 18:13:18 2013 +0000
@@ -1596,6 +1596,7 @@
                         // Identifier, ')' '->' -> implicit lambda
                         return ParensResult.IMPLICIT_LAMBDA;
                     }
+                    type = false;
                     break;
                 case FINAL:
                 case ELLIPSIS:
diff -r ed437c411fbd -r 203318f0799d langtools/test/tools/javac/T8029179/CompileErrorForValidBooleanExpTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T8029179/CompileErrorForValidBooleanExpTest.java	Tue Dec 03 18:13:18 2013 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2013, 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
+ * @bug 8029179
+ * @summary javac produces a compile error for valid boolean expressions
+ * @compile CompileErrorForValidBooleanExpTest.java
+ */
+
+public class CompileErrorForValidBooleanExpTest {
+    static int a, b, c, d;
+
+    static void m() {
+        boolean cond1 = (a < b & c > d);
+        boolean cond2 = (f1() < f2() & c > d);
+        boolean cond3 = (f1() < b & f3() > d);
+        boolean cond4 = (f1() < b & f3() > 1);
+    }
+
+    static int f1() {
+        return 0;
+    }
+
+    static int f2() {
+        return 0;
+    }
+
+    static int f3() {
+        return 0;
+    }
+
+    static int f4() {
+        return 0;
+    }
+}