From ddae946278bf4269370f7d945732485ad13469fa Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 13 Sep 2014 22:24:50 -0600 Subject: Fix PR python/17386 - add __index__ method to gdb.Value This patch fixes PR python/17386. The bug is that gdb.Value does not implement the Python __index__ method. This method is needed to convert a Python object to an index and is used by various operations in Python, such as indexing an array. The fix is to implement the nb_index method for gdb.Value. nb_index was added in Python 2.5. I don't have a good way to test Python 2.4, but I made an attempt to accomodate it. I chose to use valpy_long in all cases because this simplifies porting to Python 3, and because there didn't seem to be any harm. Built and regtested on x86-64 Fedora 23. 2016-05-24 Tom Tromey PR python/17386: * python/py-value.c (value_object_as_number): Add nb_inplace_floor_divide, nb_inplace_true_divide, nb_index. 2016-05-24 Tom Tromey PR python/17386: * gdb.python/py-value.exp (test_value_numeric_ops): Add tests that use value as an index. --- gdb/python/py-value.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gdb/python/py-value.c') diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index 268f6c8ad6b..7a2a235d7e7 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -1838,7 +1838,13 @@ static PyNumberMethods value_object_as_number = { NULL, /* nb_inplace_xor */ NULL, /* nb_inplace_or */ NULL, /* nb_floor_divide */ - valpy_divide /* nb_true_divide */ + valpy_divide, /* nb_true_divide */ + NULL, /* nb_inplace_floor_divide */ + NULL, /* nb_inplace_true_divide */ +#ifndef HAVE_LIBPYTHON_2_4 + /* This was added in Python 2.5. */ + valpy_long, /* nb_index */ +#endif /* HAVE_LIBPYTHON_2_4 */ }; static PyMappingMethods value_object_as_mapping = { -- cgit v1.2.1