Menu
▾
▴
[Swig-cvs] SF.net SVN: swig: [9980] trunk/Lib/php4
|
From: <ol...@us...> - 2007-10-11 03:32:33
|
Revision: 9980
http://swig.svn.sourceforge.net/swig/?rev=9980&view=rev
Author: olly
Date: 2007-10-10 20:32:30 -0700 (Wed, 10 Oct 2007)
Log Message:
-----------
Adjust brackets on typemaps to eliminate superfluous {} blocks in generated
C/C++ wrapper code.
Modified Paths:
--------------
trunk/Lib/php4/phppointers.i
trunk/Lib/php4/std_string.i
trunk/Lib/php4/typemaps.i
trunk/Lib/php4/utils.i
Modified: trunk/Lib/php4/phppointers.i
===================================================================
--- trunk/Lib/php4/phppointers.i 2007-10-10 14:35:44 UTC (rev 9979)
+++ trunk/Lib/php4/phppointers.i 2007-10-11 03:32:30 UTC (rev 9980)
@@ -1,22 +1,21 @@
%define %pass_by_ref( TYPE, CONVERT_IN, CONVERT_OUT )
%typemap(in) TYPE *REF ($*1_ltype tmp),
TYPE &REF ($*1_ltype tmp)
-{
+%{
/* First Check for SWIG wrapped type */
if ( ZVAL_IS_NULL( *$input ) ) {
$1 = 0;
} else if ( PZVAL_IS_REF( *$input ) ) {
/* Not swig wrapped type, so we check if it's a PHP reference type */
- CONVERT_IN( tmp, $*1_ltype, $input );
+ CONVERT_IN( tmp, $*1_ltype, $input );
$1 = &tmp;
} else {
- SWIG_PHP_Error( E_ERROR, SWIG_PHP_Arg_Error_Msg($argnum, Expected a reference) );
+ SWIG_PHP_Error( E_ERROR, SWIG_PHP_Arg_Error_Msg($argnum, Expected a reference) );
}
-}
+%}
%typemap(argout) TYPE *REF,
- TYPE &REF {
- CONVERT_OUT(*$input, tmp$argnum );
-}
+ TYPE &REF
+ "CONVERT_OUT(*$input, tmp$argnum );";
%enddef
%pass_by_ref( size_t, CONVERT_INT_IN, ZVAL_LONG );
Modified: trunk/Lib/php4/std_string.i
===================================================================
--- trunk/Lib/php4/std_string.i 2007-10-10 14:35:44 UTC (rev 9979)
+++ trunk/Lib/php4/std_string.i 2007-10-11 03:32:30 UTC (rev 9980)
@@ -26,26 +26,26 @@
class string;
- %typemap(typecheck,precedence=SWIG_TYPECHECK_STRING) string {
+ %typemap(typecheck,precedence=SWIG_TYPECHECK_STRING) string %{
$1 = ( Z_TYPE_PP($input) == IS_STRING ) ? 1 : 0;
- }
+ %}
- %typemap(in) string {
+ %typemap(in) string %{
convert_to_string_ex($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& %{
$1 = ( Z_TYPE_PP($input) == IS_STRING ) ? 1 : 0;
- }
+ %}
- %typemap(out) string {
+ %typemap(out) string %{
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->size(), 1);
- }
+ %}
%typemap(throws) string %{
SWIG_PHP_Error(E_ERROR, (char *)$1.c_str());
@@ -57,15 +57,17 @@
/* 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) {
+ %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 & {
+ %typemap(argout) string & %{
ZVAL_STRINGL(*($input), const_cast<char*>($1->data()), $1->size(), 1);
- }
+ %}
- %typemap(argout) const string & { }
+ /* SWIG will apply the non-const typemap above to const string& without
+ * this more specific typemap. */
+ %typemap(argout) const string & "";
}
Modified: trunk/Lib/php4/typemaps.i
===================================================================
--- trunk/Lib/php4/typemaps.i 2007-10-10 14:35:44 UTC (rev 9979)
+++ trunk/Lib/php4/typemaps.i 2007-10-11 03:32:30 UTC (rev 9980)
@@ -29,16 +29,13 @@
%define double_typemap(TYPE)
%typemap(in) TYPE *INPUT(TYPE temp)
-{
+%{
convert_to_double_ex($input);
temp = (TYPE) Z_DVAL_PP($input);
$1 = &temp;
-}
+%}
%typemap(argout) TYPE *INPUT "";
-%typemap(in,numinputs=0) TYPE *OUTPUT(TYPE temp)
-{
- $1 = &temp;
-}
+%typemap(in,numinputs=0) TYPE *OUTPUT(TYPE temp) "$1 = &temp;";
%typemap(argout,fragment="t_output_helper") TYPE *OUTPUT
{
zval *o;
@@ -47,30 +44,27 @@
t_output_helper( &$result, o );
}
%typemap(in) TYPE *REFERENCE (TYPE dvalue)
-{
+%{
convert_to_double_ex($input);
dvalue = (TYPE) (*$input)->value.dval;
$1 = &dvalue;
-}
+%}
%typemap(argout) TYPE *REFERENCE
-{
+%{
$1->value.dval = (double)(lvalue$argnum);
$1->type = IS_DOUBLE;
-}
+%}
%enddef
%define int_typemap(TYPE)
%typemap(in) TYPE *INPUT(TYPE temp)
-{
+%{
convert_to_long_ex($input);
temp = (TYPE) Z_LVAL_PP($input);
$1 = &temp;
-}
+%}
%typemap(argout) TYPE *INPUT "";
-%typemap(in,numinputs=0) TYPE *OUTPUT(TYPE temp)
-{
- $1 = &temp;
-}
+%typemap(in,numinputs=0) TYPE *OUTPUT(TYPE temp) "$1 = &temp;";
%typemap(argout,fragment="t_output_helper") TYPE *OUTPUT
{
zval *o;
@@ -79,17 +73,16 @@
t_output_helper( &$result, o );
}
%typemap(in) TYPE *REFERENCE (TYPE lvalue)
-{
+%{
convert_to_long_ex($input);
lvalue = (TYPE) (*$input)->value.lval;
$1 = &lvalue;
-}
-%typemap(argout) TYPE *REFERENCE
-{
-
+%}
+%typemap(argout) TYPE *REFERENCE
+%{
(*$arg)->value.lval = (long)(lvalue$argnum);
(*$arg)->type = IS_LONG;
-}
+%}
%enddef
double_typemap(float);
@@ -125,16 +118,13 @@
%typemap(argout) unsigned char *INOUT = unsigned char *OUTPUT;
%typemap(in) char INPUT[ANY] ( char temp[$1_dim0] )
-{
+%{
convert_to_string_ex($input);
- char *val = Z_LVAL_PP($input);
- strncpy(temp,val,$1_dim0);
+ strncpy(temp,Z_LVAL_PP($input),$1_dim0);
$1 = temp;
-}
+%}
%typemap(in,numinputs=0) char OUTPUT[ANY] ( char temp[$1_dim0] )
-{
- $1 = temp;
-}
+ "$1 = temp;";
%typemap(argout) char OUTPUT[ANY]
{
zval *o;
@@ -145,7 +135,7 @@
%typemap(in,numinputs=0) void **OUTPUT (int force),
void *&OUTPUT (int force)
-{
+%{
/* If they pass NULL by reference, make it into a void*
This bit should go in arginit if arginit support init-ing scripting args */
if(SWIG_ConvertPtr(*$input, (void **) &$1, $1_descriptor, 0) < 0) {
@@ -166,16 +156,16 @@
/* have to passback arg$arg too */
force=1;
}
-}
+%}
%typemap(argout) void **OUTPUT,
void *&OUTPUT
-{
+%{
if (force$argnum) { /* pass back arg$argnum through params ($arg) if we can */
- if(! PZVAL_IS_REF(*$arg)) {
+ if (!PZVAL_IS_REF(*$arg)) {
SWIG_PHP_Error(E_WARNING, "Parameter $argnum of $symname wasn't passed by reference");
} else {
SWIG_SetPointerZval(*$arg, (void *) ptr$argnum, $*1_descriptor, 1);
}
}
-}
+%}
Modified: trunk/Lib/php4/utils.i
===================================================================
--- trunk/Lib/php4/utils.i 2007-10-10 14:35:44 UTC (rev 9979)
+++ trunk/Lib/php4/utils.i 2007-10-11 03:32:30 UTC (rev 9980)
@@ -30,9 +30,9 @@
%define %pass_by_val( TYPE, CONVERT_IN )
%typemap(in) TYPE
-{
+%{
CONVERT_IN($1,$1_ltype,$input);
-}
+%}
%enddef
%fragment("t_output_helper","header") %{
@@ -56,4 +56,4 @@
add_next_index_zval( *target, o);
}
-%}
\ No newline at end of file
+%}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|