2009-12-08 Phil Muldoon <pmuldoon@redhat.com>

	PR python/10804

	* python/py-type.c (typy_range): New Function.

2009-12-08  Phil Muldoon  <pmuldoon@redhat.com>

	* gdb.python/py-type.exp (test_range): New test.

2009-12-08  Phil Muldoon  <pmuldoon@redhat.com>

	* gdb.texinfo (Types In Python): Describe range function.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b9f8d02094c4a63dddc9fa4caff430e7ac184ede..23a7bc019426e1235a8daec8cad9b81342804a22 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-08  Phil Muldoon  <pmuldoon@redhat.com>
+
+       PR python/10804
+
+       * python/py-type.c (typy_range): New Function.
+
 2009-12-07  Doug Evans  <dje@google.com>
 
        * charset.c: Include environ.h.

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 8e5eed616458f99a621f539e89d26d37668ebb46..a60e97353fe41c95c710193866087b68cae4411a 100644 (file)
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-08  Phil Muldoon  <pmuldoon@redhat.com>
+
+       * gdb.texinfo (Types In Python): Describe range function.
+
 2009-12-03  Richard Ward  <richard.j.ward1@googlemail.com>
 
        * gdb.texinfo (Types In Python): Describe "is_base_class".

diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index b5862c185fd61ae653ae180a9b231f30440449e6..e880838191d6dd2ef883671d4f0942886d9b65ee 100644 (file)
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -19654,6 +19654,13 @@ variant of this type.  That is, the result is neither @code{const} nor
 @code{volatile}.
 @end defmethod
 
+@defmethod Type range
+Return a Python @code{Tuple} object that contains two elements: the
+low bound of the argument type and the high bound of that type.  If
+the type does not have a range, @value{GDBN} will raise a
+@code{RuntimeError} exception.
+@end defmethod
+
 @defmethod Type reference
 Return a new @code{gdb.Type} object which represents a reference to this
 type.

diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index e73185ea8816bf3de77e2e879a38ad186f87dc71..c581307d57c552d50a4215694428e7251aa3aad3 100644 (file)
--- a/gdb/python/py-type.c
+++ b/gdb/python/py-type.c
@@ -273,6 +273,70 @@ typy_pointer (PyObject *self, PyObject *args)
   return type_to_type_object (type);
 }
 
+/* Return the range of a type represented by SELF.  The return type is
+   a tuple.  The first element of the tuple contains the low bound,
+   while the second element of the tuple contains the high bound.  */
+static PyObject *
+typy_range (PyObject *self, PyObject *args)
+{
+  struct type *type = ((type_object *) self)->type;
+  PyObject *result;
+  PyObject *low_bound = NULL, *high_bound = NULL;
+  LONGEST low, high;
+
+  if (TYPE_CODE (type) != TYPE_CODE_ARRAY
+      && TYPE_CODE (type) != TYPE_CODE_STRING
+      && TYPE_CODE (type) != TYPE_CODE_RANGE)
+    {
+      PyErr_SetString (PyExc_RuntimeError,
+                      "This type does not have a range.");
+      return NULL;
+    }
+
+  switch (TYPE_CODE (type))
+    {
+    case TYPE_CODE_ARRAY:
+    case TYPE_CODE_STRING:
+      low = TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type));
+      high = TYPE_HIGH_BOUND (TYPE_INDEX_TYPE (type));
+      break;
+    case TYPE_CODE_RANGE:
+      low = TYPE_LOW_BOUND (type);
+      high = TYPE_HIGH_BOUND (type);
+      break;
+    }
+
+  low_bound = PyLong_FromLong (low);
+  if (!low_bound)
+    goto failarg;
+
+  high_bound = PyLong_FromLong (high);
+  if (!high_bound)
+    goto failarg;
+
+  result = PyTuple_New (2);
+  if (!result)
+    goto failarg;
+
+  if (PyTuple_SetItem (result, 0, low_bound) != 0)
+    {
+      Py_DECREF (result);
+      goto failarg;
+    }
+  if (PyTuple_SetItem (result, 1, high_bound) != 0)
+    {
+      Py_DECREF (high_bound);
+      Py_DECREF (result);
+      return NULL;
+    }
+  return result;
+  
+ failarg:
+  Py_XDECREF (high_bound);
+  Py_XDECREF (low_bound);
+  return NULL;
+}
+
 /* Return a Type object which represents a reference to SELF.  */
 static PyObject *
 typy_reference (PyObject *self, PyObject *args)
@@ -699,6 +763,9 @@ Each field is a dictionary." },
   { "pointer", typy_pointer, METH_NOARGS,
     "pointer () -> Type\n\
 Return a type of pointer to this type." },
+  { "range", typy_range, METH_NOARGS,
+    "range () -> tuple\n\
+Return a tuple containing the lower and upper range for this type."},
   { "reference", typy_reference, METH_NOARGS,
     "reference () -> Type\n\
 Return a type of reference to this type." },

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 65d1ee6afc51654495ee9294806ad9d480818c8f..069280cfaf1fb7f17a9f01d683277bdd49e3a6ac 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-08  Phil Muldoon  <pmuldoon@redhat.com>
+
+       * gdb.python/py-type.exp (test_range): New test.
+
 2009-12-03  Phil Muldoon <pmuldoon@redhat.com>
 
        PR python/10805

diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp
index fabda5b0a6d38e641bb29c52524d00d475c4f586..5fa087751331290bb311ee21f1a9bf0a0d2ea436 100644 (file)
--- a/gdb/testsuite/gdb.python/py-type.exp
+++ b/gdb/testsuite/gdb.python/py-type.exp
@@ -102,6 +102,29 @@ proc test_base_class {} {
   gdb_test "python print fields\[1\].is_base_class" "False" "Check base class"
 }
 
+proc test_range {} {
+
+  # Test a valid range request.
+  gdb_py_test_silent_cmd "print ar" "print value" 1
+  gdb_py_test_silent_cmd "python ar = gdb.history (0)" "get value from history" 1
+  gdb_test "python print len(ar.type.range())" "2" "Check correct tuple length"
+  gdb_test "python print ar.type.range()\[0\]" "0" "Check low range"
+  gdb_test "python print ar.type.range()\[1\]" "1" "Check high range"
+
+  # Test a range request on a ranged type.
+  gdb_py_test_silent_cmd "print ar" "print value" 1
+  gdb_py_test_silent_cmd "python ar = gdb.history (0)" "get value from  history" 1
+  gdb_py_test_silent_cmd "python fields = ar.type.fields()" "get fields" 1
+  gdb_test "python print fields\[0\].type.range()\[0\]" "0" "Check range type low bound"
+  gdb_test "python print fields\[0\].type.range()\[1\]" "1" "Check range type high bound"
+
+  # Test where a range does not exist.
+  gdb_py_test_silent_cmd "print st" "print value" 1
+  gdb_py_test_silent_cmd "python st = gdb.history (0)" "get value from history" 1
+  gdb_test "python print st.type.range()" "RuntimeError: This type does not have a range.*" "Check range for non ranged type."
+}
+
+
 # Perform C Tests.
 build_inferior "c"
 restart_gdb "break to inspect struct and array."
@@ -112,3 +135,4 @@ build_inferior "c++"
 restart_gdb "break to inspect struct and array."
 test_fields "c++"
 test_base_class
+test_range