summaryrefslogtreecommitdiff
path: root/gdb/varobj.h
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@polymtl.ca>2017-11-22 15:08:05 -0500
committerSimon Marchi <simon.marchi@ericsson.com>2017-11-22 15:08:05 -0500
commit9e5b9d2b295d1771647a9e4bc942e398142ccf9b (patch)
treece91e5898a34b8b236602baf53b8c41c8b894d1f /gdb/varobj.h
parent2469b3c58447e98e073ffe7ab6c9627dbbd1aa81 (diff)
downloadbinutils-gdb-9e5b9d2b295d1771647a9e4bc942e398142ccf9b.tar.gz
Basic c++ification of varobj
This patch does a basic c++ification or the varobj data structure. - varobj: add constructor and destructor, initialize fields - varobj_root: initialize fields - varobj_dynamic: initialize fields This allows getting rid of new_variable, new_root_variable. free_variable essentially becomes varobj's destructor. This also allows getting rid of a cleanup, make_cleanup_free_variable, which was only used in varobj_create in case the varobj creation fails. It is replaced with a unique_ptr. gdb/ChangeLog: * varobj.h (struct varobj): Add constructor and destructor, initialize fields. * varobj.c (struct varobj_root): Initialize fields. (struct varobj_dynamic): Initialize fields. (varobj_create): Use unique_ptr instead of cleanup. Create varobj with new instead of new_root_variable. (delete_variable_1): Free variable with delete instead of free_variable. (create_child_with_value): Create variable with new instead of new_variable. (varobj::varobj): New. (varobj::~varobj): New (body mostly coming from free_variable). (new_variable): Remove. (free_variable): Remove. (do_free_variable_cleanup): Remove. (make_cleanup_free_variable): Remove.
Diffstat (limited to 'gdb/varobj.h')
-rw-r--r--gdb/varobj.h27
1 files changed, 15 insertions, 12 deletions
diff --git a/gdb/varobj.h b/gdb/varobj.h
index 0d4a537d7ed..bdf748f5a02 100644
--- a/gdb/varobj.h
+++ b/gdb/varobj.h
@@ -89,6 +89,9 @@ struct varobj_dynamic;
a particular object variable. */
struct varobj
{
+ explicit varobj (varobj_root *root_);
+ ~varobj ();
+
/* Name of the variable for this object. If this variable is a
child, then this name will be the child's source name.
(bar, not foo.bar). */
@@ -104,37 +107,37 @@ struct varobj
std::string obj_name;
/* Index of this variable in its parent or -1. */
- int index;
+ int index = -1;
/* The type of this variable. This can be NULL
for artificial variable objects -- currently, the "accessibility"
variable objects in C++. */
- struct type *type;
+ struct type *type = NULL;
/* The value of this expression or subexpression. A NULL value
indicates there was an error getting this value.
Invariant: if varobj_value_is_changeable_p (this) is non-zero,
the value is either NULL, or not lazy. */
- struct value *value;
+ struct value *value = NULL;
/* The number of (immediate) children this variable has. */
- int num_children;
+ int num_children = -1;
/* If this object is a child, this points to its immediate parent. */
- const struct varobj *parent;
+ const struct varobj *parent = NULL;
/* Children of this object. */
- VEC (varobj_p) *children;
+ VEC (varobj_p) *children = NULL;
/* Description of the root variable. Points to root variable for
children. */
struct varobj_root *root;
/* The format of the output for this object. */
- enum varobj_display_formats format;
+ enum varobj_display_formats format = FORMAT_NATURAL;
/* Was this variable updated via a varobj_set_value operation. */
- int updated;
+ int updated = 0;
/* Last print value. */
std::string print_value;
@@ -142,18 +145,18 @@ struct varobj
/* Is this variable frozen. Frozen variables are never implicitly
updated by -var-update *
or -var-update <direct-or-indirect-parent>. */
- int frozen;
+ int frozen = 0;
/* Is the value of this variable intentionally not fetched? It is
not fetched if either the variable is frozen, or any parents is
frozen. */
- int not_fetched;
+ int not_fetched = 0;
/* Sub-range of children which the MI consumer has requested. If
FROM < 0 or TO < 0, means that all children have been
requested. */
- int from;
- int to;
+ int from = -1;
+ int to = -1;
/* Dynamic part of varobj. */
struct varobj_dynamic *dynamic;