FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

get rid of py-value.c:is_intlike (use is_integral_type instead)

Browse source 
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.
This commit is contained in:
Joel Brobecker 2013-11-19 06:56:00 +04:00
parent e48744a00a
commit 7c245c246c
2 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gdb/ChangeLog
View file

@ -1,3 +1,11 @@
2013-11-20 Joel Brobecker <brobecker@adacore.com>
* 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.
2013-11-20 Tom Tromey <tromey@redhat.com> 2013-11-20 Tom Tromey <tromey@redhat.com>
* gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Remove * gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Remove

18
gdb/python/py-value.c
View file

@ -1129,18 +1129,6 @@ valpy_richcompare (PyObject *self, PyObject *other, int op)
Py_RETURN_FALSE; 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 #ifndef IS_PY3K
/* Implements conversion to int. */ /* Implements conversion to int. */
static PyObject * static PyObject *
@ -1153,8 +1141,7 @@ valpy_int (PyObject *self)
TRY_CATCH (except, RETURN_MASK_ALL) TRY_CATCH (except, RETURN_MASK_ALL)
{ {
CHECK_TYPEDEF (type); if (!is_integral_type (type))
if (!is_intlike (type, 0))
error (_("Cannot convert value to int.")); error (_("Cannot convert value to int."));
l = value_as_long (value); l = value_as_long (value);
@ -1178,7 +1165,8 @@ valpy_long (PyObject *self)
{ {
CHECK_TYPEDEF (type); 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.")); error (_("Cannot convert value to long."));
l = value_as_long (value); l = value_as_long (value);