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

small error fixes

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5649 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-01-20 20:51:46 +00:00
commit 63cdb9b4d0
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/python/std_complex.i
View file

@ -9,7 +9,7 @@
static inline int static inline int
SwigComplex_Check(PyObject *o) SwigComplex_Check(PyObject *o)
{ {
return (PyComplex_Check(o) || PyFloat_Check(o) || PyInt_Check(o)) ? 1 : 0; return PyComplex_Check(o) || PyFloat_Check(o) || PyInt_Check(o) || PyLong_Check(o);
} }
template <class __Complex> template <class __Complex>
@ -22,6 +22,8 @@ SwigComplex_As(PyObject *o)
return __Complex(PyFloat_AsDouble(o), 0); return __Complex(PyFloat_AsDouble(o), 0);
} else if (PyInt_Check(o)) { } else if (PyInt_Check(o)) {
return __Complex(PyInt_AsLong(o), 0); return __Complex(PyInt_AsLong(o), 0);
} else if (PyLong_Check(o)) {
return __Complex(PyLong_AsLongLong(o), 0);
} else { } else {
PyErr_SetString(PyExc_TypeError, "Expecting a complex or compatible type"); PyErr_SetString(PyExc_TypeError, "Expecting a complex or compatible type");
return __Complex(0,0); return __Complex(0,0);
@ -68,11 +70,11 @@ SwigComplex_AsComplexDouble(PyObject *o)
// C++ proxy class typemaps // C++ proxy class typemaps
%typemap(directorin) Complex { %typemap(directorin) Complex {
$input = PyComplex_FromDoubles($1_name.real(), $1_name.imag()); $input = PyComplex_FromDoubles($1_name.real(), $1_name.imag());
} }
%typemap(directorin) const Complex & { %typemap(directorin) const Complex & {
$input = PyComplex_FromDoubles($1_name.real(), $1_name.imag()); $input = PyComplex_FromDoubles($1_name.real(), $1_name.imag());
} }
%typemap(directorout) Complex { %typemap(directorout) Complex {
@ -82,7 +84,7 @@ SwigComplex_AsComplexDouble(PyObject *o)
} }
} }
%typemap(directorout) const complex<T>& (Complex temp) { %typemap(directorout) const Complex & (Complex temp) {
temp = SwigComplex_As< Complex >($input); temp = SwigComplex_As< Complex >($input);
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
throw Swig::DirectorTypeMismatchException("Expecting a complex or compatible type"); throw Swig::DirectorTypeMismatchException("Expecting a complex or compatible type");