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

fix typecheck for INPUT* type

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6902 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-12-20 10:19:54 +00:00
commit e5ce468853
2 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Examples/test-suite/python/input.i
View file

@ -2,9 +2,9 @@
%apply int *INPUT {int *bar}; %apply int *INPUT {int *bar};
%typemap(out) int * Foo::foo { %typemap(out, fragment=SWIG_From_frag(int)) int * Foo::foo {
if ($1) { if ($1) {
$result = PyInt_FromLong(*$1); $result = SWIG_From(int)(*$1);
} else { } else {
Py_INCREF(Py_None); Py_INCREF(Py_None);
$result = Py_None; $result = Py_None;
@ -14,7 +14,7 @@
%inline %inline
{ {
struct Foo { struct Foo {
int *foo(int *bar) { int *foo(int *bar = 0) {
if (bar) { if (bar) {
*bar *= 2; *bar *= 2;
} }
@ -23,20 +23,10 @@
}; };
} }
%include std_string.i %include std_string.i
%apply std::string *INPUT {std::string *bar}; %apply std::string *INPUT {std::string *bar};
%typemap(out) int * sfoo {
if ($1) {
$result = PyInt_FromLong(*$1);
} else {
Py_INCREF(Py_None);
$result = Py_None;
}
}
%typemap(out, fragment=SWIG_From_frag(std::string)) std::string * sfoo { %typemap(out, fragment=SWIG_From_frag(std::string)) std::string *sfoo {
if ($1) { if ($1) {
$result = SWIG_From(std::string)(*$1); $result = SWIG_From(std::string)(*$1);
} else { } else {
@ -46,7 +36,7 @@
} }
%inline %{ %inline %{
std::string *sfoo(std::string *bar) { std::string *sfoo(std::string *bar = 0) {
if (bar) *bar += " world"; if (bar) *bar += " world";
return (bar) ? bar : 0; return (bar) ? bar : 0;
} }

7
Examples/test-suite/python/input_runme.py
View file

@ -7,9 +7,14 @@ if f.foo(2) != 4:
if f.foo(None)!= None: if f.foo(None)!= None:
raise RuntimeError raise RuntimeError
if f.foo()!= None:
raise RuntimeError
if sfoo("Hello") != "Hello world": if sfoo("Hello") != "Hello world":
raise RuntimeError raise RuntimeError
if sfoo(None) != None: if sfoo(None) != None:
raise RuntimeError raise RuntimeError
if sfoo() != None:
raise RuntimeError