diff options
| author | Pedro Alves <palves@redhat.com> | 2015-02-27 16:33:07 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-02-27 16:33:07 +0000 |
| commit | fe978cb071b460b2d4aed2f9a71d895f84efce0e (patch) | |
| tree | 65d107663745fc7872e680feea9ec2fa6a4949ad /gdb/cp-name-parser.y | |
| parent | 3bc3d82a005466a66fa22f704c90f4486ca71344 (diff) | |
| download | binutils-fe978cb071b460b2d4aed2f9a71d895f84efce0e.zip binutils-fe978cb071b460b2d4aed2f9a71d895f84efce0e.tar.gz binutils-fe978cb071b460b2d4aed2f9a71d895f84efce0e.tar.bz2 | |
C++ keyword cleanliness, mostly auto-generated
This patch renames symbols that happen to have names which are
reserved keywords in C++.
Most of this was generated with Tromey's cxx-conversion.el script.
Some places where later hand massaged a bit, to fix formatting, etc.
And this was rebased several times meanwhile, along with re-running
the script, so re-running the script from scratch probably does not
result in the exact same output. I don't think that matters anyway.
gdb/
2015-02-27 Tom Tromey <tromey@redhat.com>
Pedro Alves <palves@redhat.com>
Rename symbols whose names are reserved C++ keywords throughout.
gdb/gdbserver/
2015-02-27 Tom Tromey <tromey@redhat.com>
Pedro Alves <palves@redhat.com>
Rename symbols whose names are reserved C++ keywords throughout.
Diffstat (limited to 'gdb/cp-name-parser.y')
| -rw-r--r-- | gdb/cp-name-parser.y | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y index c1e7951..b4690ea 100644 --- a/gdb/cp-name-parser.y +++ b/gdb/cp-name-parser.y @@ -277,9 +277,9 @@ make_name (const char *name, int len) const char *opname; } -%type <comp> exp exp1 type start start_opt operator colon_name +%type <comp> exp exp1 type start start_opt oper colon_name %type <comp> unqualified_name colon_ext_name -%type <comp> template template_arg +%type <comp> templ template_arg %type <comp> builtin_type %type <comp> typespec_2 array_indicator %type <comp> colon_ext_only ext_only_name @@ -439,7 +439,7 @@ demangler_special { $$ = fill_comp (DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE, $2, $4); } ; -operator : OPERATOR NEW +oper : OPERATOR NEW { /* Match the whitespacing of cplus_demangle_operators. It would abort on unrecognized string otherwise. */ @@ -554,8 +554,8 @@ conversion_op_name /* DEMANGLE_COMPONENT_NAME */ /* This accepts certain invalid placements of '~'. */ -unqualified_name: operator - | operator '<' template_params '>' +unqualified_name: oper + | oper '<' template_params '>' { $$ = fill_comp (DEMANGLE_COMPONENT_TEMPLATE, $1, $3.comp); } | '~' NAME { $$ = make_dtor (gnu_v3_complete_object_dtor, $2); } @@ -579,9 +579,9 @@ colon_name : name name : nested_name NAME %prec NAME { $$ = $1.comp; d_right ($1.last) = $2; } | NAME %prec NAME - | nested_name template %prec NAME + | nested_name templ %prec NAME { $$ = $1.comp; d_right ($1.last) = $2; } - | template %prec NAME + | templ %prec NAME ; colon_ext_name : colon_name @@ -611,13 +611,13 @@ nested_name : NAME COLONCOLON d_left ($$.last) = $2; d_right ($$.last) = NULL; } - | template COLONCOLON + | templ COLONCOLON { $$.comp = make_empty (DEMANGLE_COMPONENT_QUAL_NAME); d_left ($$.comp) = $1; d_right ($$.comp) = NULL; $$.last = $$.comp; } - | nested_name template COLONCOLON + | nested_name templ COLONCOLON { $$.comp = $1.comp; d_right ($1.last) = make_empty (DEMANGLE_COMPONENT_QUAL_NAME); $$.last = d_right ($1.last); @@ -628,7 +628,7 @@ nested_name : NAME COLONCOLON /* DEMANGLE_COMPONENT_TEMPLATE */ /* DEMANGLE_COMPONENT_TEMPLATE_ARGLIST */ -template : NAME '<' template_params '>' +templ : NAME '<' template_params '>' { $$ = fill_comp (DEMANGLE_COMPONENT_TEMPLATE, $1, $3.comp); } ; |