in/out fix
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6283 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
d3534ecc5a
commit
ff5136e3a4
1 changed files with 19 additions and 23 deletions
|
|
@ -1,28 +1,24 @@
|
|||
/* Helper function to return tuples */
|
||||
/*
|
||||
Helper function to return output types, now we need to use a list
|
||||
instead of a tuple since all the other types
|
||||
(std::pair,std::vector,std::list,etc) return tuples.
|
||||
*/
|
||||
|
||||
%fragment("t_output_helper","header") %{
|
||||
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
|
||||
PyObject* o2;
|
||||
PyObject* o3;
|
||||
|
||||
if (!target) {
|
||||
target = o;
|
||||
} else if (target == Py_None) {
|
||||
Py_DECREF(Py_None);
|
||||
target = o;
|
||||
} else {
|
||||
o2 = target;
|
||||
target = PyTuple_New(1);
|
||||
PyTuple_SetItem(target, 0, o2);
|
||||
|
||||
o3 = PyTuple_New(1);
|
||||
PyTuple_SetItem(o3, 0, o);
|
||||
|
||||
o2 = target;
|
||||
target = PySequence_Concat(o2, o3);
|
||||
Py_DECREF(o2);
|
||||
Py_DECREF(o3);
|
||||
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
|
||||
if (!target) {
|
||||
target = o;
|
||||
} else if (target == Py_None) {
|
||||
Py_DECREF(target);
|
||||
target = o;
|
||||
} else {
|
||||
if (!PyList_Check(target)) {
|
||||
PyObject *o2 = target;
|
||||
target = PyList_New(1);
|
||||
PyList_SetItem(target, 0, o2);
|
||||
}
|
||||
return target;
|
||||
PyList_Append(target,o);
|
||||
}
|
||||
return target;
|
||||
}
|
||||
%}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue