mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
211d5b1c18
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
65 lines
2.3 KiB
C
65 lines
2.3 KiB
C
/* Interface to functions for deciding which macros are currently in scope.
|
|
Copyright (C) 2002-2020 Free Software Foundation, Inc.
|
|
Contributed by Red Hat, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef MACROSCOPE_H
|
|
#define MACROSCOPE_H
|
|
|
|
#include "macrotab.h"
|
|
#include "symtab.h"
|
|
|
|
|
|
/* The table of macros defined by the user. */
|
|
extern struct macro_table *macro_user_macros;
|
|
|
|
/* All the information we need to decide which macro definitions are
|
|
in scope: a source file (either a main source file or an
|
|
#inclusion), and a line number in that file. */
|
|
struct macro_scope {
|
|
struct macro_source_file *file;
|
|
int line;
|
|
};
|
|
|
|
|
|
/* Return a `struct macro_scope' object corresponding to the symtab
|
|
and line given in SAL. If we have no macro information for that
|
|
location, or if SAL's pc is zero, return zero. */
|
|
gdb::unique_xmalloc_ptr<struct macro_scope> sal_macro_scope
|
|
(struct symtab_and_line sal);
|
|
|
|
|
|
/* Return a `struct macro_scope' object representing just the
|
|
user-defined macros. */
|
|
gdb::unique_xmalloc_ptr<struct macro_scope> user_macro_scope (void);
|
|
|
|
/* Return a `struct macro_scope' object describing the scope the `macro
|
|
expand' and `macro expand-once' commands should use for looking up
|
|
macros. If we have a selected frame, this is the source location of
|
|
its PC; otherwise, this is the last listing position.
|
|
|
|
If we have no macro information for the current location, return
|
|
the user macro scope. */
|
|
gdb::unique_xmalloc_ptr<struct macro_scope> default_macro_scope (void);
|
|
|
|
/* Look up the definition of the macro named NAME in scope at the source
|
|
location given by MS. */
|
|
macro_definition *standard_macro_lookup (const char *name,
|
|
const macro_scope &ms);
|
|
|
|
#endif /* MACROSCOPE_H */
|