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/m2-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/m2-exp.y')
| -rw-r--r-- | gdb/m2-exp.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y index a039491..85d5876 100644 --- a/gdb/m2-exp.y +++ b/gdb/m2-exp.y @@ -125,7 +125,7 @@ static int number_sign = 1; /* The GDB scope operator */ %token COLONCOLON -%token <voidval> INTERNAL_VAR +%token <voidval> DOLLAR_VARIABLE /* M2 tokens */ %left ',' @@ -535,7 +535,7 @@ variable: fblock ; /* GDB internal ($foo) variable */ -variable: INTERNAL_VAR +variable: DOLLAR_VARIABLE ; /* GDB scope operator */ @@ -949,7 +949,7 @@ yylex (void) if (*tokstart == '$') { write_dollar_variable (pstate, yylval.sval); - return INTERNAL_VAR; + return DOLLAR_VARIABLE; } /* Use token-type BLOCKNAME for symbols that happen to be defined as |