c6756f62e0
One of the most annoying (to me) things about GDB's completion is when
you have overloads in your program, and you want to set a breakpoint
in one of them:
void function(int); // set breakpoint here.
void function(long);
(gdb) b -f func[TAB]
(gdb) b -f function( # ok, gdb completed as much as possible.
(gdb) b -f function([TAB] # show me the overloads, please.
<_all_ symbols in the program are shown...>
E.g., when debugging GDB, that'd be:
(gdb) b -f function([TAB]
(anonymous namespace)::get_global()::global pt_insn_get_offset@plt scm_new_port_table_entry
asprintf pt_pkt_alloc_decoder scm_new_port_table_entry@plt
asprintf@plt pt_pkt_alloc_decoder@plt scm_out_of_range
bt_ctf_get_char_array pt_pkt_sync_forward scm_out_of_range@plt
bt_ctf_get_char_array@plt pt_pkt_sync_forward@plt scm_putc
bt_ctf_get_uint64 pwrite scm_putc@plt
bt_ctf_get_uint64@plt pwrite@plt scm_reverse_x
bt_ctf_iter_read_event PyErr_Restore scm_reverse_x@plt
bt_ctf_iter_read_event@plt PyErr_Restore@plt scm_set_port_filename_x
<snip...>
Now that's a load of completely useless completions.
The reason GDB offers those is that the completer relies on readline
figuring out the completion word point in the input line based on the
language's word break characters, which include "(". So readline
tells the completer to complete on "", the string that is after '('.
Likewise, if you type "function(i[TAB]" to try to complete to "int",
you're out of luck. GDB shows you all the symbols in the program that
start with "i"... This makes sense for the expression completer, as
what you'd want to type is e.g., a global variable, say:
(gdb) print function(i[TAB]
but, it makes no sense when specifying a function name for a
breakpoint location.
To get around that limitation, users need to quote the function name,
like:
(gdb) b -f 'function([TAB]
function(int) function(long)
(gdb) b 'function(i[TAB]
(gdb) b 'function(int)' # now completes correctly!
Note that the quoting is only necessary for completion. Creating the
breakpoint does not require the quoting:
(gdb) b -f function(int) [RET]
Breakpoint 1 at ....
This patch removes this limitation.
(
Actually, it's a necessary patch, though not sufficient. That'll
start working correctly by the end of the series. With this patch, if try it,
you'll see:
(gdb) b -f function(i[TAB]
(gdb) b -f function
i.e., gdb strips everything after the "(". That's caused by some code
in symtab.c that'll be eliminated further down the series. These
patches are all unfortunately interrelated, which is also the reason
new tests only appear much later in the series.
But let's ignore that reality for the remainder of the description.
)
So... this patch gets rid of the need for quoting.
It does that by adding a way for a completer to control the exact
completion word point that readline should start the completion
request for, instead of letting readline try to figure it out using
the current language's word break chars array, and often failing.
In the case above, we want the completer to figure out that it's
completing a function name that starts with "function(i". It now
does.
It took me a while to figure out a way to ask readline to "use this
exact word point", and for a while I feared that it'd be impossible
with current readline (and having to rely on master readline for core
functionality is something I'd like to avoid very much). Eventually,
after several different attempts, I came up with what is described in
the comment above gdb_custom_word_point_brkchars in the patch.
With this patch, the handle_brkchars phase of the explicit location
completer advances the expected word point as it parses the input line
left to right, until it figures out exactly what we're completing,
instead of expecting readline to break the string using the word break
characters, and then having the completer heuristically fix up a bad
decision by parsing the input string backwards. This allows correctly
knowning that we're completing a symbol name after -function, complete
functions without quoting, etc.
Later, we'll make use of this same mechanims to implement a proper
linespec completer that avoids need for quoting too.
gdb/ChangeLog:
2017-07-17 Pedro Alves <palves@redhat.com>
* ada-lang.c (ada_collect_symbol_completion_matches): Add
complete_symbol_mode parameter.
* cli/cli-cmds.c (complete_command): Get the completion result out
of the handle_brkchars tracker if used a custom word point.
* completer.c: Include "linespec.h".
(enum explicit_location_match_type) <MATCH_LINE>: New enumerator.
(advance_to_expression_complete_word_point): New.
(completion_tracker::completes_to_completion_word): New.
(complete_files_symbols): Pass down
complete_symbol_mode::EXPRESSION.
(explicit_options, probe_options): New.
(collect_explicit_location_matches): Complete on the
explictit_loc->foo instead of word. Use
linespec_complete_function. Handle MATCH_LINE. Handle offering
keyword and options completions.
(backup_text_ptr): Delete.
(skip_keyword): New.
(complete_explicit_location): Remove 'word' parameter. Add
language, quoted_arg_start and quoted_arg_end parameters.
Rewrite, parsing left to right.
(location_completer): Rewrite.
(location_completer_handle_brkchars): New function.
(symbol_completer): Pass down complete_symbol_mode::EXPRESSION.
(enum complete_line_internal_reason): Adjust comments.
(completion_tracker::discard_completions): New.
(completer_handle_brkchars_func_for_completer): Handle
location_completer.
(gdb_custom_word_point_brkchars)
(gdb_org_rl_basic_quote_characters): New.
(gdb_completion_word_break_characters_throw)
(completion_find_completion_word): Handle trackers that use a
custom word point.
(completion_tracker::advance_custom_word_point_by): New.
(completion_tracker::build_completion_result): Don't rely on
readline appending the quote char.
(gdb_rl_attempted_completion_function_throw): Handle trackers that
use a custom word point.
(gdb_rl_attempted_completion_function): Restore
rl_basic_quote_characters.
* completer.h (class completion_tracker): Extend intro comment.
(completion_tracker::set_quote_char)
(completion_tracker::quote_char)
(completion_tracker::set_use_custom_word_point)
(completion_tracker::use_custom_word_point)
(completion_tracker::custom_word_point)
(completion_tracker::set_custom_word_point)
(completion_tracker::advance_custom_word_point_by)
(completion_tracker::completes_to_completion_word)
(completion_tracker::discard_completions): New methods.
(completion_tracker::m_quote_char)
(completion_tracker::m_use_custom_word_point)
(completion_tracker::m_custom_word_point): New fields.
(advance_to_expression_complete_word_point): Declare.
* f-lang.c (f_collect_symbol_completion_matches): Add
complete_symbol_mode parameter.
* language.h (struct language_defn)
<la_collect_symbol_completion_matches>: Add complete_symbol_mode
parameter.
* linespec.c (linespec_keywords): Add NULL terminator. Make extern.
(linespec_complete_function): New function.
(linespec_lexer_lex_keyword): Adjust.
* linespec.h (linespec_keywords, linespec_complete_function): New
declarations.
* location.c (find_end_quote): New function.
(explicit_location_lex_one): Add explicit_completion_info
parameter. Save quoting info. Don't throw if being called for
completion. Don't handle Ada operators here.
(is_cp_operator, skip_op_false_positives, first_of)
(explicit_location_lex_one_function): New function.
(string_to_explicit_location): Replace 'dont_throw' parameter with
an explicit_completion_info pointer parameter. Handle it. Don't
use explicit_location_lex_one to lex function names. Use
explicit_location_lex_one_function instead.
* location.h (struct explicit_completion_info): New.
(string_to_explicit_location): Replace 'dont_throw' parameter with
an explicit_completion_info pointer parameter.
* symtab.c (default_collect_symbol_completion_matches_break_on):
Add complete_symbol_mode parameter. Handle LINESPEC mode.
(default_collect_symbol_completion_matches)
(collect_symbol_completion_matches): Add complete_symbol_mode
parameter.
(collect_symbol_completion_matches_type): Pass down
complete_symbol_mode::EXPRESSION.
(collect_file_symbol_completion_matches): Add complete_symbol_mode
parameter. Handle LINESPEC mode.
* symtab.h (complete_symbol_mode): New.
(default_collect_symbol_completion_matches_break_on)
(default_collect_symbol_completion_matches)
(collect_symbol_completion_matches)
(collect_file_symbol_completion_matches): Add complete_symbol_mode
parameter.
gdb/testsuite/ChangeLog:
2017-07-17 Pedro Alves <palves@redhat.com>
* gdb.linespec/ls-errs.exp (do_test): Adjust expected output.
375 lines
11 KiB
C
375 lines
11 KiB
C
/* Fortran language support routines for GDB, the GNU debugger.
|
||
|
||
Copyright (C) 1993-2017 Free Software Foundation, Inc.
|
||
|
||
Contributed by Motorola. Adapted from the C parser by Farooq Butt
|
||
(fmbutt@engage.sps.mot.com).
|
||
|
||
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 "symtab.h"
|
||
#include "gdbtypes.h"
|
||
#include "expression.h"
|
||
#include "parser-defs.h"
|
||
#include "language.h"
|
||
#include "varobj.h"
|
||
#include "f-lang.h"
|
||
#include "valprint.h"
|
||
#include "value.h"
|
||
#include "cp-support.h"
|
||
#include "charset.h"
|
||
#include "c-lang.h"
|
||
|
||
|
||
/* Local functions */
|
||
|
||
extern void _initialize_f_language (void);
|
||
|
||
static void f_printchar (int c, struct type *type, struct ui_file * stream);
|
||
static void f_emit_char (int c, struct type *type,
|
||
struct ui_file * stream, int quoter);
|
||
|
||
/* Return the encoding that should be used for the character type
|
||
TYPE. */
|
||
|
||
static const char *
|
||
f_get_encoding (struct type *type)
|
||
{
|
||
const char *encoding;
|
||
|
||
switch (TYPE_LENGTH (type))
|
||
{
|
||
case 1:
|
||
encoding = target_charset (get_type_arch (type));
|
||
break;
|
||
case 4:
|
||
if (gdbarch_byte_order (get_type_arch (type)) == BFD_ENDIAN_BIG)
|
||
encoding = "UTF-32BE";
|
||
else
|
||
encoding = "UTF-32LE";
|
||
break;
|
||
|
||
default:
|
||
error (_("unrecognized character type"));
|
||
}
|
||
|
||
return encoding;
|
||
}
|
||
|
||
/* Print the character C on STREAM as part of the contents of a literal
|
||
string whose delimiter is QUOTER. Note that that format for printing
|
||
characters and strings is language specific.
|
||
FIXME: This is a copy of the same function from c-exp.y. It should
|
||
be replaced with a true F77 version. */
|
||
|
||
static void
|
||
f_emit_char (int c, struct type *type, struct ui_file *stream, int quoter)
|
||
{
|
||
const char *encoding = f_get_encoding (type);
|
||
|
||
generic_emit_char (c, type, stream, quoter, encoding);
|
||
}
|
||
|
||
/* Implementation of la_printchar. */
|
||
|
||
static void
|
||
f_printchar (int c, struct type *type, struct ui_file *stream)
|
||
{
|
||
fputs_filtered ("'", stream);
|
||
LA_EMIT_CHAR (c, type, stream, '\'');
|
||
fputs_filtered ("'", stream);
|
||
}
|
||
|
||
/* Print the character string STRING, printing at most LENGTH characters.
|
||
Printing stops early if the number hits print_max; repeat counts
|
||
are printed as appropriate. Print ellipses at the end if we
|
||
had to stop before printing LENGTH characters, or if FORCE_ELLIPSES.
|
||
FIXME: This is a copy of the same function from c-exp.y. It should
|
||
be replaced with a true F77 version. */
|
||
|
||
static void
|
||
f_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string,
|
||
unsigned int length, const char *encoding, int force_ellipses,
|
||
const struct value_print_options *options)
|
||
{
|
||
const char *type_encoding = f_get_encoding (type);
|
||
|
||
if (TYPE_LENGTH (type) == 4)
|
||
fputs_filtered ("4_", stream);
|
||
|
||
if (!encoding || !*encoding)
|
||
encoding = type_encoding;
|
||
|
||
generic_printstr (stream, type, string, length, encoding,
|
||
force_ellipses, '\'', 0, options);
|
||
}
|
||
|
||
|
||
/* Table of operators and their precedences for printing expressions. */
|
||
|
||
static const struct op_print f_op_print_tab[] =
|
||
{
|
||
{"+", BINOP_ADD, PREC_ADD, 0},
|
||
{"+", UNOP_PLUS, PREC_PREFIX, 0},
|
||
{"-", BINOP_SUB, PREC_ADD, 0},
|
||
{"-", UNOP_NEG, PREC_PREFIX, 0},
|
||
{"*", BINOP_MUL, PREC_MUL, 0},
|
||
{"/", BINOP_DIV, PREC_MUL, 0},
|
||
{"DIV", BINOP_INTDIV, PREC_MUL, 0},
|
||
{"MOD", BINOP_REM, PREC_MUL, 0},
|
||
{"=", BINOP_ASSIGN, PREC_ASSIGN, 1},
|
||
{".OR.", BINOP_LOGICAL_OR, PREC_LOGICAL_OR, 0},
|
||
{".AND.", BINOP_LOGICAL_AND, PREC_LOGICAL_AND, 0},
|
||
{".NOT.", UNOP_LOGICAL_NOT, PREC_PREFIX, 0},
|
||
{".EQ.", BINOP_EQUAL, PREC_EQUAL, 0},
|
||
{".NE.", BINOP_NOTEQUAL, PREC_EQUAL, 0},
|
||
{".LE.", BINOP_LEQ, PREC_ORDER, 0},
|
||
{".GE.", BINOP_GEQ, PREC_ORDER, 0},
|
||
{".GT.", BINOP_GTR, PREC_ORDER, 0},
|
||
{".LT.", BINOP_LESS, PREC_ORDER, 0},
|
||
{"**", UNOP_IND, PREC_PREFIX, 0},
|
||
{"@", BINOP_REPEAT, PREC_REPEAT, 0},
|
||
{NULL, OP_NULL, PREC_REPEAT, 0}
|
||
};
|
||
|
||
enum f_primitive_types {
|
||
f_primitive_type_character,
|
||
f_primitive_type_logical,
|
||
f_primitive_type_logical_s1,
|
||
f_primitive_type_logical_s2,
|
||
f_primitive_type_logical_s8,
|
||
f_primitive_type_integer,
|
||
f_primitive_type_integer_s2,
|
||
f_primitive_type_real,
|
||
f_primitive_type_real_s8,
|
||
f_primitive_type_real_s16,
|
||
f_primitive_type_complex_s8,
|
||
f_primitive_type_complex_s16,
|
||
f_primitive_type_void,
|
||
nr_f_primitive_types
|
||
};
|
||
|
||
static void
|
||
f_language_arch_info (struct gdbarch *gdbarch,
|
||
struct language_arch_info *lai)
|
||
{
|
||
const struct builtin_f_type *builtin = builtin_f_type (gdbarch);
|
||
|
||
lai->string_char_type = builtin->builtin_character;
|
||
lai->primitive_type_vector
|
||
= GDBARCH_OBSTACK_CALLOC (gdbarch, nr_f_primitive_types + 1,
|
||
struct type *);
|
||
|
||
lai->primitive_type_vector [f_primitive_type_character]
|
||
= builtin->builtin_character;
|
||
lai->primitive_type_vector [f_primitive_type_logical]
|
||
= builtin->builtin_logical;
|
||
lai->primitive_type_vector [f_primitive_type_logical_s1]
|
||
= builtin->builtin_logical_s1;
|
||
lai->primitive_type_vector [f_primitive_type_logical_s2]
|
||
= builtin->builtin_logical_s2;
|
||
lai->primitive_type_vector [f_primitive_type_logical_s8]
|
||
= builtin->builtin_logical_s8;
|
||
lai->primitive_type_vector [f_primitive_type_real]
|
||
= builtin->builtin_real;
|
||
lai->primitive_type_vector [f_primitive_type_real_s8]
|
||
= builtin->builtin_real_s8;
|
||
lai->primitive_type_vector [f_primitive_type_real_s16]
|
||
= builtin->builtin_real_s16;
|
||
lai->primitive_type_vector [f_primitive_type_complex_s8]
|
||
= builtin->builtin_complex_s8;
|
||
lai->primitive_type_vector [f_primitive_type_complex_s16]
|
||
= builtin->builtin_complex_s16;
|
||
lai->primitive_type_vector [f_primitive_type_void]
|
||
= builtin->builtin_void;
|
||
|
||
lai->bool_type_symbol = "logical";
|
||
lai->bool_type_default = builtin->builtin_logical_s2;
|
||
}
|
||
|
||
/* Remove the modules separator :: from the default break list. */
|
||
|
||
static const char *
|
||
f_word_break_characters (void)
|
||
{
|
||
static char *retval;
|
||
|
||
if (!retval)
|
||
{
|
||
char *s;
|
||
|
||
retval = xstrdup (default_word_break_characters ());
|
||
s = strchr (retval, ':');
|
||
if (s)
|
||
{
|
||
char *last_char = &s[strlen (s) - 1];
|
||
|
||
*s = *last_char;
|
||
*last_char = 0;
|
||
}
|
||
}
|
||
return retval;
|
||
}
|
||
|
||
/* Consider the modules separator :: as a valid symbol name character
|
||
class. */
|
||
|
||
static void
|
||
f_collect_symbol_completion_matches (completion_tracker &tracker,
|
||
complete_symbol_mode mode,
|
||
const char *text, const char *word,
|
||
enum type_code code)
|
||
{
|
||
default_collect_symbol_completion_matches_break_on (tracker, mode,
|
||
text, word, ":", code);
|
||
}
|
||
|
||
static const char *f_extensions[] =
|
||
{
|
||
".f", ".F", ".for", ".FOR", ".ftn", ".FTN", ".fpp", ".FPP",
|
||
".f90", ".F90", ".f95", ".F95", ".f03", ".F03", ".f08", ".F08",
|
||
NULL
|
||
};
|
||
|
||
const struct language_defn f_language_defn =
|
||
{
|
||
"fortran",
|
||
"Fortran",
|
||
language_fortran,
|
||
range_check_on,
|
||
case_sensitive_off,
|
||
array_column_major,
|
||
macro_expansion_no,
|
||
f_extensions,
|
||
&exp_descriptor_standard,
|
||
f_parse, /* parser */
|
||
f_yyerror, /* parser error function */
|
||
null_post_parser,
|
||
f_printchar, /* Print character constant */
|
||
f_printstr, /* function to print string constant */
|
||
f_emit_char, /* Function to print a single character */
|
||
f_print_type, /* Print a type using appropriate syntax */
|
||
default_print_typedef, /* Print a typedef using appropriate syntax */
|
||
f_val_print, /* Print a value using appropriate syntax */
|
||
c_value_print, /* FIXME */
|
||
default_read_var_value, /* la_read_var_value */
|
||
NULL, /* Language specific skip_trampoline */
|
||
NULL, /* name_of_this */
|
||
cp_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */
|
||
basic_lookup_transparent_type,/* lookup_transparent_type */
|
||
|
||
/* We could support demangling here to provide module namespaces
|
||
also for inferiors with only minimal symbol table (ELF symbols).
|
||
Just the mangling standard is not standardized across compilers
|
||
and there is no DW_AT_producer available for inferiors with only
|
||
the ELF symbols to check the mangling kind. */
|
||
NULL, /* Language specific symbol demangler */
|
||
NULL,
|
||
NULL, /* Language specific
|
||
class_name_from_physname */
|
||
f_op_print_tab, /* expression operators for printing */
|
||
0, /* arrays are first-class (not c-style) */
|
||
1, /* String lower bound */
|
||
f_word_break_characters,
|
||
f_collect_symbol_completion_matches,
|
||
f_language_arch_info,
|
||
default_print_array_index,
|
||
default_pass_by_reference,
|
||
default_get_string,
|
||
c_watch_location_expression,
|
||
NULL, /* la_get_symbol_name_cmp */
|
||
iterate_over_symbols,
|
||
&default_varobj_ops,
|
||
NULL,
|
||
NULL,
|
||
LANG_MAGIC
|
||
};
|
||
|
||
static void *
|
||
build_fortran_types (struct gdbarch *gdbarch)
|
||
{
|
||
struct builtin_f_type *builtin_f_type
|
||
= GDBARCH_OBSTACK_ZALLOC (gdbarch, struct builtin_f_type);
|
||
|
||
builtin_f_type->builtin_void
|
||
= arch_type (gdbarch, TYPE_CODE_VOID, 1, "VOID");
|
||
|
||
builtin_f_type->builtin_character
|
||
= arch_integer_type (gdbarch, TARGET_CHAR_BIT, 0, "character");
|
||
|
||
builtin_f_type->builtin_logical_s1
|
||
= arch_boolean_type (gdbarch, TARGET_CHAR_BIT, 1, "logical*1");
|
||
|
||
builtin_f_type->builtin_integer_s2
|
||
= arch_integer_type (gdbarch, gdbarch_short_bit (gdbarch), 0,
|
||
"integer*2");
|
||
|
||
builtin_f_type->builtin_logical_s2
|
||
= arch_boolean_type (gdbarch, gdbarch_short_bit (gdbarch), 1,
|
||
"logical*2");
|
||
|
||
builtin_f_type->builtin_logical_s8
|
||
= arch_boolean_type (gdbarch, gdbarch_long_long_bit (gdbarch), 1,
|
||
"logical*8");
|
||
|
||
builtin_f_type->builtin_integer
|
||
= arch_integer_type (gdbarch, gdbarch_int_bit (gdbarch), 0,
|
||
"integer");
|
||
|
||
builtin_f_type->builtin_logical
|
||
= arch_boolean_type (gdbarch, gdbarch_int_bit (gdbarch), 1,
|
||
"logical*4");
|
||
|
||
builtin_f_type->builtin_real
|
||
= arch_float_type (gdbarch, gdbarch_float_bit (gdbarch),
|
||
"real", gdbarch_float_format (gdbarch));
|
||
builtin_f_type->builtin_real_s8
|
||
= arch_float_type (gdbarch, gdbarch_double_bit (gdbarch),
|
||
"real*8", gdbarch_double_format (gdbarch));
|
||
builtin_f_type->builtin_real_s16
|
||
= arch_float_type (gdbarch, gdbarch_long_double_bit (gdbarch),
|
||
"real*16", gdbarch_long_double_format (gdbarch));
|
||
|
||
builtin_f_type->builtin_complex_s8
|
||
= arch_complex_type (gdbarch, "complex*8",
|
||
builtin_f_type->builtin_real);
|
||
builtin_f_type->builtin_complex_s16
|
||
= arch_complex_type (gdbarch, "complex*16",
|
||
builtin_f_type->builtin_real_s8);
|
||
builtin_f_type->builtin_complex_s32
|
||
= arch_complex_type (gdbarch, "complex*32",
|
||
builtin_f_type->builtin_real_s16);
|
||
|
||
return builtin_f_type;
|
||
}
|
||
|
||
static struct gdbarch_data *f_type_data;
|
||
|
||
const struct builtin_f_type *
|
||
builtin_f_type (struct gdbarch *gdbarch)
|
||
{
|
||
return (const struct builtin_f_type *) gdbarch_data (gdbarch, f_type_data);
|
||
}
|
||
|
||
void
|
||
_initialize_f_language (void)
|
||
{
|
||
f_type_data = gdbarch_data_register_post_init (build_fortran_types);
|
||
|
||
add_language (&f_language_defn);
|
||
}
|