aboutsummaryrefslogtreecommitdiff
path: root/gdb/rust-exp.y
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-06-01 23:02:37 -0600
committerTom Tromey <tom@tromey.com>2018-06-18 12:29:15 -0600
commit69d340c68449f238fe665abf4a3a7989cd2d8376 (patch)
tree7f2a8b1808d62b69775b5fa095e5e8e6382a22dd /gdb/rust-exp.y
parentdb67d458959d211835f78d8f2aebb5ae84eb42e7 (diff)
downloadgdb-69d340c68449f238fe665abf4a3a7989cd2d8376.zip
gdb-69d340c68449f238fe665abf4a3a7989cd2d8376.tar.gz
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/rust-exp.y')
-rw-r--r--gdb/rust-exp.y5
1 files changed, 3 insertions, 2 deletions
diff --git a/gdb/rust-exp.y b/gdb/rust-exp.y
index 9f21498..b609976 100644
--- a/gdb/rust-exp.y
+++ b/gdb/rust-exp.y
@@ -70,6 +70,7 @@ struct set_field
typedef std::vector<set_field> rust_set_vector;
static int rustyylex (void);
+static void rustyyerror (const char *msg);
static void rust_push_back (char c);
static const char *rust_copy_name (const char *, int);
static struct stoken rust_concat3 (const char *, const char *, const char *);
@@ -2538,11 +2539,11 @@ rust_parse (struct parser_state *state)
/* The parser error handler. */
-void
+static void
rustyyerror (const char *msg)
{
const char *where = prev_lexptr ? prev_lexptr : lexptr;
- error (_("%s in expression, near `%s'."), (msg ? msg : "Error"), where);
+ error (_("%s in expression, near `%s'."), msg, where);
}