diff options
| author | Kaveh Ghazi <ghazi@caip.rutgers.edu> | 2002-10-09 20:54:37 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@caip.rutgers.edu> | 2002-10-09 20:54:37 +0000 |
| commit | cf8a3de88d7b43e833f8c8b465553cfb614059c9 (patch) | |
| tree | 4e9b70072495066681bf780356004b39596f1dd6 /gcc/java | |
| parent | 2f17f3d7f01ae0442c24ed0a9303274323161b92 (diff) | |
* parse.y (merge_string_cste): Add parentheses around & within |.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@57991 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/java/parse.y | 2 |
2 files changed, 5 insertions, 1 deletions
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'; |