diff options
| author | Tom Tromey <tom@tromey.com> | 2019-01-06 09:49:11 -0700 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@ericsson.com> | 2019-01-08 12:45:19 -0500 |
| commit | cfeadda545c4961877969e6a66be79278696e012 (patch) | |
| tree | a23a098d0b9aa48402b56d60ea2805523f85920b /gdb/p-exp.y | |
| parent | 236f4ebe3ac7e8f94184fdcc39c70d74cc62b82a (diff) | |
| download | gdb-cfeadda545c4961877969e6a66be79278696e012.zip gdb-cfeadda545c4961877969e6a66be79278696e012.tar.gz gdb-cfeadda545c4961877969e6a66be79278696e012.tar.bz2 | |
Fix build failure with macOS bison
PR gdb/24060 points out a compilation failure of the C, Fortran and Pascal
parsers when they are built using the macOS system bison. The bug is a name
clash between the VARIABLE token name and the VARIABLE enumerator in ui-out.h.
This patch renames VARIABLE in c-exp.y, f-exp.y and p-exp.y to DOLLAR_VARIABLE
to avoid the clash. It also renames similar variables in other .y files so
that all languages use the same name.
gdb/ChangeLog
2019-01-07 Tom Tromey <tom@tromey.com>
2019-01-07 Simon Marchi <simon.marchi@ericsson.com>
PR gdb/24060:
* ada-exp.y (DOLLAR_VARIABLE): Rename from SPECIAL_VARIABLE.
* ada-lex.l (DOLLAR_VARIABLE): Likewise.
* c-exp.y (DOLLAR_VARIABLE): Rename from VARIABLE.
* f-exp.y (DOLLAR_VARIABLE): Likewise.
* m2-exp.y (DOLLAR_VARIABLE): Rename from INTERNAL_VAR.
* p-exp.y (DOLLAR_VARIABLE): Rename from VARIABLE.
Diffstat (limited to 'gdb/p-exp.y')
| -rw-r--r-- | gdb/p-exp.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/p-exp.y b/gdb/p-exp.y index 7e2769e..31e8c4b 100644 --- a/gdb/p-exp.y +++ b/gdb/p-exp.y @@ -158,7 +158,7 @@ static int search_field; /* Special type cases, put in to allow the parser to distinguish different legal basetypes. */ -%token <voidval> VARIABLE +%token <voidval> DOLLAR_VARIABLE /* Object pascal */ @@ -521,7 +521,7 @@ exp : FLOAT exp : variable ; -exp : VARIABLE +exp : DOLLAR_VARIABLE /* Already written by write_dollar_variable. Handle current_type. */ { if (intvar) { @@ -1492,7 +1492,7 @@ yylex (void) tmp[namelen] = '\0'; intvar = lookup_only_internalvar (tmp + 1); free (uptokstart); - return VARIABLE; + return DOLLAR_VARIABLE; } /* Use token-type BLOCKNAME for symbols that happen to be defined as |