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

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8293 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-01-08 07:08:21 +00:00
commit ab9d75f3c9
2 changed files with 46 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

45
SWIG/Examples/test-suite/python/std_containers_runme.py
View file

@ -4,9 +4,10 @@ import std_containers
cube = (((1, 2), (3, 4)), ((5, 6), (7, 8))) cube = (((1, 2), (3, 4)), ((5, 6), (7, 8)))
icube = std_containers.cident(cube)
if cube != std_containers.cident(cube): for i in range(0,len(cube)):
raise RuntimeError, "bad cident" if cube[i] != icube[i]:
raise RuntimeError, "bad cident"
p = (1,2) p = (1,2)
@ -14,13 +15,18 @@ if p != std_containers.pident(p):
raise RuntimeError, "bad pident" raise RuntimeError, "bad pident"
v = (1,2,3,4,5,6) v = (1,2,3,4,5,6)
iv = std_containers.vident(v)
if v != std_containers.vident(v): for i in range(0,len(v)):
raise RuntimeError, "bad pident" if v[i] != iv[i]:
raise RuntimeError, "bad vident"
if v != std_containers.videntu(v):
raise RuntimeError, "bad videntu" iv = std_containers.videntu(v)
for i in range(0,len(v)):
if v[i] != iv[i]:
raise RuntimeError, "bad videntu"
vu = std_containers.vector_ui(v) vu = std_containers.vector_ui(v)
if vu[2] != std_containers.videntu(vu)[2]: if vu[2] != std_containers.videntu(vu)[2]:
@ -33,12 +39,19 @@ if v[0:3][1] != vu[0:3][1]:
m = ((1,2,3),(2,3),(3,4)) m = ((1,2,3),(2,3),(3,4))
if m != std_containers.midenti(m): im = std_containers.midenti(m)
raise RuntimeError, "bad getslice"
mb = ((1,0,1),(1,1),(1,1)) for i in range(0,len(m)):
if mb != std_containers.midentb(mb): for j in range(0,len(m[i])):
raise RuntimeError, "bad getslice" if m[i][j] != im[i][j]:
raise RuntimeError, "bad getslice"
m = ((1,0,1),(1,1),(1,1))
im = std_containers.midentb(m)
for i in range(0,len(m)):
for j in range(0,len(m[i])):
if m[i][j] != im[i][j]:
raise RuntimeError, "bad getslice"
mi = std_containers.imatrix(m) mi = std_containers.imatrix(m)
@ -52,8 +65,10 @@ map['hello'] = 1
map['hi'] = 2 map['hi'] = 2
map['3'] = 2 map['3'] = 2
if map != std_containers.mapident(map): imap = std_containers.mapident(map)
raise RuntimeError, "bad map" for k in map:
if map[k] != imap[k]:
raise RuntimeError, "bad map"
mapc ={} mapc ={}

32
SWIG/Lib/python/pycontainer.swg
View file

@ -717,10 +717,6 @@ namespace swig {
return SWIG_OLDOBJ; return SWIG_OLDOBJ;
} }
} }
if (seq) {
PyErr_Format(PyExc_TypeError, "a %s is expected",
swig::type_name<sequence>());
}
return SWIG_ERROR; return SWIG_ERROR;
} }
}; };
@ -733,19 +729,23 @@ namespace swig {
typedef typename sequence::const_iterator const_iterator; typedef typename sequence::const_iterator const_iterator;
static PyObject *from(const sequence& seq) { static PyObject *from(const sequence& seq) {
size_type size = seq.size(); swig_type_info *desc = swig::type_info<sequence>();
if (size <= (size_type)INT_MAX) { if (desc && desc->clientdata) {
PyObject *obj = PyTuple_New((int)size); return SWIG_NewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN);
int i = 0;
for (const_iterator it = seq.begin();
it != seq.end(); ++it, ++i) {
PyTuple_SetItem(obj,i,swig::from<value_type>(*it));
}
return obj;
} else { } else {
PyErr_SetString(PyExc_OverflowError, size_type size = seq.size();
"sequence size not valid in python"); if (size <= (size_type)INT_MAX) {
return NULL; PyObject *obj = PyTuple_New((int)size);
int i = 0;
for (const_iterator it = seq.begin();
it != seq.end(); ++it, ++i) {
PyTuple_SetItem(obj,i,swig::from<value_type>(*it));
}
return obj;
} else {
PyErr_SetString(PyExc_OverflowError,"sequence size not valid in python");
return NULL;
}
} }
} }
}; };