94af9270db
Based on work from Daniel Jacobowitz <dan@codesourcery.com> * c-typeprint.c (cp_type_print_method_args): For non-static methods, print out const or volatile qualifiers, too. (c_type_print_args): Add parameters show_artificial and language. Skip artificial parameters when requested. Use the appropriate language printer. (c_type_print_varspec): Tell c_type_print_args to skip artificial parameters and pass language_c. * dwarf2read.c (die_list): New file global. (struct partial_die_info): Update comments for name field. (pdi_needs_namespace): Renamed to ... (die_needs_namespace): ... this. Rewrite. (dwarf2_linkage_name): Remove. (add_partial_symbol): Do not predicate the call to partial_die_full_name based on pdi_needs_namespace. Remove call to cp_check_possible_namespace_symbols and associated outdated comments. (guess_structure_name): Do not inspect child subprogram DIEs. (dwarf2_fullname): Update comments. Use die_needs_namespace to assist in computing the name. (read_func_scope): Use dwarf2_name to get the DIE's name. Use dwarf2_physname to get the "linkage name" of the DIE. (dwarf2_add_member_field): Use dwarf2_physname instead of dwarf2_linkage_name. (read_structure_type): For structs and classes, set TYPE_NAME, too. (determine_class): Remove. (read_partial_die): Ignore DW_AT_MIPS_linkage_name for all languages except Ada. (new_symbol): Unconditionally call dwarf2_name. Compute the "linkage name" using dwarf2_physname. Use dwarf2_name instead of dwarf2_full_name for enumerator DIEs. When determining to scan for anonymous C++ namespaces, ignore the linkage name. (dwarf2_physname): New function. (dwarf2_full_name): Move content to new function and call that. (dwarf2_compute_name): "New" function. (_initialize_dwarf2_read): Initialize die_list. * gnu-v3-eabi.c (gnu_v3_find_method_in): Remove unused variable physname. (gnu_v3_print_method_ptr): Use the physname for virtual methods without a demangled name. Print out type information for non-virtual methods. * linespec.c (decode_line_1): Force ANY string using "::" (or "." for java) to use decode_compound, and clean up any stray quoting. If we found a file symtab, re-evaluate whether the remainder is_quoted. (decode_compound): Stop consuming at an open parenthesis. Keep template parameters. Keep any overload information. Keep keywords like "const". Remove paren_pointer. Move is_quoted check from set_flags to here. Remove #if 0 code from 2000. Ten years is long enough. (find_method): Before comparing symbol names, canonicalize the string from the user. If a specific overload is requested, find it. Otherwise throw an error. (find_method_overload_end): New function. (set_flags): Remove. (decode_compound): Assume that parentheses are matched. It's a lot easier. * symtab.c (symbol_find_demangled_name): Add DMGL_VERBOSE flag to cplus_demangle. * linespec.c (decode_line_1): Keep important keywords like "const" and "volatile". * symtab.h (SYMBOL_CPLUS_DEMANGLED_NAME): Remove. * typeprint.h (c_type_print_args): Add declaration. * ui-file.c (do_ui_file_obsavestring): New function. (ui_file_obsavestring): New function. * ui-file.h (ui_file_obsavestring): Add declaration. * valops.c (find_overload_match): Resolve the object to a non-pointer type. If the object is a data member, search the object for the member and return with staticp set. Use SYMBOL_NATURAL_NAME instead of SYMBOL_CPLUS_DEMANGLED_NAME. Do not attempt to extract a function name from non-function types. If the extracted function name and the original name are the same, we don't have a C++ method. From Jan Kratochvil <jan.kratochvil@redhat.com>: * dwarf2read.c (new_symbol <DW_TAG_enumerator>): Call dwarf2_full_name. * ada-lang.c (ada_lookup_symbol): Remove linkage_name parameters and arguments from symbol lookups. * ax-gdb.c (gen_expr): Likewise. * cp-namespace.c (cp_lookup_symbol_nonlocal, lookup_namespace_scope, cp_lookup_symbol_namespace, lookup_symbol_file, lookup_nested_type, lookup_possible_namespace_symbol): Likewise. * cp-support.c (read_in_psymtabs): Likewise. * cp-support.h (cp_lookup_symbol_nonlocal): Likewise. * language.h (la_lookup_symbol_nonlocal): Likewise. * scm-valprint.c (scm_inferior_print): Likewise. * solib-darwin.c (darwin_relocate_section_addresses): Likewise. * solib-svr.c (elf_lookup_lib): Likewise. * solib.c (show_auto_solib_add): Likewise. * solist.h (lookup_lib_global, solib_global_lookup): Likewise. * symmisc.c (maintenance_check_symtabs): Likewise. * symtab.c (lookup_symbol_in_language, lookup_symbol_aux, lookup_symbol_aux_local, lookup_symbol_aux_block, lookup_symbol_from_objfile, lookup_symbol_aux_symtabs, lookup_symbol_aux_psymtabs,basic_lookup_symbol_nonlocal, lookup_symbol_static, lookup_symbol_global, symbol_matches_domain, basic_lookup_transparent_type, find_main_psymtab, lookup_block_symbol): Likewise. * symtab.h (basic_lookp_symbol_nonlocal, lookup_symbol_static, lookup_symbol_global, lookup_symbol_aux_block, lookup_symbol_partial_symbol, lookup_block_symbol, lookup_global_symbol, value_maybe_namespace_elt): Likewise.
109 lines
4.2 KiB
C
109 lines
4.2 KiB
C
/* UI_FILE - a generic STDIO like output stream.
|
|
Copyright (C) 1999, 2000, 2007, 2008, 2009, 2010
|
|
Free Software Foundation, 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 UI_FILE_H
|
|
#define UI_FILE_H
|
|
|
|
struct obstack;
|
|
struct ui_file;
|
|
|
|
/* Create a generic ui_file object with null methods. */
|
|
|
|
extern struct ui_file *ui_file_new (void);
|
|
|
|
/* Override methods used by specific implementations of a UI_FILE
|
|
object. */
|
|
|
|
typedef void (ui_file_flush_ftype) (struct ui_file * stream);
|
|
extern void set_ui_file_flush (struct ui_file *stream, ui_file_flush_ftype * flush);
|
|
|
|
/* NOTE: Both fputs and write methods are available. Default
|
|
implementations that mapping one onto the other are included. */
|
|
typedef void (ui_file_write_ftype) (struct ui_file * stream, const char *buf, long length_buf);
|
|
extern void set_ui_file_write (struct ui_file *stream, ui_file_write_ftype *fputs);
|
|
|
|
typedef void (ui_file_fputs_ftype) (const char *, struct ui_file * stream);
|
|
extern void set_ui_file_fputs (struct ui_file *stream, ui_file_fputs_ftype * fputs);
|
|
|
|
typedef long (ui_file_read_ftype) (struct ui_file * stream, char *buf, long length_buf);
|
|
extern void set_ui_file_read (struct ui_file *stream, ui_file_read_ftype *fread);
|
|
|
|
typedef int (ui_file_isatty_ftype) (struct ui_file * stream);
|
|
extern void set_ui_file_isatty (struct ui_file *stream, ui_file_isatty_ftype * isatty);
|
|
|
|
typedef void (ui_file_rewind_ftype) (struct ui_file * stream);
|
|
extern void set_ui_file_rewind (struct ui_file *stream, ui_file_rewind_ftype * rewind);
|
|
|
|
typedef void (ui_file_put_method_ftype) (void *object, const char *buffer, long length_buffer);
|
|
typedef void (ui_file_put_ftype) (struct ui_file *stream, ui_file_put_method_ftype * method, void *context);
|
|
extern void set_ui_file_put (struct ui_file *stream, ui_file_put_ftype * put);
|
|
|
|
typedef void (ui_file_delete_ftype) (struct ui_file * stream);
|
|
extern void set_ui_file_data (struct ui_file *stream, void *data, ui_file_delete_ftype * delete);
|
|
|
|
extern void *ui_file_data (struct ui_file *file);
|
|
|
|
|
|
extern void gdb_flush (struct ui_file *);
|
|
|
|
extern void ui_file_delete (struct ui_file *stream);
|
|
|
|
extern void ui_file_rewind (struct ui_file *stream);
|
|
|
|
extern int ui_file_isatty (struct ui_file *);
|
|
|
|
extern void ui_file_write (struct ui_file *file, const char *buf, long length_buf);
|
|
|
|
/* NOTE: copies left to right */
|
|
extern void ui_file_put (struct ui_file *src, ui_file_put_method_ftype *write, void *dest);
|
|
|
|
/* Returns a freshly allocated buffer containing the entire contents
|
|
of FILE (as determined by ui_file_put()) with a NUL character
|
|
appended. LENGTH, if not NULL, is set to the size of the buffer
|
|
minus that appended NUL. */
|
|
extern char *ui_file_xstrdup (struct ui_file *file, long *length);
|
|
|
|
/* Similar to ui_file_xstrdup, but return a new string allocated on
|
|
OBSTACK. */
|
|
extern char *ui_file_obsavestring (struct ui_file *file,
|
|
struct obstack *obstack, long *length);
|
|
|
|
extern long ui_file_read (struct ui_file *file, char *buf, long length_buf);
|
|
|
|
/* Create/open a memory based file. Can be used as a scratch buffer
|
|
for collecting output. */
|
|
extern struct ui_file *mem_fileopen (void);
|
|
|
|
|
|
|
|
/* Open/create a an STDIO based UI_FILE using the already open FILE. */
|
|
extern struct ui_file *stdio_fileopen (FILE *file);
|
|
|
|
/* Open NAME returning an STDIO based UI_FILE. */
|
|
extern struct ui_file *gdb_fopen (char *name, char *mode);
|
|
|
|
/* Create a file which writes to both ONE and TWO. CLOSE_ONE
|
|
and CLOSE_TWO indicate whether the original files should be
|
|
closed when the new file is closed. */
|
|
struct ui_file *tee_file_new (struct ui_file *one,
|
|
int close_one,
|
|
struct ui_file *two,
|
|
int close_two);
|
|
#endif
|