jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix to avoid copies when the wrapper class exists, and to accept std::map pointers

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8292 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-01-08 07:04:45 +00:00
commit e8d67c80f3
1 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

62
Lib/python/std_map.i
View file

@ -19,17 +19,16 @@
struct traits_asptr<std::map<K,T> > { struct traits_asptr<std::map<K,T> > {
typedef std::map<K,T> map_type; typedef std::map<K,T> map_type;
static int asptr(PyObject *obj, map_type **val) { static int asptr(PyObject *obj, map_type **val) {
int res = SWIG_ERROR;
if (PyDict_Check(obj)) { if (PyDict_Check(obj)) {
PyObject_var items = PyMapping_Items(obj); PyObject_var items = PyMapping_Items(obj);
return traits_asptr_stdseq<std::map<K,T>, std::pair<K, T> > res = traits_asptr_stdseq<std::map<K,T>, std::pair<K, T> >::asptr(items, val);
::asptr(items, val); } else {
map_type *p;
res = SWIG_ConvertPtr(obj,(void**)&p,swig::type_info<map_type>(),0);
if (SWIG_IsOK(res) && val) *val = p;
} }
if (val) { return res;
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
PyErr_SetString(PyExc_TypeError, "a dictionary is expected");
SWIG_PYTHON_THREAD_END_BLOCK;
}
return 0;
} }
}; };
@ -40,22 +39,27 @@
typedef typename map_type::size_type size_type; typedef typename map_type::size_type size_type;
static PyObject *from(const map_type& map) { static PyObject *from(const map_type& map) {
size_type size = map.size(); swig_type_info *desc = swig::type_info<map_type>();
int pysize = (size <= (size_type) INT_MAX) ? (int) size : -1; if (desc && desc->clientdata) {
if (pysize < 0) { return SWIG_NewPointerObj(new map_type(map), desc, SWIG_POINTER_OWN);
SWIG_PYTHON_THREAD_BEGIN_BLOCK; } else {
PyErr_SetString(PyExc_OverflowError, size_type size = map.size();
"map size not valid in python"); int pysize = (size <= (size_type) INT_MAX) ? (int) size : -1;
SWIG_PYTHON_THREAD_END_BLOCK; if (pysize < 0) {
return NULL; SWIG_PYTHON_THREAD_BEGIN_BLOCK;
PyErr_SetString(PyExc_OverflowError,
"map size not valid in python");
SWIG_PYTHON_THREAD_END_BLOCK;
return NULL;
}
PyObject *obj = PyDict_New();
for (const_iterator i= map.begin(); i!= map.end(); ++i) {
swig::PyObject_var key = swig::from(i->first);
swig::PyObject_var val = swig::from(i->second);
PyDict_SetItem(obj, key, val);
}
return obj;
} }
PyObject *obj = PyDict_New();
for (const_iterator i= map.begin(); i!= map.end(); ++i) {
swig::PyObject_var key = swig::from(i->first);
swig::PyObject_var val = swig::from(i->second);
PyDict_SetItem(obj, key, val);
}
return obj;
} }
}; };
} }
@ -104,7 +108,7 @@
PyObject* keyList = PyList_New(pysize); PyObject* keyList = PyList_New(pysize);
Map::const_iterator i = self->begin(); Map::const_iterator i = self->begin();
for (int j = 0; j < pysize; ++i, ++j) { for (int j = 0; j < pysize; ++i, ++j) {
PyList_SetItem(keyList, j, swig::from(i->first)); PyList_SET_ITEM(keyList, j, swig::from(i->first));
} }
return keyList; return keyList;
} }
@ -119,10 +123,10 @@
SWIG_PYTHON_THREAD_END_BLOCK; SWIG_PYTHON_THREAD_END_BLOCK;
return NULL; return NULL;
} }
PyObject* valList = PyTuple_New(pysize); PyObject* valList = PyList_New(pysize);
Map::const_iterator i = self->begin(); Map::const_iterator i = self->begin();
for (int j = 0; j < pysize; ++i, ++j) { for (int j = 0; j < pysize; ++i, ++j) {
PyTuple_SetItem(valList, j, swig::from(i->second)); PyList_SET_ITEM(valList, j, swig::from(i->second));
} }
return valList; return valList;
} }
@ -137,10 +141,10 @@
SWIG_PYTHON_THREAD_END_BLOCK; SWIG_PYTHON_THREAD_END_BLOCK;
return NULL; return NULL;
} }
PyObject* itemList = PyTuple_New(pysize); PyObject* itemList = PyList_New(pysize);
Map::const_iterator i = self->begin(); Map::const_iterator i = self->begin();
for (int j = 0; j < pysize; ++i, ++j) { for (int j = 0; j < pysize; ++i, ++j) {
PyTuple_SetItem(itemList, j, swig::from(*i)); PyList_SET_ITEM(itemList, j, swig::from(*i));
} }
return itemList; return itemList;
} }
@ -163,7 +167,7 @@
PyObject* keyTuple = PyTuple_New(pysize); PyObject* keyTuple = PyTuple_New(pysize);
Map::const_iterator i = self->begin(); Map::const_iterator i = self->begin();
for (int j = 0; j < pysize; ++i, ++j) { for (int j = 0; j < pysize; ++i, ++j) {
PyTuple_SetItem(keyTuple, j, swig::from(i->first)); PyTuple_SET_ITEM(keyTuple, j, swig::from(i->first));
} }
%#if PY_VERSION_HEX >= 0x02020000 %#if PY_VERSION_HEX >= 0x02020000
PyObject* iter = PyObject_GetIter(keyTuple); PyObject* iter = PyObject_GetIter(keyTuple);