bb4142cf49
This last patch removes "partial" from the names of expand_partial_symbol_names and map_partial_symbol_filenames. It also renames expand_partial_symbol_names to match the struct quick_symbol_functions "method" that it wraps: expand_symtabs_matching. This patch also adds two parameters to expand_symtabs_matching so that it can fully wrap the underlying quick_symbol_functions method. This makes it usable in more places. I thought of having a cover function that still had the same signature as the old expand_partial_symbol_names function, but I couldn't think of a good name, and it wasn't clear it was worth it anyway. * symfile.h (expand_symtabs_matching): Renamed from expand_partial_symbol_names. Update prototype. (map_symbol_filenames): Renamed from map_partial_symbol_filenames. * symfile.c (expand_symtabs_matching): Renamed from expand_partial_symbol_names. New args file_matcher, kind. Rename arg fun to symbol_matcher. (map_symbol_filenames): Renamed from map_partial_symbol_filenames. * ada-lang.c (ada_complete_symbol_matcher): Renamed from ada_expand_partial_symbol_name. (ada_make_symbol_completion_list): Update to call expand_symtabs_matching. (ada_add_global_exceptions): Call expand_symtabs_matching. * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_files): Update to call map_symbol_filenames. * symtab.c (sources_info): Update to call map_symbol_filenames. (search_symbols): Call expand_symtabs_matching. (symbol_completion_matcher): Renamed from expand_partial_symbol_name. (default_make_symbol_completion_list_break_on): Update to call expand_symtabs_matching. (make_source_files_completion_list): Update to call map_symbol_filenames.
107 lines
3.3 KiB
C
107 lines
3.3 KiB
C
/* MI Command Set - file commands.
|
|
Copyright (C) 2000-2014 Free Software Foundation, Inc.
|
|
Contributed by Cygnus Solutions (a Red Hat company).
|
|
|
|
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/>. */
|
|
|
|
#include "defs.h"
|
|
#include "mi-cmds.h"
|
|
#include "mi-getopt.h"
|
|
#include "ui-out.h"
|
|
#include "symtab.h"
|
|
#include "source.h"
|
|
#include "objfiles.h"
|
|
#include "psymtab.h"
|
|
|
|
/* Return to the client the absolute path and line number of the
|
|
current file being executed. */
|
|
|
|
void
|
|
mi_cmd_file_list_exec_source_file (char *command, char **argv, int argc)
|
|
{
|
|
struct symtab_and_line st;
|
|
struct ui_out *uiout = current_uiout;
|
|
|
|
if (!mi_valid_noargs ("-file-list-exec-source-file", argc, argv))
|
|
error (_("-file-list-exec-source-file: Usage: No args"));
|
|
|
|
/* Set the default file and line, also get them. */
|
|
set_default_source_symtab_and_line ();
|
|
st = get_current_source_symtab_and_line ();
|
|
|
|
/* We should always get a symtab. Apparently, filename does not
|
|
need to be tested for NULL. The documentation in symtab.h
|
|
suggests it will always be correct. */
|
|
if (!st.symtab)
|
|
error (_("-file-list-exec-source-file: No symtab"));
|
|
|
|
/* Print to the user the line, filename and fullname. */
|
|
ui_out_field_int (uiout, "line", st.line);
|
|
ui_out_field_string (uiout, "file",
|
|
symtab_to_filename_for_display (st.symtab));
|
|
|
|
ui_out_field_string (uiout, "fullname", symtab_to_fullname (st.symtab));
|
|
|
|
ui_out_field_int (uiout, "macro-info", st.symtab->macro_table ? 1 : 0);
|
|
}
|
|
|
|
/* A callback for map_partial_symbol_filenames. */
|
|
|
|
static void
|
|
print_partial_file_name (const char *filename, const char *fullname,
|
|
void *ignore)
|
|
{
|
|
struct ui_out *uiout = current_uiout;
|
|
|
|
ui_out_begin (uiout, ui_out_type_tuple, NULL);
|
|
|
|
ui_out_field_string (uiout, "file", filename);
|
|
|
|
if (fullname)
|
|
ui_out_field_string (uiout, "fullname", fullname);
|
|
|
|
ui_out_end (uiout, ui_out_type_tuple);
|
|
}
|
|
|
|
void
|
|
mi_cmd_file_list_exec_source_files (char *command, char **argv, int argc)
|
|
{
|
|
struct ui_out *uiout = current_uiout;
|
|
struct symtab *s;
|
|
struct objfile *objfile;
|
|
|
|
if (!mi_valid_noargs ("-file-list-exec-source-files", argc, argv))
|
|
error (_("-file-list-exec-source-files: Usage: No args"));
|
|
|
|
/* Print the table header. */
|
|
ui_out_begin (uiout, ui_out_type_list, "files");
|
|
|
|
/* Look at all of the symtabs. */
|
|
ALL_SYMTABS (objfile, s)
|
|
{
|
|
ui_out_begin (uiout, ui_out_type_tuple, NULL);
|
|
|
|
ui_out_field_string (uiout, "file", symtab_to_filename_for_display (s));
|
|
ui_out_field_string (uiout, "fullname", symtab_to_fullname (s));
|
|
|
|
ui_out_end (uiout, ui_out_type_tuple);
|
|
}
|
|
|
|
map_symbol_filenames (print_partial_file_name, NULL,
|
|
1 /*need_fullname*/);
|
|
|
|
ui_out_end (uiout, ui_out_type_list);
|
|
}
|