Add gdbpy_call_method overloads for gdbpy_ref<>

This adds an overload of gdbpy_call_method that accepts a gdbpy_ref<>.
This is just a small convenience.

Reviewed-By: Tom de Vries <tdevries@suse.de>
This commit is contained in:
Tom Tromey
2024-06-11 14:12:09 -06:00
parent 7c03e522d4
commit c2d091ff5c
2 changed files with 14 additions and 5 deletions

View File

@@ -164,7 +164,7 @@ tui_py_window::~tui_py_window ()
if (m_window != nullptr
&& PyObject_HasAttrString (m_window.get (), "close"))
{
gdbpy_ref<> result = gdbpy_call_method (m_window.get (), "close");
gdbpy_ref<> result = gdbpy_call_method (m_window, "close");
if (result == nullptr)
gdbpy_print_stack ();
}
@@ -197,7 +197,7 @@ tui_py_window::rerender ()
if (PyObject_HasAttrString (m_window.get (), "render"))
{
gdbpy_ref<> result = gdbpy_call_method (m_window.get (), "render");
gdbpy_ref<> result = gdbpy_call_method (m_window, "render");
if (result == nullptr)
gdbpy_print_stack ();
}
@@ -210,7 +210,7 @@ tui_py_window::do_scroll_horizontal (int num_to_scroll)
if (PyObject_HasAttrString (m_window.get (), "hscroll"))
{
gdbpy_ref<> result = gdbpy_call_method (m_window.get(), "hscroll",
gdbpy_ref<> result = gdbpy_call_method (m_window, "hscroll",
num_to_scroll);
if (result == nullptr)
gdbpy_print_stack ();
@@ -224,7 +224,7 @@ tui_py_window::do_scroll_vertical (int num_to_scroll)
if (PyObject_HasAttrString (m_window.get (), "vscroll"))
{
gdbpy_ref<> result = gdbpy_call_method (m_window.get (), "vscroll",
gdbpy_ref<> result = gdbpy_call_method (m_window, "vscroll",
num_to_scroll);
if (result == nullptr)
gdbpy_print_stack ();
@@ -246,7 +246,7 @@ tui_py_window::click (int mouse_x, int mouse_y, int mouse_button)
if (PyObject_HasAttrString (m_window.get (), "click"))
{
gdbpy_ref<> result = gdbpy_call_method (m_window.get (), "click",
gdbpy_ref<> result = gdbpy_call_method (m_window, "click",
mouse_x, mouse_y, mouse_button);
if (result == nullptr)
gdbpy_print_stack ();

View File

@@ -207,6 +207,15 @@ gdbpy_call_method (PyObject *o, const char *method,
arg, args...));
}
/* An overload that takes a gdbpy_ref<> rather than a raw 'PyObject *'. */
template<typename... Args>
static inline gdbpy_ref<>
gdbpy_call_method (const gdbpy_ref<> &o, const char *method, Args... args)
{
return gdbpy_call_method (o.get (), method, args...);
}
/* Poison PyObject_CallMethod. The typesafe wrapper gdbpy_call_method should be
used instead. */
#undef PyObject_CallMethod