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

Remove varobj_language_string, languages and varobj_languages 

This patch does some cleanups, removing some language-related stuff.
Note that mi_cmd_var_info_expression uses varobj_language_string,
which is redundant, because we can get language name from
lang->la_natural_name.

varobj_language_string doesn't have "Ada", which looks like a bug to
me.  With this patch applied, this problem doesn't exist, because the
language name is got from the same place (field la_natural_name).

gdb:

2013-11-07  Yao Qi  <yao@codesourcery.com>

	* mi/mi-cmd-var.c: Include "language.h".
	(mi_cmd_var_info_expression): Get language name from
	language_defn.
	* varobj.c (varobj_language_string): Remove.
	(variable_language): Remove declaration.
	(languages): Remove.
	(varobj_get_language): Change the type of return value.
	(variable_language): Remove.
	* varobj.h (enum varobj_languages): Remove.
	(varobj_language_string): Remove declaration.
	(varobj_get_language): Update declaration.

gdb/doc:

2013-11-07  Yao Qi  <yao@codesourcery.com>

	* gdb.texinfo (GDB/MI Variable Objects): Update doc about the
	output of "-var-info-expression".
This commit is contained in:
Yao Qi 2013-10-09 22:10:14 +08:00
parent 6abde28fa9
commit fa4d0c4081
6 changed files with 27 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gdb/ChangeLog
View File

@ -1,3 +1,17 @@
2013-11-07 Yao Qi <yao@codesourcery.com>
* mi/mi-cmd-var.c: Include "language.h".
(mi_cmd_var_info_expression): Get language name from
language_defn.
* varobj.c (varobj_language_string): Remove.
(variable_language): Remove declaration.
(languages): Remove.
(varobj_get_language): Change the type of return value.
(variable_language): Remove.
* varobj.h (enum varobj_languages): Remove.
(varobj_language_string): Remove declaration.
(varobj_get_language): Update declaration.
2013-11-07 Yao Qi <yao@codesourcery.com>
* language.h (struct language_defn) <la_natural_name>: New

5
gdb/doc/ChangeLog
View File

@ -1,3 +1,8 @@
2013-11-07 Yao Qi <yao@codesourcery.com>
* gdb.texinfo (GDB/MI Variable Objects): Update doc about the
output of "-var-info-expression".
2013-11-06 Pedro Alves <palves@redhat.com>
* gdb.texinfo (Starting) <set/show startup-with-shell>: Mention

3
gdb/doc/gdb.texinfo
View File

@ -32402,7 +32402,8 @@ For example, if @code{a} is an array, and variable object
@end smallexample
@noindent
Here, the values of @code{lang} can be @code{@{"C" | "C++" | "Java"@}}.
Here, the value of @code{lang} is the language name, which can be
found in @ref{Supported Languages}.
Note that the output of the @code{-var-list-children} command also
includes those expressions, so the @code{-var-info-expression} command

5
gdb/mi/mi-cmd-var.c
View File

@ -24,6 +24,7 @@
#include "ui-out.h"
#include "mi-out.h"
#include "varobj.h"
#include "language.h"
#include "value.h"
#include <ctype.h>
#include "gdb_string.h"
@ -479,7 +480,7 @@ void
mi_cmd_var_info_expression (char *command, char **argv, int argc)
{
struct ui_out *uiout = current_uiout;
enum varobj_languages lang;
const struct language_defn *lang;
struct varobj *var;
if (argc != 1)
@ -490,7 +491,7 @@ mi_cmd_var_info_expression (char *command, char **argv, int argc)
lang = varobj_get_language (var);
ui_out_field_string (uiout, "lang", varobj_language_string[(int) lang]);
ui_out_field_string (uiout, "lang", lang->la_natural_name);
ui_out_field_string (uiout, "exp", varobj_get_expression (var));
}

43
gdb/varobj.c
View File

@ -55,9 +55,6 @@ show_varobjdebug (struct ui_file *file, int from_tty,
char *varobj_format_string[] =
{ "natural", "binary", "decimal", "hexadecimal", "octal" };
/* String representations of gdb's known languages. */
char *varobj_language_string[] = { "C", "C++", "Java" };
/* True if we want to allow Python-based pretty-printing. */
static int pretty_printing = 0;
@ -199,8 +196,6 @@ static int install_new_value (struct varobj *var, struct value *value,
/* Language-specific routines. */
static enum varobj_languages variable_language (struct varobj *var);
static int number_of_children (struct varobj *);
static char *name_of_variable (struct varobj *);
@ -224,14 +219,6 @@ static struct varobj *varobj_add_child (struct varobj *var,
#endif /* HAVE_PYTHON */
/* Array of known source language routines. */
static const struct lang_varobj_ops *languages[vlang_end] = {
&c_varobj_ops,
&cplus_varobj_ops,
&java_varobj_ops,
&ada_varobj_ops,
};
/* Private data */
/* Mappings of varobj_display_formats enums to gdb's format codes. */
@ -1126,10 +1113,10 @@ varobj_get_path_expr (struct varobj *var)
}
}
enum varobj_languages
const struct language_defn *
varobj_get_language (struct varobj *var)
{
return variable_language (var);
return var->root->exp->language_defn;
}
int
@ -2332,32 +2319,6 @@ cppop (struct cpstack **pstack)
/* Common entry points */
/* Get the language of variable VAR. */
static enum varobj_languages
variable_language (struct varobj *var)
{
enum varobj_languages lang;
switch (var->root->exp->language_defn->la_language)
{
default:
case language_c:
lang = vlang_c;
break;
case language_cplus:
lang = vlang_cplus;
break;
case language_java:
lang = vlang_java;
break;
case language_ada:
lang = vlang_ada;
break;
}
return lang;
}
/* Return the number of children for a given variable.
The result of this function is defined by the language
implementation. The number of children returned by this function

12
gdb/varobj.h
View File

@ -52,16 +52,6 @@ enum varobj_scope_status
/* String representations of gdb's format codes (defined in varobj.c). */
extern char *varobj_format_string[];
/* Languages supported by this variable objects system. This enum is used
to index arrays so we make its first enum explicitly zero. */
enum varobj_languages
{
vlang_c = 0, vlang_cplus, vlang_java, vlang_ada, vlang_end
};
/* String representations of gdb's known languages (defined in varobj.c). */
extern char *varobj_language_string[];
/* Struct thar describes a variable object instance. */
struct varobj;
@ -286,7 +276,7 @@ extern struct type *varobj_get_gdb_type (struct varobj *var);
extern char *varobj_get_path_expr (struct varobj *var);
extern enum varobj_languages varobj_get_language (struct varobj *var);
extern const struct language_defn *varobj_get_language (struct varobj *var);
extern int varobj_get_attributes (struct varobj *var);