[php] Add typemaps for handling parameters of type std::string &

which are modified by the wrapped function.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9941 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2007-09-18 03:08:06 +00:00
commit 83e0e787b7
2 changed files with 20 additions and 4 deletions

View file

@ -1,6 +1,10 @@
Version 1.3.32 (in progress) Version 1.3.32 (in progress)
============================ ============================
09/18/2007: olly
[php] Add typemaps for handling parameters of type std::string &
which are modified by the wrapped function.
09/17/2007: olly 09/17/2007: olly
[python] Split potentially long string literals to avoid hitting [python] Split potentially long string literals to avoid hitting
MSVC's low fixed limit on string literal length - patch from MSVC's low fixed limit on string literal length - patch from

View file

@ -32,7 +32,7 @@ namespace std {
%typemap(in) string { %typemap(in) string {
convert_to_string_ex($input); convert_to_string_ex($input);
$1.assign(Z_STRVAL_PP($input),Z_STRLEN_PP($input)); $1.assign(Z_STRVAL_PP($input), Z_STRLEN_PP($input));
} }
%typemap(typecheck,precedence=SWIG_TYPECHECK_STRING) const string& { %typemap(typecheck,precedence=SWIG_TYPECHECK_STRING) const string& {
@ -41,16 +41,16 @@ namespace std {
%typemap(in) const string & (std::string temp) { %typemap(in) const string & (std::string temp) {
convert_to_string_ex($input); convert_to_string_ex($input);
temp.assign(Z_STRVAL_PP($input),Z_STRLEN_PP($input)); temp.assign(Z_STRVAL_PP($input), Z_STRLEN_PP($input));
$1 = &temp; $1 = &temp;
} }
%typemap(out) string { %typemap(out) string {
ZVAL_STRINGL($result,const_cast<char*>($1.data()),$1.length(),1); ZVAL_STRINGL($result, const_cast<char*>($1.data()), $1.size(), 1);
} }
%typemap(out) const string & { %typemap(out) const string & {
ZVAL_STRINGL($result,const_cast<char*>($1->data()),$1->length(),1); ZVAL_STRINGL($result, const_cast<char*>($1->data()), $1->size(), 1);
} }
%typemap(throws) string %{ %typemap(throws) string %{
@ -60,4 +60,16 @@ namespace std {
%typemap(throws) const string& %{ %typemap(throws) const string& %{
SWIG_PHP_Error(E_ERROR, (char *)$1.c_str()); SWIG_PHP_Error(E_ERROR, (char *)$1.c_str());
%} %}
/* These next two handle a function which takes a non-const reference to
* a std::string and modifies the string. */
%typemap(in) string & (std::string temp) {
convert_to_string_ex($input);
temp.assign(Z_STRVAL_PP($input), Z_STRLEN_PP($input));
$1 = &temp;
}
%typemap(argout) string & {
ZVAL_STRINGL(*($input), const_cast<char*>($1->data()), $1->size(), 1);
}
} }