/* Functions for deciding which macros are currently in scope.
- Copyright (C) 2002-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002-2021 Free Software Foundation, Inc.
Contributed by Red Hat, Inc.
This file is part of GDB.
struct macro_table *macro_user_macros;
-struct macro_scope *
+gdb::unique_xmalloc_ptr<struct macro_scope>
sal_macro_scope (struct symtab_and_line sal)
{
struct macro_source_file *main_file, *inclusion;
- struct macro_scope *ms;
struct compunit_symtab *cust;
if (sal.symtab == NULL)
if (COMPUNIT_MACRO_TABLE (cust) == NULL)
return NULL;
- ms = XNEW (struct macro_scope);
+ gdb::unique_xmalloc_ptr<struct macro_scope> ms (XNEW (struct macro_scope));
main_file = macro_main (COMPUNIT_MACRO_TABLE (cust));
inclusion = macro_lookup_inclusion (main_file, sal.symtab->filename);
else
{
/* There are, unfortunately, cases where a compilation unit can
- have a symtab for a source file that doesn't appear in the
- macro table. For example, at the moment, Dwarf doesn't have
- any way in the .debug_macinfo section to describe the effect
- of #line directives, so if you debug a YACC parser you'll get
- a macro table which only mentions the .c files generated by
- YACC, but symtabs that mention the .y files consumed by YACC.
-
- In the long run, we should extend the Dwarf macro info
- representation to handle #line directives, and get GCC to
- emit it.
-
- For the time being, though, we'll just treat these as
- occurring at the end of the main source file. */
+ have a symtab for a source file that doesn't appear in the
+ macro table. For example, at the moment, Dwarf doesn't have
+ any way in the .debug_macinfo section to describe the effect
+ of #line directives, so if you debug a YACC parser you'll get
+ a macro table which only mentions the .c files generated by
+ YACC, but symtabs that mention the .y files consumed by YACC.
+
+ In the long run, we should extend the Dwarf macro info
+ representation to handle #line directives, and get GCC to
+ emit it.
+
+ For the time being, though, we'll just treat these as
+ occurring at the end of the main source file. */
ms->file = main_file;
ms->line = -1;
- complaint (&symfile_complaints,
- _("symtab found for `%s', but that file\n"
- "is not covered in the compilation unit's macro information"),
- symtab_to_filename_for_display (sal.symtab));
+ complaint (_("symtab found for `%s', but that file\n"
+ "is not covered in the compilation unit's macro information"),
+ symtab_to_filename_for_display (sal.symtab));
}
return ms;
}
-struct macro_scope *
+gdb::unique_xmalloc_ptr<struct macro_scope>
user_macro_scope (void)
{
- struct macro_scope *ms;
-
- ms = XNEW (struct macro_scope);
+ gdb::unique_xmalloc_ptr<struct macro_scope> ms (XNEW (struct macro_scope));
ms->file = macro_main (macro_user_macros);
ms->line = -1;
return ms;
}
-struct macro_scope *
+gdb::unique_xmalloc_ptr<struct macro_scope>
default_macro_scope (void)
{
struct symtab_and_line sal;
- struct macro_scope *ms;
+ gdb::unique_xmalloc_ptr<struct macro_scope> ms;
struct frame_info *frame;
CORE_ADDR pc;
else
{
/* Don't call select_source_symtab here. That can raise an
- error if symbols aren't loaded, but GDB calls the expression
- evaluator in all sorts of contexts.
-
- For example, commands like `set width' call the expression
- evaluator to evaluate their numeric arguments. If the
- current language is C, then that may call this function to
- choose a scope for macro expansion. If you don't have any
- symbol files loaded, then get_current_or_default would raise an
- error. But `set width' shouldn't raise an error just because
- it can't decide which scope to macro-expand its argument in. */
- struct symtab_and_line cursal =
- get_current_source_symtab_and_line ();
+ error if symbols aren't loaded, but GDB calls the expression
+ evaluator in all sorts of contexts.
+
+ For example, commands like `set width' call the expression
+ evaluator to evaluate their numeric arguments. If the
+ current language is C, then that may call this function to
+ choose a scope for macro expansion. If you don't have any
+ symbol files loaded, then get_current_or_default would raise an
+ error. But `set width' shouldn't raise an error just because
+ it can't decide which scope to macro-expand its argument in. */
+ struct symtab_and_line cursal
+ = get_current_source_symtab_and_line ();
sal.symtab = cursal.symtab;
sal.line = cursal.line;
location given by BATON, which must be a pointer to a `struct
macro_scope' structure. */
struct macro_definition *
-standard_macro_lookup (const char *name, void *baton)
+standard_macro_lookup (const char *name, const macro_scope &ms)
{
- struct macro_scope *ms = (struct macro_scope *) baton;
- struct macro_definition *result;
-
/* Give user-defined macros priority over all others. */
- result = macro_lookup_definition (macro_main (macro_user_macros), -1, name);
- if (! result)
- result = macro_lookup_definition (ms->file, ms->line, name);
+ macro_definition *result
+ = macro_lookup_definition (macro_main (macro_user_macros), -1, name);
+
+ if (result == nullptr)
+ result = macro_lookup_definition (ms.file, ms.line, name);
+
return result;
}
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_macroscope;
-
+void _initialize_macroscope ();
void
-_initialize_macroscope (void)
+_initialize_macroscope ()
{
macro_user_macros = new_macro_table (NULL, NULL, NULL);
macro_set_main (macro_user_macros, "<user-defined>");
projects / deliverable / binutils-gdb.git / blobdiff