diff options
author | Tom Tromey <tom@tromey.com> | 2018-06-01 23:02:37 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2018-06-18 12:29:15 -0600 |
commit | 69d340c68449f238fe665abf4a3a7989cd2d8376 (patch) | |
tree | 7f2a8b1808d62b69775b5fa095e5e8e6382a22dd /gdb/d-exp.y | |
parent | db67d458959d211835f78d8f2aebb5ae84eb42e7 (diff) | |
download | fsf-binutils-gdb-69d340c68449f238fe665abf4a3a7989cd2d8376.zip fsf-binutils-gdb-69d340c68449f238fe665abf4a3a7989cd2d8376.tar.gz fsf-binutils-gdb-69d340c68449f238fe665abf4a3a7989cd2d8376.tar.bz2 |
Remove la_error
While working on the parser code, I noticed that yyerror is exported
from each parser. It is used by this code in parse.c:
TRY
{
if (lang->la_parser (&ps))
lang->la_error (NULL);
}
However, it seems to me that la_error will never be called here,
because in every case, la_parser throws an exception on error -- each
implementation of yyerror just calls error.
So, this patch removes la_error and makes all the yyerror functions
static. This is handy primarily because it makes it simpler to make
the expression parsers pure.
Tested by the buildbot.
gdb/ChangeLog
2018-06-18 Tom Tromey <tom@tromey.com>
* rust-lang.h (rust_yyerror): Don't declare.
* rust-lang.c (rust_language_defn): Update.
* rust-exp.y (yyerror): Now static.
* parse.c (parse_exp_in_context_1): Update.
* p-lang.h (p_yyerror): Don't declare.
* p-lang.c (p_language_defn): Update.
* p-exp.y (yyerror): Now static.
* opencl-lang.c (opencl_language_defn): Update.
* objc-lang.c (objc_language_defn): Update.
* m2-lang.h (m2_yyerror): Don't declare.
* m2-lang.c (m2_language_defn): Update.
* m2-exp.y (yyerror): Now static.
* language.h (struct language_defn) <la_error>: Remove.
* language.c (unk_lang_error): Remove.
(unknown_language_defn, auto_language_defn): Remove.
* go-lang.h (go_yyerror): Don't declare.
* go-lang.c (go_language_defn): Update.
* go-exp.y (yyerror): Now static.
* f-lang.h (f_yyerror): Don't declare.
* f-lang.c (f_language_defn): Update.
* f-exp.y (yyerror): Now static.
* d-lang.h (d_yyerror): Don't declare.
* d-lang.c (d_language_defn): Update.
* d-exp.y (yyerror): Now static.
* c-lang.h (c_yyerror): Don't declare.
* c-lang.c (c_language_defn, cplus_language_defn)
(asm_language_defn, minimal_language_defn): Update.
* c-exp.y (yyerror): Now static.
* ada-lang.h (ada_yyerror): Don't declare.
* ada-lang.c (ada_language_defn): Update.
* ada-exp.y (yyerror): Now static.
Diffstat (limited to 'gdb/d-exp.y')
-rw-r--r-- | gdb/d-exp.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/d-exp.y b/gdb/d-exp.y index 508927b..74e4b63 100644 --- a/gdb/d-exp.y +++ b/gdb/d-exp.y @@ -69,7 +69,7 @@ int yyparse (void); static int yylex (void); -void yyerror (const char *); +static void yyerror (const char *); static int type_aggregate_p (struct type *); @@ -1627,12 +1627,12 @@ d_parse (struct parser_state *par_state) return yyparse (); } -void +static void yyerror (const char *msg) { if (prev_lexptr) lexptr = prev_lexptr; - error (_("A %s in expression, near `%s'."), (msg ? msg : "error"), lexptr); + error (_("A %s in expression, near `%s'."), msg, lexptr); } |