diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2020-07-02 20:38:25 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2020-07-03 22:27:08 -0400 |
| commit | 211d5b1c18eb96459289e17b58e91fad46708173 (patch) | |
| tree | 9167b6d775563b6970d1d0c9a5b36b4d4197de94 /gdb/c-exp.y | |
| parent | 889d527eb43c90cc37e757a3cddd0837c3fd9dd9 (diff) | |
| download | gdb-211d5b1c18eb96459289e17b58e91fad46708173.zip gdb-211d5b1c18eb96459289e17b58e91fad46708173.tar.gz gdb-211d5b1c18eb96459289e17b58e91fad46708173.tar.bz2 | |
gdb: remove callback in macro expand functions
I started to look into changing the callbacks in macroexp.h to use
gdb::function_view. However, I noticed that the passed lookup function
was always `standard_macro_lookup`, which looks up a macro in a
`macro_scope` object. Since that doesn't look like a very useful
abstraction, it would be simpler to just pass the scope around and have
the various functions call standard_macro_lookup themselves. This is
what this patch does.
gdb/ChangeLog:
* macroexp.h (macro_lookup_ftype): Remove.
(macro_expand, macro_expand_once, macro_expand_next): Remove
lookup function parameters, add scope parameter.
* macroexp.c (scan, substitute_args, expand, maybe_expand,
macro_expand, macro_expand_once, macro_expand_next): Likewise.
* macroscope.h (standard_macro_lookup): Change parameter type
to macro_scope.
* macroscope.c (standard_macro_lookup): Likewise.
* c-exp.y (lex_one_token): Update.
* macrocmd.c (macro_expand_command): Likewise.
(macro_expand_once_command): Likewise.
Change-Id: Id2431b1489359e1b0274dc2b81e5ea5d225d730c
Diffstat (limited to 'gdb/c-exp.y')
| -rw-r--r-- | gdb/c-exp.y | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gdb/c-exp.y b/gdb/c-exp.y index 5ec84eb..61fa2fe 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -2632,8 +2632,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name) if (! scanning_macro_expansion ()) { char *expanded = macro_expand_next (&pstate->lexptr, - standard_macro_lookup, - expression_macro_scope); + *expression_macro_scope); if (expanded) scan_macro_expansion (expanded); |