* parse.y (merge_string_cste): Add parentheses around & within |.

From-SVN: r57991

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 057c9e1ed6ffcbf4dccd852d79c60a571e6eb8a9..367769845e530affdca8ec3578e78de554315113 100644 (file)
--- 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 3cc58c9a5d82922e687057e5aeccdcad202f6347..783c5d37a0d35f6ee73fc22a9615abd6f2629005 100644 (file)
--- 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';