[Python] Allow PyLong values in integer lists (when converting to C lists)

[clayborg]

Looks good. Not sure if we also want to handle booleans? Should be easy to add support for bools.

[sivachandra]

Allowing PyBool lists as well.
OK?

[granata.enrico]

At a glance, it looks like you might be able to use PyLong_AsUnsignedLongLong() also for bool values.
If so, that might be a nicer code flow instead of the exact pointer equality check

if (PyLong || PyBool) { PyLong_AsUnsigned.... }

But if that actually doesn't work, looks good to me

[sivachandra]

Enrico prompted me to do this experiment:

>>> isinstance(True, long)
False
>>> isinstance(False, long)
False
>>> isinstance(False, int)
True
>>> isinstance(True, int)
True

So, bools were allowed even before this patch! I have taken out the additional
PyBool check and reverted to the original version of the patch. Will put it in
shortly.

scripts/Python/python-typemaps.swig

if (PyList_Check($input)) {
     int i = 0;
     $2 = size;
     $1 = (uint64_t*) malloc(size * sizeof(uint64_t));
     for (i = 0; i < size; i++) {
       PyObject *o = PyList_GetItem($input,i);
       if (PyInt_Check(o)) {
         $1[i] = PyInt_AsLong(o);
       }
+      else if (PyLong_Check(o)) {
+        $1[i] = PyLong_AsUnsignedLongLong(o);
+      }
       else {
         PyErr_SetString(PyExc_TypeError,"list must contain numbers");
         free($1);
         return NULL;
       }
+
+      if (PyErr_Occurred()) {
+        free($1);
+        return NULL;
+      }
     }
   } else if ($input == Py_None) {
     $1 =  NULL;
     $2 = 0;
   } else {
     PyErr_SetString(PyExc_TypeError,"not a list");
     return NULL;
   }
if (PyList_Check($input)) {
     int i = 0;
     $2 = size;
     $1 = (uint32_t*) malloc(size * sizeof(uint32_t));
     for (i = 0; i < size; i++) {
       PyObject *o = PyList_GetItem($input,i);
       if (PyInt_Check(o)) {
         $1[i] = PyInt_AsLong(o);
       }
+      else if (PyLong_Check(o)) {
+        $1[i] = PyLong_AsUnsignedLong(o);
+      }
       else {
         PyErr_SetString(PyExc_TypeError,"list must contain numbers");
         free($1);
         return NULL;
       }
+
+      if (PyErr_Occurred()) {
+        free($1);
+        return NULL;
+      }
     }
   } else if ($input == Py_None) {
     $1 =  NULL;
     $2 = 0;
   } else {
     PyErr_SetString(PyExc_TypeError,"not a list");
     return NULL;
   }
if (PyList_Check($input)) {
     int i = 0;
     $2 = size;
     $1 = (int64_t*) malloc(size * sizeof(int64_t));
     for (i = 0; i < size; i++) {
       PyObject *o = PyList_GetItem($input,i);
       if (PyInt_Check(o)) {
         $1[i] = PyInt_AsLong(o);
       }
+      else if (PyLong_Check(o)) {
+        $1[i] = PyLong_AsLongLong(o);
+      }
       else {
         PyErr_SetString(PyExc_TypeError,"list must contain numbers");
         free($1);
         return NULL;
       }
+
+      if (PyErr_Occurred()) {
+        free($1);
+        return NULL;
+      }
     }
   } else if ($input == Py_None) {
     $1 =  NULL;
     $2 = 0;
   } else {
     PyErr_SetString(PyExc_TypeError,"not a list");
     return NULL;
   }
if (PyList_Check($input)) {
     int i = 0;
     $2 = size;
     $1 = (int32_t*) malloc(size * sizeof(int32_t));
     for (i = 0; i < size; i++) {
       PyObject *o = PyList_GetItem($input,i);
       if (PyInt_Check(o)) {
         $1[i] = PyInt_AsLong(o);
       }
+      else if (PyLong_Check(o)) {
+        $1[i] = PyLong_AsLong(o);
+      }
       else {
         PyErr_SetString(PyExc_TypeError,"list must contain numbers");
         free($1);
         return NULL;
       }
+
+      if (PyErr_Occurred()) {
+        free($1);
+        return NULL;
+      }
     }
   } else if ($input == Py_None) {
     $1 =  NULL;
     $2 = 0;
   } else {
     PyErr_SetString(PyExc_TypeError,"not a list");
     return NULL;
   }

test/python_api/sbdata/TestSBData.py

def data_api(self):
         data2 = lldb.SBData.CreateDataFromCString(process.GetByteOrder(),process.GetAddressByteSize(),hello_str)
         self.assertTrue(len(data2.uint8) == len(hello_str))
         self.assertTrue(data2.uint8[0] == 104, 'h == 104')
         self.assertTrue(data2.uint8[1] == 101, 'e == 101')
         self.assertTrue(data2.uint8[2] == 108, 'l == 108')
         self.assert_data(data2.GetUnsignedInt8, 3, 108) # l
         self.assertTrue(data2.uint8[4] == 111, 'o == 111')
         self.assert_data(data2.GetUnsignedInt8, 5, 33) # !
