Re: [RFA/Python] Fix int() builtin with range type gdb.Value objects.

[Joel Brobecker <brobecker at adacore dot com>]

> >>>>> "Joel" == Joel Brobecker <brobecker@adacore.com> writes:
> 
> Joel>         * python/py-value.c (is_intlike): Add TYPE_CODE_RANGE handling.
> 
> Joel>         * gdb.ada/py_range: New testcase.
> 
> Joel> Tested on x86_64-linux. OK to apply?
> 
> Yeah, it's ok.

Thanks, Tom. Checked in.

> Joel> Looking beyond this issue, I compared this function with is_integral_type,
> Joel> and found that is_integral_type also accepts TYPE_CODE_FLAGS. It seems
> Joel> like we could probably do the same in is_intlike?
> 
> I think we should just drop is_intlike and use is_integral_type.
> The pointer type check can be inlined into valpy_long.

I was wondering why we werent' using is_integral_type... Attached is
a patch that does just that. An alternative could have been to
implement is_intlike on top of is_integral_type, but this seems
unnecessary at the moment.

gdb/ChangeLog:

        * python/py-value.c (is_intlike): Delete.
        (valpy_int): Replace use of CHECK_TYPEDEF and is_intlike
        by use of is_integral_type.
        (valpy_long): Replace use of CHECK_TYPEDEF and is_intlike
        by use of is_integral_type and check for TYPE_CODE_PTR.

Tested on x86_64-linux, no regression. OK to commit?

Thank you,
-- 
Joel

>From eb3e1316137af3b88ec4a7208eabc2a048607331 Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@adacore.com>
Date: Tue, 19 Nov 2013 06:56:00 +0400
Subject: [PATCH] get rid of py-value.c:is_intlike (use is_integral_type
 instead)

is_intlike was mostly duplicating is_integral_type, with the exception
of the handling of TYPE_CODE_PTR when parameter PTR_OK is nonzero.
This patches deletes the is_intlike function, using is_integral_type
instead, and adjusting the two locations where this function gets
called.

The code should remain strictly equivalent.

gdb/ChangeLog:

        * python/py-value.c (is_intlike): Delete.
        (valpy_int): Replace use of CHECK_TYPEDEF and is_intlike
        by use of is_integral_type.
        (valpy_long): Replace use of CHECK_TYPEDEF and is_intlike
        by use of is_integral_type and check for TYPE_CODE_PTR.
---
 gdb/python/py-value.c | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
index 451bfaf..95f9586 100644
--- a/gdb/python/py-value.c
+++ b/gdb/python/py-value.c
@@ -1129,18 +1129,6 @@ valpy_richcompare (PyObject *self, PyObject *other, int op)
   Py_RETURN_FALSE;
 }
 
-/* Helper function to determine if a type is "int-like".  */
-static int
-is_intlike (struct type *type, int ptr_ok)
-{
-  return (TYPE_CODE (type) == TYPE_CODE_INT
-	  || TYPE_CODE (type) == TYPE_CODE_ENUM
-	  || TYPE_CODE (type) == TYPE_CODE_BOOL
-	  || TYPE_CODE (type) == TYPE_CODE_CHAR
-	  || TYPE_CODE (type) == TYPE_CODE_RANGE
-	  || (ptr_ok && TYPE_CODE (type) == TYPE_CODE_PTR));
-}
-
 #ifndef IS_PY3K
 /* Implements conversion to int.  */
 static PyObject *
@@ -1153,8 +1141,7 @@ valpy_int (PyObject *self)
 
   TRY_CATCH (except, RETURN_MASK_ALL)
     {
-      CHECK_TYPEDEF (type);
-      if (!is_intlike (type, 0))
+      if (!is_integral_type (type))
 	error (_("Cannot convert value to int."));
 
       l = value_as_long (value);
@@ -1176,9 +1163,8 @@ valpy_long (PyObject *self)
 
   TRY_CATCH (except, RETURN_MASK_ALL)
     {
-      CHECK_TYPEDEF (type);
-
-      if (!is_intlike (type, 1))
+      if (!is_integral_type (type)
+	  && TYPE_CODE (type) != TYPE_CODE_PTR)
 	error (_("Cannot convert value to long."));
 
       l = value_as_long (value);
-- 
1.8.1.2