diff options
author | Tom Tromey <tom@tromey.com> | 2020-12-16 15:12:55 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2020-12-16 15:17:43 -0700 |
commit | 35c1ab606dcf99e36a82498864b6afa095088692 (patch) | |
tree | 2b6a3ff8e85304811f7434c0605c908fc1bddf62 | |
parent | 93df4a1d079ba804fa66b67d2b2acf1fd62c2cd9 (diff) | |
download | gdb-35c1ab606dcf99e36a82498864b6afa095088692.zip gdb-35c1ab606dcf99e36a82498864b6afa095088692.tar.gz gdb-35c1ab606dcf99e36a82498864b6afa095088692.tar.bz2 |
Change void_context_p to bool
This patch changes void_context_p to bool, as a prerequisite to the
change to post_parser that I submitted here:
https://sourceware.org/pipermail/gdb-patches/2020-December/174080.html
Tested by rebuilding.
Note that nothing in-tree passes true here. I don't know why this is,
but there is a use of this internally in AdaCore's tree. I will try
to submit that patch, if it is needed. (And if not, I will come back
around and remove this.)
gdb/ChangeLog
2020-12-16 Tom Tromey <tom@tromey.com>
* parse.c (parse_exp_1, parse_expression_for_completion): Update.
(parse_exp_in_context): Change void_context_p to bool.
* language.h (struct language_defn) <post_parser>: Change
void_context_p to bool.
* ada-lang.c (class ada_language) <post_parser>: Update.
-rw-r--r-- | gdb/ChangeLog | 8 | ||||
-rw-r--r-- | gdb/ada-lang.c | 2 | ||||
-rw-r--r-- | gdb/language.h | 2 | ||||
-rw-r--r-- | gdb/parse.c | 8 |
4 files changed, 14 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5dc879b..7b8e727 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,4 +1,12 @@ 2020-12-16 Tom Tromey <tom@tromey.com> + + * parse.c (parse_exp_1, parse_expression_for_completion): Update. + (parse_exp_in_context): Change void_context_p to bool. + * language.h (struct language_defn) <post_parser>: Change + void_context_p to bool. + * ada-lang.c (class ada_language) <post_parser>: Update. + +2020-12-16 Tom Tromey <tom@tromey.com> Tom Tromey <tromey@redhat.com> Tom de Vries <tdevries@suse.de> diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 8f437fc..23d7a16 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -14124,7 +14124,7 @@ public: A null CONTEXT_TYPE indicates that a non-void return type is preferred. May change (expand) *EXP. */ - void post_parser (expression_up *expp, int void_context_p, int completing, + void post_parser (expression_up *expp, bool void_context_p, int completing, innermost_block_tracker *tracker) const override { struct type *context_type = NULL; diff --git a/gdb/language.h b/gdb/language.h index e955340..5bc99d5 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -527,7 +527,7 @@ struct language_defn non-zero, then the expression has been parsed for completion, not evaluation. */ - virtual void post_parser (expression_up *expp, int void_context_p, + virtual void post_parser (expression_up *expp, bool void_context_p, int completing, innermost_block_tracker *tracker) const { diff --git a/gdb/parse.c b/gdb/parse.c index 73d82e6..a27ae86 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -88,7 +88,7 @@ static int prefixify_subexp (struct expression *, struct expression *, int, static expression_up parse_exp_in_context (const char **, CORE_ADDR, const struct block *, int, - int, int *, + bool, int *, innermost_block_tracker *, expr_completion_state *); @@ -1028,7 +1028,7 @@ expression_up parse_exp_1 (const char **stringptr, CORE_ADDR pc, const struct block *block, int comma, innermost_block_tracker *tracker) { - return parse_exp_in_context (stringptr, pc, block, comma, 0, NULL, + return parse_exp_in_context (stringptr, pc, block, comma, false, NULL, tracker, nullptr); } @@ -1042,7 +1042,7 @@ parse_exp_1 (const char **stringptr, CORE_ADDR pc, const struct block *block, static expression_up parse_exp_in_context (const char **stringptr, CORE_ADDR pc, const struct block *block, - int comma, int void_context_p, int *out_subexp, + int comma, bool void_context_p, int *out_subexp, innermost_block_tracker *tracker, expr_completion_state *cstate) { @@ -1205,7 +1205,7 @@ parse_expression_for_completion (const char *string, try { - exp = parse_exp_in_context (&string, 0, 0, 0, 0, &subexp, + exp = parse_exp_in_context (&string, 0, 0, 0, false, &subexp, nullptr, &cstate); } catch (const gdb_exception_error &except) |