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

[php] Make internal function wrappers static

Browse source
This commit is contained in:
Olly Betts 2022-01-22 13:03:58 +13:00
commit 9b10534879
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/Modules/php.cxx
View file

@ -676,7 +676,7 @@ public:
// This is for the single main zend_function_entry record // This is for the single main zend_function_entry record
ParmList *l = Getattr(n, "parms"); ParmList *l = Getattr(n, "parms");
if (cname && Cmp(Getattr(n, "storage"), "friend") != 0) { if (cname && Cmp(Getattr(n, "storage"), "friend") != 0) {
Printf(f_h, "PHP_METHOD(%s%s,%s);\n", prefix, cname, fname); Printf(f_h, "static PHP_METHOD(%s%s,%s);\n", prefix, cname, fname);
if (wrapperType != staticmemberfn && if (wrapperType != staticmemberfn &&
wrapperType != staticmembervar && wrapperType != staticmembervar &&
!Equal(fname, "__construct")) { !Equal(fname, "__construct")) {
@ -686,9 +686,9 @@ public:
} }
} else { } else {
if (dispatch) { if (dispatch) {
Printf(f_h, "ZEND_NAMED_FUNCTION(%s);\n", fname); Printf(f_h, "static ZEND_NAMED_FUNCTION(%s);\n", fname);
} else { } else {
Printf(f_h, "PHP_FUNCTION(%s);\n", fname); Printf(f_h, "static PHP_FUNCTION(%s);\n", fname);
} }
} }
@ -883,9 +883,9 @@ public:
create_command(class_name, wname, n, true, modes); create_command(class_name, wname, n, true, modes);
if (class_name && Cmp(Getattr(n, "storage"), "friend") != 0) { if (class_name && Cmp(Getattr(n, "storage"), "friend") != 0) {
Printv(f->def, "PHP_METHOD(", prefix, class_name, ",", wname, ") {\n", NIL); Printv(f->def, "static PHP_METHOD(", prefix, class_name, ",", wname, ") {\n", NIL);
} else { } else {
Printv(f->def, "ZEND_NAMED_FUNCTION(", wname, ") {\n", NIL); Printv(f->def, "static ZEND_NAMED_FUNCTION(", wname, ") {\n", NIL);
} }
Wrapper_add_local(f, "argc", "int argc"); Wrapper_add_local(f, "argc", "int argc");
@ -1209,21 +1209,21 @@ public:
if (!overloaded) { if (!overloaded) {
if (!static_getter) { if (!static_getter) {
if (class_name && Cmp(Getattr(n, "storage"), "friend") != 0) { if (class_name && Cmp(Getattr(n, "storage"), "friend") != 0) {
Printv(f->def, "PHP_METHOD(", prefix, class_name, ",", wname, ") {\n", NIL); Printv(f->def, "static PHP_METHOD(", prefix, class_name, ",", wname, ") {\n", NIL);
} else { } else {
if (wrap_nonclass_global) { if (wrap_nonclass_global) {
Printv(f->def, "PHP_METHOD(", fake_class_name(), ",", wname, ") {\n", Printv(f->def, "static PHP_METHOD(", fake_class_name(), ",", wname, ") {\n",
" PHP_FN(", wname, ")(INTERNAL_FUNCTION_PARAM_PASSTHRU);\n", " PHP_FN(", wname, ")(INTERNAL_FUNCTION_PARAM_PASSTHRU);\n",
"}\n\n", NIL); "}\n\n", NIL);
} }
if (wrap_nonclass_fake_class) { if (wrap_nonclass_fake_class) {
Printv(f->def, "PHP_FUNCTION(", wname, ") {\n", NIL); Printv(f->def, "static PHP_FUNCTION(", wname, ") {\n", NIL);
} }
} }
} }
} else { } else {
Printv(f->def, "ZEND_NAMED_FUNCTION(", overloadwname, ") {\n", NIL); Printv(f->def, "static ZEND_NAMED_FUNCTION(", overloadwname, ") {\n", NIL);
} }
emit_parameter_variables(l, f); emit_parameter_variables(l, f);