diff options
author | Pedro Alves <palves@redhat.com> | 2016-04-22 16:40:33 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2016-04-22 16:40:33 +0100 |
commit | b3f11165aad39586cca0352ed5fe32b721699c76 (patch) | |
tree | ad558eff00c2bdc9d3d75a1adc2d5397b98e5cbc /gdb/d-exp.y | |
parent | 6290672f89d5638a9da5ce10b2f4ba793dcc6396 (diff) | |
download | fsf-binutils-gdb-b3f11165aad39586cca0352ed5fe32b721699c76.zip fsf-binutils-gdb-b3f11165aad39586cca0352ed5fe32b721699c76.tar.gz fsf-binutils-gdb-b3f11165aad39586cca0352ed5fe32b721699c76.tar.bz2 |
Centralize yacc interface names remapping (yyparse, yylex, yyerror, etc)
This factors out all the yy-variables remapping to a single file,
instead of each parser having to do the same, with different prefixes.
With this, a parser just needs to define the prefix they want and
include yy-remap.h, which does the dirty job.
Note this renames the c_error, ada_error, etc. functions. Writing the
remapping pattern as:
#define yyerror GDB_YY_REMAP (error)
instead of:
#define yyerror GDB_YY_REMAP (yyerror)
would have avoided the renaming. However, that would be problematic
if we have a macro 'foo' in scope, when we write:
#define yyfoo GDB_YY_REMAP (foo)
as that would expand 'foo'.
The c_yyerror etc. naming end ups indicating that this is a yacc
related function more clearly, so feels like a good change, anyway.
gdb/ChangeLog:
2016-04-22 Pedro Alves <palves@redhat.com>
* ada-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* ada-lang.c (ada_language_defn): Adjust.
* ada-lang.h (ada_error): Rename to ...
(ada_yyerror): ... this.
* c-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* c-lang.c (c_language_defn, cplus_language_defn)
(asm_language_defn, minimal_language_defn): Adjust.
* c-lang.h (c_error): Rename to ...
(c_yyerror): ... this.
* d-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* d-lang.c (d_language_defn): Adjust.
* d-lang.h (d_error): Rename to ...
(d_yyerror): ... this.
* f-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* f-lang.c (f_language_defn): Adjust.
* f-lang.h (f_error): Rename to ...
(f_yyerror): ... this.
* go-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* go-lang.c (go_language_defn): Adjust.
* go-lang.h (go_error): Rename to ...
(go_yyerror): ... this.
* jv-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* jv-lang.c (java_language_defn): Adjust.
* jv-lang.h (java_error): Rename to ...
(java_yyerror): ... this.
* m2-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* m2-lang.c (m2_language_defn): Adjust.
* m2-lang.h (m2_error): Rename to ...
(m2_yyerror): ... this.
* objc-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* objc-lang.c (objc_language_defn): Adjust.
* opencl-lang.c (opencl_language_defn): Adjust.
* p-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* p-lang.c (pascal_language_defn): Adjust.
* p-lang.h (pascal_error): Rename to ...
(pascal_yyerror): ... this.
* yy-remap.h: New file.
Diffstat (limited to 'gdb/d-exp.y')
-rw-r--r-- | gdb/d-exp.y | 63 |
1 files changed, 4 insertions, 59 deletions
diff --git a/gdb/d-exp.y b/gdb/d-exp.y index 54c01c5..e7b11e7 100644 --- a/gdb/d-exp.y +++ b/gdb/d-exp.y @@ -55,65 +55,10 @@ #define parse_type(ps) builtin_type (parse_gdbarch (ps)) #define parse_d_type(ps) builtin_d_type (parse_gdbarch (ps)) -/* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc), - as well as gratuitiously global symbol names, so we can have multiple - yacc generated parsers in gdb. Note that these are only the variables - produced by yacc. If other parser generators (bison, byacc, etc) produce - additional global names that conflict at link time, then those parser - generators need to be fixed instead of adding those names to this list. */ - -#define yymaxdepth d_maxdepth -#define yyparse d_parse_internal -#define yylex d_lex -#define yyerror d_error -#define yylval d_lval -#define yychar d_char -#define yydebug d_debug -#define yypact d_pact -#define yyr1 d_r1 -#define yyr2 d_r2 -#define yydef d_def -#define yychk d_chk -#define yypgo d_pgo -#define yyact d_act -#define yyexca d_exca -#define yyerrflag d_errflag -#define yynerrs d_nerrs -#define yyps d_ps -#define yypv d_pv -#define yys d_s -#define yy_yys d_yys -#define yystate d_state -#define yytmp d_tmp -#define yyv d_v -#define yy_yyv d_yyv -#define yyval d_val -#define yylloc d_lloc -#define yyreds d_reds /* With YYDEBUG defined */ -#define yytoks d_toks /* With YYDEBUG defined */ -#define yyname d_name /* With YYDEBUG defined */ -#define yyrule d_rule /* With YYDEBUG defined */ -#define yylhs d_yylhs -#define yylen d_yylen -#define yydefre d_yydefred -#define yydgoto d_yydgoto -#define yysindex d_yysindex -#define yyrindex d_yyrindex -#define yygindex d_yygindex -#define yytable d_yytable -#define yycheck d_yycheck -#define yyss d_yyss -#define yysslim d_yysslim -#define yyssp d_yyssp -#define yystacksize d_yystacksize -#define yyvs d_yyvs -#define yyvsp d_yyvsp - -#ifndef YYDEBUG -#define YYDEBUG 1 /* Default to yydebug support */ -#endif - -#define YYFPRINTF parser_fprintf +/* Remap normal yacc parser interface names (yyparse, yylex, yyerror, + etc). */ +#define GDB_YY_REMAP_PREFIX d_ +#include "yy-remap.h" /* The state of the parser, used internally when we are parsing the expression. */ |