diff options
| author | Tom Tromey <tom@tromey.com> | 2020-12-11 09:33:36 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2020-12-11 09:33:38 -0700 |
| commit | 54746ce37a483e235ac128b6f545be9888bf3521 (patch) | |
| tree | 00098f97c2514f9895f1e7bab52678ed4dba9dee /gdb/varobj.c | |
| parent | d8f168ddd08f1d5fde1a193724cdc40d524039a7 (diff) | |
| download | binutils-gdb-54746ce37a483e235ac128b6f545be9888bf3521.tar.gz | |
C++-ify varobj iteration
This changes the varobj iteration code to use a C++ class rather than
a C struct with a separate "ops" structure. The only implementation
is updated to use inheritance. This simplifies the code quite nicely.
gdb/ChangeLog
2020-12-11 Tom Tromey <tom@tromey.com>
* varobj.c (update_dynamic_varobj_children, install_visualizer)
(varobj::~varobj): Update.
* varobj-iter.h (struct varobj_iter): Change to interface class.
(struct varobj_iter_ops): Remove.
(varobj_iter_next, varobj_iter_delete): Remove.
* python/py-varobj.c (struct py_varobj_iter): Derive from
varobj_iter. Add constructor, destructor. Rename members.
(py_varobj_iter::~py_varobj_iter): Rename from
py_varobj_iter_dtor.
(py_varobj_iter::next): Rename from py_varobj_iter_next.
(py_varobj_iter_ops): Remove.
(py_varobj_iter): Rename from py_varobj_iter_ctor.
(py_varobj_iter_new): Remove.
(py_varobj_get_iterator): Update.
Diffstat (limited to 'gdb/varobj.c')
| -rw-r--r-- | gdb/varobj.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdb/varobj.c b/gdb/varobj.c index e4d640f9d61..80de679a607 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -702,7 +702,7 @@ update_dynamic_varobj_children (struct varobj *var, if (update_children || var->dynamic->child_iter == NULL) { - varobj_iter_delete (var->dynamic->child_iter); + delete var->dynamic->child_iter; var->dynamic->child_iter = varobj_get_iterator (var); varobj_clear_saved_item (var->dynamic); @@ -729,7 +729,7 @@ update_dynamic_varobj_children (struct varobj *var, } else { - item = varobj_iter_next (var->dynamic->child_iter); + item = var->dynamic->child_iter->next (); /* Release vitem->value so its lifetime is not bound to the execution of a command. */ if (item != NULL && item->value != NULL) @@ -739,7 +739,7 @@ update_dynamic_varobj_children (struct varobj *var, if (item == NULL) { /* Iteration is done. Remove iterator from VAR. */ - varobj_iter_delete (var->dynamic->child_iter); + delete var->dynamic->child_iter; var->dynamic->child_iter = NULL; break; } @@ -1070,7 +1070,7 @@ install_visualizer (struct varobj_dynamic *var, PyObject *constructor, Py_XDECREF (var->pretty_printer); var->pretty_printer = visualizer; - varobj_iter_delete (var->child_iter); + delete var->child_iter; var->child_iter = NULL; } @@ -1881,7 +1881,7 @@ varobj::~varobj () } #endif - varobj_iter_delete (var->dynamic->child_iter); + delete var->dynamic->child_iter; varobj_clear_saved_item (var->dynamic); if (is_root_p (var)) |