[1/7] Allow more Python scalar conversions
Commit Message
PR python/18352 points out that the gdb Python code can't convert an
integer-valued gdb.Value to a Python float. While writing the test I
noticed that, similarly, converting integer gdb.Values to float does
not work. However, all of these cases seem reasonable.
gdb/ChangeLog
2018-09-14 Tom Tromey <tom@tromey.com>
PR python/18352;
* python/py-value.c (valpy_float): Allow conversions from int or
char.
(valpy_int, valpy_long): Allow conversions from float.
gdb/testsuite/ChangeLog
2018-09-14 Tom Tromey <tom@tromey.com>
PR python/18352;
* gdb.python/py-value.exp (test_float_conversion): New proc.
Use it.
---
gdb/ChangeLog | 7 +++++++
gdb/python/py-value.c | 25 ++++++++++++++++++++++---
gdb/testsuite/ChangeLog | 6 ++++++
gdb/testsuite/gdb.python/py-value.exp | 10 ++++++++++
4 files changed, 45 insertions(+), 3 deletions(-)
Comments
On 2018-09-15 3:24 a.m., Tom Tromey wrote:
> +proc test_float_conversion {} {
> + gdb_test "python print int(gdb.Value(0))" "0"
> + gdb_test "python print int(gdb.Value(0.0))" "0"
> + gdb_test "python print long(gdb.Value(0))" "0"
> + gdb_test "python print long(gdb.Value(0.0))" "0"
> + gdb_test "python print float(gdb.Value(0.0))" "0\\.0"
> + gdb_test "python print float(gdb.Value(0))" "0\\.0"
> +}
This LGTM, but I just wanted to mention that I would probably have tested
with another value than 0. For example, test that the truncation (int(2.3)
which becomes 2) works correctly. Not really a big deal.
Simon
>>>>> "Simon" == Simon Marchi <simark@simark.ca> writes:
Simon> On 2018-09-15 3:24 a.m., Tom Tromey wrote:
>> +proc test_float_conversion {} {
>> + gdb_test "python print int(gdb.Value(0))" "0"
>> + gdb_test "python print int(gdb.Value(0.0))" "0"
>> + gdb_test "python print long(gdb.Value(0))" "0"
>> + gdb_test "python print long(gdb.Value(0.0))" "0"
>> + gdb_test "python print float(gdb.Value(0.0))" "0\\.0"
>> + gdb_test "python print float(gdb.Value(0))" "0\\.0"
>> +}
Simon> This LGTM, but I just wanted to mention that I would probably have tested
Simon> with another value than 0. For example, test that the truncation (int(2.3)
Simon> which becomes 2) works correctly. Not really a big deal.
I've changed the ones with floating point arguments.
Tom
@@ -1497,6 +1497,12 @@ valpy_int (PyObject *self)
TRY
{
+ if (is_floating_value (value))
+ {
+ type = builtin_type_pylong;
+ value = value_cast (type, value);
+ }
+
if (!is_integral_type (type))
error (_("Cannot convert value to int."));
@@ -1522,6 +1528,12 @@ valpy_long (PyObject *self)
TRY
{
+ if (is_floating_value (value))
+ {
+ type = builtin_type_pylong;
+ value = value_cast (type, value);
+ }
+
type = check_typedef (type);
if (!is_integral_type (type)
@@ -1554,10 +1566,17 @@ valpy_float (PyObject *self)
{
type = check_typedef (type);
- if (TYPE_CODE (type) != TYPE_CODE_FLT || !is_floating_value (value))
+ if (TYPE_CODE (type) == TYPE_CODE_FLT && is_floating_value (value))
+ d = target_float_to_host_double (value_contents (value), type);
+ else if (TYPE_CODE (type) == TYPE_CODE_INT)
+ {
+ /* Note that valpy_long accepts TYPE_CODE_PTR and some
+ others here here -- but casting a pointer or bool to a
+ float seems wrong. */
+ d = value_as_long (value);
+ }
+ else
error (_("Cannot convert value to float."));
-
- d = target_float_to_host_double (value_contents (value), type);
}
CATCH (except, RETURN_MASK_ALL)
{
@@ -483,6 +483,15 @@ proc test_value_hash {} {
gdb_test "python print (one.__hash__() == hash(one))" "True" "test inbuilt hash"
}
+proc test_float_conversion {} {
+ gdb_test "python print int(gdb.Value(0))" "0"
+ gdb_test "python print int(gdb.Value(0.0))" "0"
+ gdb_test "python print long(gdb.Value(0))" "0"
+ gdb_test "python print long(gdb.Value(0.0))" "0"
+ gdb_test "python print float(gdb.Value(0.0))" "0\\.0"
+ gdb_test "python print float(gdb.Value(0))" "0\\.0"
+}
+
# Build C version of executable. C++ is built later.
if { [build_inferior "${binfile}" "c"] < 0 } {
return -1
@@ -501,6 +510,7 @@ test_value_compare
test_objfiles
test_parse_and_eval
test_value_hash
+test_float_conversion
# The following tests require execution.