OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ada-lang.c: Introduce type_as_string and use it 

A couple wrong things here

  - We should not use target_terminal_ours when all we want is output.
    We should use target_terminal_ours_for_output instead, which
    preserves raw/cooked terminal modes, and SIGINT forwarding.

  - Most importantly, relying on stderr output immediately preceding
    the error/exception print isn't correct.  The exception could be
    caught and handled, for example; MI frontends won't display the
    stderr part in an error dialog box.  Etc.

This commit introduces a type_as_string helper that allows building a
full error string including type info.

gdb/ChangeLog:
2016-04-12  Pedro Alves  <palves@redhat.com>

	* ada-lang.c (type_as_string, type_as_string_and_cleanup): New
	functions.
	(ada_lookup_struct_elt_type): Use type_as_string_and_cleanup.
This commit is contained in:
Pedro Alves 2016-04-12 16:49:31 +01:00
parent 75ee59252d
commit 99bbb428d4
2 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2016-04-12 Pedro Alves <palves@redhat.com>
* ada-lang.c (type_as_string, type_as_string_and_cleanup): New
functions.
(ada_lookup_struct_elt_type): Use type_as_string_and_cleanup.
2016-04-12 Pedro Alves <palves@redhat.com>
* ser-base.c (fd_event): Retry read_prim on EINTR.

74
gdb/ada-lang.c
View File

@ -7576,6 +7576,39 @@ ada_value_struct_elt (struct value *arg, char *name, int no_err)
"a value that is not a record."));
}
/* Return a string representation of type TYPE. Caller must free
result. */
static char *
type_as_string (struct type *type)
{
struct ui_file *tmp_stream = mem_fileopen ();
struct cleanup *old_chain;
char *str;
tmp_stream = mem_fileopen ();
old_chain = make_cleanup_ui_file_delete (tmp_stream);
type_print (type, "", tmp_stream, -1);
str = ui_file_xstrdup (tmp_stream, NULL);
do_cleanups (old_chain);
return str;
}
/* Return a string representation of type TYPE, and install a cleanup
that releases it. */
static char *
type_as_string_and_cleanup (struct type *type)
{
char *str;
str = type_as_string (type);
make_cleanup (xfree, str);
return str;
}
/* Given a type TYPE, look up the type of the component of type named NAME.
If DISPP is non-null, add its byte displacement from the beginning of a
structure (pointed to by a value) of type TYPE to *DISPP (does not
@ -7616,22 +7649,15 @@ ada_lookup_struct_elt_type (struct type *type, char *name, int refok,
|| (TYPE_CODE (type) != TYPE_CODE_STRUCT
&& TYPE_CODE (type) != TYPE_CODE_UNION))
{
char *type_str;
if (noerr)
return NULL;
else
{
target_terminal_ours ();
gdb_flush (gdb_stdout);
if (type == NULL)
error (_("Type (null) is not a structure or union type"));
else
{
/* XXX: type_sprint */
fprintf_unfiltered (gdb_stderr, _("Type "));
type_print (type, "", gdb_stderr, -1);
error (_(" is not a structure or union type"));
}
}
type_str = (type != NULL
? type_as_string_and_cleanup (type)
: _("(null)"));
error (_("Type %s is not a structure or union type"), type_str);
}
type = to_static_fixed_type (type);
@ -7701,22 +7727,10 @@ ada_lookup_struct_elt_type (struct type *type, char *name, int refok,
BadName:
if (!noerr)
{
target_terminal_ours ();
gdb_flush (gdb_stdout);
if (name == NULL)
{
/* XXX: type_sprint */
fprintf_unfiltered (gdb_stderr, _("Type "));
type_print (type, "", gdb_stderr, -1);
error (_(" has no component named <null>"));
}
else
{
/* XXX: type_sprint */
fprintf_unfiltered (gdb_stderr, _("Type "));
type_print (type, "", gdb_stderr, -1);
error (_(" has no component named %s"), name);
}
char *name_str = name != NULL ? name : _("<null>");
error (_("Type %s has no component named %s"),
type_as_string_and_cleanup (type), name_str);
}
return NULL;