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

fix static member names, from Olly

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8798 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-02-11 22:01:31 +00:00
commit 68f665df35
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Examples/test-suite/php4/arrays_runme.php4
View file

@ -4,10 +4,8 @@
require "tests.php4"; require "tests.php4";
require "arrays.php"; require "arrays.php";
// No new functions check::functions(array(fn_taking_arrays,newintpointer,setintfrompointer,getintfrompointer,array_pointer_func));
check::functions(array(fn_taking_arrays,newintpointer,setintfrompointer,getintfrompointer)); check::classes(array(simplestruct,arraystruct,cartposedata_t));
// No new classes
check::classes(array(simplestruct,arraystruct));
// now new vars // now new vars
check::globals(array()); check::globals(array());

19
Source/Modules/php4.cxx
View file

@ -1750,7 +1750,7 @@ public:
if ( SwigType_isconst(type) ) if ( SwigType_isconst(type) )
return SWIG_OK; return SWIG_OK;
// This duplicates the logic from Langauge::variableWrapper() to test if the set wrapper // This duplicates the logic from Language::variableWrapper() to test if the set wrapper
// is made. // is made.
int assignable = is_assignable(n); int assignable = is_assignable(n);
if (assignable) { if (assignable) {
@ -1760,13 +1760,14 @@ public:
} }
} }
create_command( iname, Swig_name_wrapper(iname) ); String *class_iname = Swig_name_member(class_name,iname);
create_command( iname, Swig_name_wrapper(class_iname) );
Wrapper *f = NewWrapper(); Wrapper *f = NewWrapper();
Printv(f->def, "ZEND_NAMED_FUNCTION(",Swig_name_wrapper(iname), ") {\n", NIL ); Printv(f->def, "ZEND_NAMED_FUNCTION(",Swig_name_wrapper(class_iname), ") {\n", NIL );
String *mget = Swig_name_wrapper(Swig_name_get( Swig_name_member(class_name,iname))); String *mget = Swig_name_wrapper(Swig_name_get(class_iname));
String *mset = Swig_name_wrapper(Swig_name_set( Swig_name_member(class_name,iname))); String *mset = Swig_name_wrapper(Swig_name_set(class_iname));
if ( assignable ) { if ( assignable ) {
Printf(f->code, "if (ZEND_NUM_ARGS() > 0 ) {\n" ); Printf(f->code, "if (ZEND_NUM_ARGS() > 0 ) {\n" );
@ -1782,6 +1783,10 @@ public:
Wrapper_print(f, s_wrappers); Wrapper_print(f, s_wrappers);
Delete(class_iname);
Delete(mget);
Delete(mset);
return SWIG_OK; return SWIG_OK;
} }
@ -1896,6 +1901,7 @@ public:
Printf(f->def, "}\n\n"); Printf(f->def, "}\n\n");
Wrapper_print(f,s_wrappers); Wrapper_print(f,s_wrappers);
DelWrapper(f); DelWrapper(f);
Delete(wname);
} }
return SWIG_OK; return SWIG_OK;
} }
@ -1919,6 +1925,7 @@ public:
if(shadow) { if(shadow) {
String *wname = NewStringf( "_wrap_new_%s", iname ); String *wname = NewStringf( "_wrap_new_%s", iname );
create_command( iname, wname ); create_command( iname, wname );
Delete(wname);
} }
native_constructor = 0; native_constructor = 0;
@ -1926,7 +1933,7 @@ public:
} }
/* ------------------------------------------------------------ /* ------------------------------------------------------------
* constructorHandler() * CreateZendListDestructor()
* ------------------------------------------------------------ */ * ------------------------------------------------------------ */
//virtual int destructorHandler(Node *n) { //virtual int destructorHandler(Node *n) {
//} //}