The 'directorin' typemap now accepts , etc expansions instead of having to use workarounds - _name, _name etc.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12879 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2011-12-21 07:16:44 +00:00
commit 4c898b023c
23 changed files with 80 additions and 78 deletions

View file

@ -266,7 +266,7 @@
size_t,
enum SWIGTYPE
{
ZVAL_LONG($input,$1_name);
ZVAL_LONG($input,$1);
}
%typemap(out) bool
@ -281,7 +281,7 @@
%typemap(directorin) bool
{
ZVAL_BOOL($input,($1_name)?1:0);
ZVAL_BOOL($input,($1)?1:0);
}
%typemap(out) float,
@ -299,7 +299,7 @@
%typemap(directorin) float,
double
{
ZVAL_DOUBLE($input,$1_name);
ZVAL_DOUBLE($input,$1);
}
%typemap(out) char
@ -347,7 +347,7 @@
SWIGTYPE [],
SWIGTYPE &
%{
SWIG_SetPointerZval($input, (void *)&$1_name, $1_descriptor, ($owner)|2);
SWIG_SetPointerZval($input, (void *)&$1, $1_descriptor, ($owner)|2);
%}
%typemap(out, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*)
@ -390,7 +390,7 @@
%typemap(directorin) SWIGTYPE
{
SWIG_SetPointerZval($input, SWIG_as_voidptr(&$1_name), $&1_descriptor, 2);
SWIG_SetPointerZval($input, SWIG_as_voidptr(&$1), $&1_descriptor, 2);
}
%typemap(out) void "";