Rename field 'lang' to 'lang_ops'.
On 10/25/2013 11:34 AM, Joel Brobecker wrote: > Also, as a followup, I think it would be beneficial if we renamed > field "lang" in the varobj_root into "lang_ops". I think it's more > descriptive, especially since "lang" is used elsewhere with different > meanings (and types). Here is the patch to rename 'lang' to 'lang_ops'. Committed as obvious. gdb: 2013-10-27 Yao Qi <yao@codesourcery.com> * varobj.c (struct varobj_root) <lang>: Rename to 'lang_ops'. (varobj_create, varobj_get_path_expr): Update. (varobj_value_has_mutated, varobj_update): Likewise. (create_child_with_value, new_root_variable): Likewise. (number_of_children, name_of_variable): Likewise. (value_of_child, my_value_of_variable): Likewise. (varobj_value_is_changeable_p): Likewise.
This commit is contained in:
parent
a53b64eaa0
commit
ca20d46296
|
@ -1,3 +1,13 @@
|
||||||
|
2013-10-27 Yao Qi <yao@codesourcery.com>
|
||||||
|
|
||||||
|
* varobj.c (struct varobj_root) <lang>: Rename to 'lang_ops'.
|
||||||
|
(varobj_create, varobj_get_path_expr): Update.
|
||||||
|
(varobj_value_has_mutated, varobj_update): Likewise.
|
||||||
|
(create_child_with_value, new_root_variable): Likewise.
|
||||||
|
(number_of_children, name_of_variable): Likewise.
|
||||||
|
(value_of_child, my_value_of_variable): Likewise.
|
||||||
|
(varobj_value_is_changeable_p): Likewise.
|
||||||
|
|
||||||
2013-10-25 Yao Qi <yao@codesourcery.com>
|
2013-10-25 Yao Qi <yao@codesourcery.com>
|
||||||
|
|
||||||
* language.h (struct lang_varobj_ops): Declare.
|
* language.h (struct lang_varobj_ops): Declare.
|
||||||
|
|
30
gdb/varobj.c
30
gdb/varobj.c
|
@ -102,7 +102,7 @@ struct varobj_root
|
||||||
|
|
||||||
/* Language-related operations for this variable and its
|
/* Language-related operations for this variable and its
|
||||||
children. */
|
children. */
|
||||||
const struct lang_varobj_ops *lang;
|
const struct lang_varobj_ops *lang_ops;
|
||||||
|
|
||||||
/* The varobj for this root node. */
|
/* The varobj for this root node. */
|
||||||
struct varobj *rootvar;
|
struct varobj *rootvar;
|
||||||
|
@ -432,7 +432,7 @@ varobj_create (char *objname,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Set language info */
|
/* Set language info */
|
||||||
var->root->lang = var->root->exp->language_defn->la_varobj_ops;
|
var->root->lang_ops = var->root->exp->language_defn->la_varobj_ops;
|
||||||
|
|
||||||
install_new_value (var, value, 1 /* Initial assignment */);
|
install_new_value (var, value, 1 /* Initial assignment */);
|
||||||
|
|
||||||
|
@ -1122,7 +1122,7 @@ varobj_get_path_expr (struct varobj *var)
|
||||||
when creating varobj, so here it should be
|
when creating varobj, so here it should be
|
||||||
child varobj. */
|
child varobj. */
|
||||||
gdb_assert (!is_root_p (var));
|
gdb_assert (!is_root_p (var));
|
||||||
return (*var->root->lang->path_expr_of_child) (var);
|
return (*var->root->lang_ops->path_expr_of_child) (var);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1661,8 +1661,8 @@ varobj_value_has_mutated (struct varobj *var, struct value *new_value,
|
||||||
if (var->num_children < 0)
|
if (var->num_children < 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (var->root->lang->value_has_mutated)
|
if (var->root->lang_ops->value_has_mutated)
|
||||||
return var->root->lang->value_has_mutated (var, new_value, new_type);
|
return var->root->lang_ops->value_has_mutated (var, new_value, new_type);
|
||||||
else
|
else
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1770,7 +1770,7 @@ varobj_update (struct varobj **varp, int explicit)
|
||||||
if (new)
|
if (new)
|
||||||
new_type = value_type (new);
|
new_type = value_type (new);
|
||||||
else
|
else
|
||||||
new_type = v->root->lang->type_of_child (v->parent, v->index);
|
new_type = v->root->lang_ops->type_of_child (v->parent, v->index);
|
||||||
|
|
||||||
if (varobj_value_has_mutated (v, new, new_type))
|
if (varobj_value_has_mutated (v, new, new_type))
|
||||||
{
|
{
|
||||||
|
@ -2146,8 +2146,8 @@ create_child_with_value (struct varobj *parent, int index, char *name,
|
||||||
child->type = value_actual_type (value, 0, NULL);
|
child->type = value_actual_type (value, 0, NULL);
|
||||||
else
|
else
|
||||||
/* Otherwise, we must compute the type. */
|
/* Otherwise, we must compute the type. */
|
||||||
child->type = (*child->root->lang->type_of_child) (child->parent,
|
child->type = (*child->root->lang_ops->type_of_child) (child->parent,
|
||||||
child->index);
|
child->index);
|
||||||
install_new_value (child, value, 1);
|
install_new_value (child, value, 1);
|
||||||
|
|
||||||
return child;
|
return child;
|
||||||
|
@ -2200,7 +2200,7 @@ new_root_variable (void)
|
||||||
struct varobj *var = new_variable ();
|
struct varobj *var = new_variable ();
|
||||||
|
|
||||||
var->root = (struct varobj_root *) xmalloc (sizeof (struct varobj_root));
|
var->root = (struct varobj_root *) xmalloc (sizeof (struct varobj_root));
|
||||||
var->root->lang = NULL;
|
var->root->lang_ops = NULL;
|
||||||
var->root->exp = NULL;
|
var->root->exp = NULL;
|
||||||
var->root->valid_block = NULL;
|
var->root->valid_block = NULL;
|
||||||
var->root->frame = null_frame_id;
|
var->root->frame = null_frame_id;
|
||||||
|
@ -2366,7 +2366,7 @@ variable_language (struct varobj *var)
|
||||||
static int
|
static int
|
||||||
number_of_children (struct varobj *var)
|
number_of_children (struct varobj *var)
|
||||||
{
|
{
|
||||||
return (*var->root->lang->number_of_children) (var);
|
return (*var->root->lang_ops->number_of_children) (var);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* What is the expression for the root varobj VAR? Returns a malloc'd
|
/* What is the expression for the root varobj VAR? Returns a malloc'd
|
||||||
|
@ -2374,7 +2374,7 @@ number_of_children (struct varobj *var)
|
||||||
static char *
|
static char *
|
||||||
name_of_variable (struct varobj *var)
|
name_of_variable (struct varobj *var)
|
||||||
{
|
{
|
||||||
return (*var->root->lang->name_of_variable) (var);
|
return (*var->root->lang_ops->name_of_variable) (var);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* What is the name of the INDEX'th child of VAR? Returns a malloc'd
|
/* What is the name of the INDEX'th child of VAR? Returns a malloc'd
|
||||||
|
@ -2382,7 +2382,7 @@ name_of_variable (struct varobj *var)
|
||||||
static char *
|
static char *
|
||||||
name_of_child (struct varobj *var, int index)
|
name_of_child (struct varobj *var, int index)
|
||||||
{
|
{
|
||||||
return (*var->root->lang->name_of_child) (var, index);
|
return (*var->root->lang_ops->name_of_child) (var, index);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If frame associated with VAR can be found, switch
|
/* If frame associated with VAR can be found, switch
|
||||||
|
@ -2569,7 +2569,7 @@ value_of_child (struct varobj *parent, int index)
|
||||||
{
|
{
|
||||||
struct value *value;
|
struct value *value;
|
||||||
|
|
||||||
value = (*parent->root->lang->value_of_child) (parent, index);
|
value = (*parent->root->lang_ops->value_of_child) (parent, index);
|
||||||
|
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
@ -2582,7 +2582,7 @@ my_value_of_variable (struct varobj *var, enum varobj_display_formats format)
|
||||||
{
|
{
|
||||||
if (var->dynamic->pretty_printer != NULL)
|
if (var->dynamic->pretty_printer != NULL)
|
||||||
return varobj_value_get_print_value (var->value, var->format, var);
|
return varobj_value_get_print_value (var->value, var->format, var);
|
||||||
return (*var->root->lang->value_of_variable) (var, format);
|
return (*var->root->lang_ops->value_of_variable) (var, format);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -2761,7 +2761,7 @@ varobj_editable_p (struct varobj *var)
|
||||||
int
|
int
|
||||||
varobj_value_is_changeable_p (struct varobj *var)
|
varobj_value_is_changeable_p (struct varobj *var)
|
||||||
{
|
{
|
||||||
return var->root->lang->value_is_changeable_p (var);
|
return var->root->lang_ops->value_is_changeable_p (var);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return 1 if that varobj is floating, that is is always evaluated in the
|
/* Return 1 if that varobj is floating, that is is always evaluated in the
|
||||||
|
|
Loading…
Reference in New Issue