diff options
| author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 2002-10-09 20:54:37 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 2002-10-09 20:54:37 +0000 |
| commit | c6449a1dbc2ede62cdf8fc3d73f52d2f2796567b (patch) | |
| tree | 4e9b70072495066681bf780356004b39596f1dd6 | |
| parent | a2419b9670586c6d01b07fa6d653c14ba2a9dd7b (diff) | |
| download | gcc-c6449a1dbc2ede62cdf8fc3d73f52d2f2796567b.zip gcc-c6449a1dbc2ede62cdf8fc3d73f52d2f2796567b.tar.gz gcc-c6449a1dbc2ede62cdf8fc3d73f52d2f2796567b.tar.bz2 | |
* parse.y (merge_string_cste): Add parentheses around & within |.
From-SVN: r57991
| -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 057c9e1..3677698 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 3cc58c9..783c5d3 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'; |