From c6449a1dbc2ede62cdf8fc3d73f52d2f2796567b Mon Sep 17 00:00:00 2001
From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
Date: Wed, 9 Oct 2002 20:54:37 +0000
Subject: [PATCH] * parse.y (merge_string_cste): Add parentheses around &
 within |.

From-SVN: r57991
---
 gcc/java/ChangeLog | 4 ++++
 gcc/java/parse.y   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 057c9e1ed6f..367769845e5 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-09  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* parse.y (merge_string_cste): Add parentheses around & within |.
+
 2002-10-08  Tom Tromey  <tromey@redhat.com>
 
 	* parse.y (variable_declarator_id): Simplify error path for
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 3cc58c9a5d8..783c5d37a0d 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -13777,7 +13777,7 @@ merge_string_cste (op1, op2, after)
 	  else
 	    {
 	      *p++ = c >> 6 | 0xc0;
-	      *p++ = c & 0x3f | 0x80;
+	      *p++ = (c & 0x3f) | 0x80;
 	    }
 	  *p = '\0';
  
-- 
2.30.2