aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2009-04-13 20:54:59 +0000
committerTom Tromey <tromey@redhat.com>2009-04-13 20:54:59 +0000
commit18e8c3bc8aea1c1eefa888ab34832abce1898a9d (patch)
tree65a07764603c1a1d54f1a5ac9852dca21932204d
parent168a2f7744f9a9cdcb53b1861a941cc40291102f (diff)
downloadgdb-18e8c3bc8aea1c1eefa888ab34832abce1898a9d.zip
gdb-18e8c3bc8aea1c1eefa888ab34832abce1898a9d.tar.gz
gdb-18e8c3bc8aea1c1eefa888ab34832abce1898a9d.tar.bz2
gdb
* python/python-frame.c (frapy_richcompare): Return Py_NotImplemented, not an error. Handle Py_NE as well. gdb/testsuite * gdb.python/python-frame.exp (gdb_py_test_silent_cmd): Test != operator on Frame.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/python/python-frame.c20
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.python/python-frame.exp2
4 files changed, 23 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a300c7e..ef82018 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-13 Tom Tromey <tromey@redhat.com>
+
+ * python/python-frame.c (frapy_richcompare): Return
+ Py_NotImplemented, not an error. Handle Py_NE as well.
+
2009-04-13 Eli Zaretskii <eliz@gnu.org>
* charset.c (EILSEQ): Define if not defined by system headers.
diff --git a/gdb/python/python-frame.c b/gdb/python/python-frame.c
index 8d6127e..a97009f 100644
--- a/gdb/python/python-frame.c
+++ b/gdb/python/python-frame.c
@@ -415,21 +415,23 @@ gdbpy_frame_stop_reason_string (PyObject *self, PyObject *args)
static PyObject *
frapy_richcompare (PyObject *self, PyObject *other, int op)
{
- if (!PyObject_TypeCheck (other, &frame_object_type))
- {
- PyErr_SetString (PyExc_TypeError, "Frame object expected in comparison.");
- return NULL;
- }
- else if (op != Py_EQ)
+ int result;
+
+ if (!PyObject_TypeCheck (other, &frame_object_type)
+ || (op != Py_EQ && op != Py_NE))
{
- PyErr_SetString (PyExc_TypeError, "Invalid comparison for gdb.Frame.");
- return NULL;
+ Py_INCREF (Py_NotImplemented);
+ return Py_NotImplemented;
}
if (frame_id_eq (((frame_object *) self)->frame_id,
((frame_object *) other)->frame_id))
- Py_RETURN_TRUE;
+ result = Py_EQ;
+ else
+ result = Py_NE;
+ if (op == result)
+ Py_RETURN_TRUE;
Py_RETURN_FALSE;
}
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index dd8b2eb..252206f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-13 Tom Tromey <tromey@redhat.com>
+
+ * gdb.python/python-frame.exp (gdb_py_test_silent_cmd): Test !=
+ operator on Frame.
+
2009-04-03 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
* gdb.base/attach.exp: Re-enable for spu*-*-* targets.
diff --git a/gdb/testsuite/gdb.python/python-frame.exp b/gdb/testsuite/gdb.python/python-frame.exp
index b1ee9be..82b526e 100644
--- a/gdb/testsuite/gdb.python/python-frame.exp
+++ b/gdb/testsuite/gdb.python/python-frame.exp
@@ -70,6 +70,8 @@ gdb_py_test_silent_cmd "python f0 = f1.newer ()" "get first frame" 0
gdb_test "python print 'result =', f0 == f1" " = False" "test equality comparison (false)"
gdb_test "python print 'result =', f0 == f0" " = True" "test equality comparison (true)"
+gdb_test "python print 'result =', f0 != f1" " = True" "test inequality comparison (true)"
+gdb_test "python print 'result =', f0 != f0" " = False" "test inequality comparison (false)"
gdb_test "python print 'result =', f0.is_valid ()" " = True" "test Frame.is_valid"
gdb_test "python print 'result =', f0.name ()" " = f2" "test Frame.name"
gdb_test "python print 'result =', f0.type () == gdb.NORMAL_FRAME" " = True" "test Frame.type"