-        
-        data2 = lldb.SBData.CreateDataFromUInt64Array(process.GetByteOrder(),process.GetAddressByteSize(),[1,2,3,4,5])
+        uint_lists = [ [1,2,3,4,5], [long(i) for i in [1, 2, 3, 4, 5]] ]
+        int_lists = [ [2, -2], [long(i) for i in [2, -2]] ]
+
+        for l in uint_lists:
+            data2 = lldb.SBData.CreateDataFromUInt64Array(process.GetByteOrder(), process.GetAddressByteSize(), l)
             self.assert_data(data2.GetUnsignedInt64, 0, 1)
             self.assert_data(data2.GetUnsignedInt64, 8, 2)
             self.assert_data(data2.GetUnsignedInt64, 16, 3)
             self.assert_data(data2.GetUnsignedInt64, 24, 4)
             self.assert_data(data2.GetUnsignedInt64, 32, 5)
         
             self.assertTrue(data2.uint64s == [1,2,3,4,5], 'read_data_helper failure: data2 == [1,2,3,4,5]')
 
-        data2 = lldb.SBData.CreateDataFromSInt32Array(process.GetByteOrder(),process.GetAddressByteSize(),[2, -2])
+        for l in int_lists:
+            data2 = lldb.SBData.CreateDataFromSInt32Array(process.GetByteOrder(), process.GetAddressByteSize(), l)
             self.assertTrue(data2.sint32[0:2] == [2,-2], 'signed32 data2 = [2,-2]')
         
-        data2.Append(lldb.SBData.CreateDataFromSInt64Array(process.GetByteOrder(),process.GetAddressByteSize(),[2, -2]))
+        data2.Append(lldb.SBData.CreateDataFromSInt64Array(process.GetByteOrder(), process.GetAddressByteSize(), int_lists[0]))
         self.assert_data(data2.GetSignedInt32, 0, 2)
         self.assert_data(data2.GetSignedInt32, 4, -2)
         self.assertTrue(data2.sint64[1:3] == [2,-2], 'signed64 data2 = [2,-2]')
-        
-        data2 = lldb.SBData.CreateDataFromUInt32Array(process.GetByteOrder(),process.GetAddressByteSize(),[1,2,3,4,5])
+        for l in int_lists:
+            data2 = lldb.SBData.CreateDataFromSInt64Array(process.GetByteOrder(), process.GetAddressByteSize(), l)
+            self.assert_data(data2.GetSignedInt64, 0, 2)
+            self.assert_data(data2.GetSignedInt64, 8, -2)
+            self.assertTrue(data2.sint64[0:2] == [2,-2], 'signed64 data2 = [2,-2]')
+
+        for l in uint_lists:
+            data2 = lldb.SBData.CreateDataFromUInt32Array(process.GetByteOrder(), process.GetAddressByteSize(), l)
             self.assert_data(data2.GetUnsignedInt32,0, 1)
             self.assert_data(data2.GetUnsignedInt32,4, 2)
             self.assert_data(data2.GetUnsignedInt32,8, 3)
             self.assert_data(data2.GetUnsignedInt32,12, 4)
             self.assert_data(data2.GetUnsignedInt32,16, 5)
-        
+        bool_list = [True, True, False, False, True, False]
+
+        data2 = lldb.SBData.CreateDataFromSInt32Array(process.GetByteOrder(), process.GetAddressByteSize(), bool_list)
+        self.assertTrue(data2.sint32[0:6] == [1, 1, 0, 0, 1, 0], 'signed32 data2 = [1, 1, 0, 0, 1, 0]')
+
+        data2 = lldb.SBData.CreateDataFromUInt32Array(process.GetByteOrder(), process.GetAddressByteSize(), bool_list)
+        self.assertTrue(data2.uint32[0:6] == [1, 1, 0, 0, 1, 0], 'unsigned32 data2 = [1, 1, 0, 0, 1, 0]')
+
+        data2 = lldb.SBData.CreateDataFromSInt64Array(process.GetByteOrder(), process.GetAddressByteSize(), bool_list)
+        self.assertTrue(data2.sint64[0:6] == [1, 1, 0, 0, 1, 0], 'signed64 data2 = [1, 1, 0, 0, 1, 0]')
+
+        data2 = lldb.SBData.CreateDataFromUInt64Array(process.GetByteOrder(), process.GetAddressByteSize(), bool_list)
+        self.assertTrue(data2.uint64[0:6] == [1, 1, 0, 0, 1, 0], 'signed64 data2 = [1, 1, 0, 0, 1, 0]')
+        
         data2 = lldb.SBData.CreateDataFromDoubleArray(process.GetByteOrder(),process.GetAddressByteSize(),[3.14,6.28,2.71])
         self.assertTrue( fabs(data2.GetDouble(error,0) - 3.14) < 0.5, 'double data2[0] = 3.14')
         self.assertTrue(error.Success())
         self.assertTrue( fabs(data2.GetDouble(error,8) - 6.28) < 0.5, 'double data2[1] = 6.28')
         self.assertTrue(error.Success())
         self.assertTrue( fabs(data2.GetDouble(error,16) - 2.71) < 0.5, 'double data2[2] = 2.71')
         self.assertTrue(error.Success())