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

Fix -prefix to prefix PHP class names

Browse source
This commit is contained in:
Olly Betts 2021-04-20 18:23:23 +12:00
commit f1aaeeea1c
3 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Examples/test-suite/php/Makefile.in
View file

@ -15,6 +15,7 @@ CPP_TEST_CASES += \
php_iterator \ php_iterator \
php_namewarn_rename \ php_namewarn_rename \
php_pragma \ php_pragma \
prefix \
include $(srcdir)/../common.mk include $(srcdir)/../common.mk

4
Examples/test-suite/php/prefix_runme.php
View file

@ -3,8 +3,8 @@
require "tests.php"; require "tests.php";
require "prefix.php"; require "prefix.php";
// New functions // No new functions
check::functions(array('foo_get_self')); check::functions(array());
// New classes // New classes
check::classes(array('ProjectFoo')); check::classes(array('ProjectFoo'));
// No new vars // No new vars

30
Source/Modules/php.cxx
View file

@ -637,7 +637,7 @@ public:
// This is for the single main zend_function_entry record // This is for the single main zend_function_entry record
bool has_this = false; bool has_this = false;
if (cname && Cmp(Getattr(n, "storage"), "friend") != 0) { if (cname && Cmp(Getattr(n, "storage"), "friend") != 0) {
Printf(f_h, "PHP_METHOD(%s,%s);\n", cname, fname); Printf(f_h, "PHP_METHOD(%s%s,%s);\n", prefix, cname, fname);
has_this = (wrapperType != staticmemberfn) && has_this = (wrapperType != staticmemberfn) &&
(wrapperType != staticmembervar) && (wrapperType != staticmembervar) &&
(Cmp(fname, "__construct") != 0); (Cmp(fname, "__construct") != 0);
@ -728,7 +728,7 @@ public:
String * s = cs_entry; String * s = cs_entry;
if (!s) s = s_entry; if (!s) s = s_entry;
if (cname && Cmp(Getattr(n, "storage"), "friend") != 0) { if (cname && Cmp(Getattr(n, "storage"), "friend") != 0) {
Printf(all_cs_entry, " PHP_ME(%s,%s,swig_arginfo_%s,%s)\n", cname, fname, arginfo_code, modes); Printf(all_cs_entry, " PHP_ME(%s%s,%s,swig_arginfo_%s,%s)\n", prefix, cname, fname, arginfo_code, modes);
} else { } else {
if (overload) { if (overload) {
if (wrap_nonclass_global) { if (wrap_nonclass_global) {
@ -799,7 +799,7 @@ 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(", class_name, ",", wname, ") {\n", NIL); Printv(f->def, "PHP_METHOD(", prefix, class_name, ",", wname, ") {\n", NIL);
} else { } else {
Printv(f->def, "ZEND_NAMED_FUNCTION(", wname, ") {\n", NIL); Printv(f->def, "ZEND_NAMED_FUNCTION(", wname, ") {\n", NIL);
} }
@ -902,9 +902,9 @@ public:
Wrapper *f = NewWrapper(); Wrapper *f = NewWrapper();
Printf(f_h, "PHP_METHOD(%s,__set);\n", class_name); Printf(f_h, "PHP_METHOD(%s%s,__set);\n", prefix, class_name);
Printf(all_cs_entry, " PHP_ME(%s,__set,swig_arginfo_2,ZEND_ACC_PUBLIC)\n", class_name); Printf(all_cs_entry, " PHP_ME(%s%s,__set,swig_arginfo_2,ZEND_ACC_PUBLIC)\n", prefix, class_name);
Printf(f->code, "PHP_METHOD(%s,__set) {\n",class_name); Printf(f->code, "PHP_METHOD(%s%s,__set) {\n", prefix, class_name);
Printf(f->code, " swig_object_wrapper *arg = SWIG_Z_FETCH_OBJ_P(ZEND_THIS);\n"); Printf(f->code, " swig_object_wrapper *arg = SWIG_Z_FETCH_OBJ_P(ZEND_THIS);\n");
Printf(f->code, " zval args[2];\n zval tempZval;\n zend_string *arg2 = 0;\n\n"); Printf(f->code, " zval args[2];\n zval tempZval;\n zend_string *arg2 = 0;\n\n");
@ -936,9 +936,9 @@ public:
Printf(f->code, "}\n\n\n"); Printf(f->code, "}\n\n\n");
Printf(f_h, "PHP_METHOD(%s,__get);\n", class_name); Printf(f_h, "PHP_METHOD(%s%s,__get);\n", prefix, class_name);
Printf(all_cs_entry, " PHP_ME(%s,__get,swig_arginfo_1,ZEND_ACC_PUBLIC)\n", class_name); Printf(all_cs_entry, " PHP_ME(%s%s,__get,swig_arginfo_1,ZEND_ACC_PUBLIC)\n", prefix, class_name);
Printf(f->code, "PHP_METHOD(%s,__get) {\n",class_name); Printf(f->code, "PHP_METHOD(%s%s,__get) {\n",prefix, class_name);
Printf(f->code, " swig_object_wrapper *arg = SWIG_Z_FETCH_OBJ_P(ZEND_THIS);\n", class_name); Printf(f->code, " swig_object_wrapper *arg = SWIG_Z_FETCH_OBJ_P(ZEND_THIS);\n", class_name);
Printf(f->code, " zval args[1];\n zval tempZval;\n zend_string *arg2 = 0;\n\n"); Printf(f->code, " zval args[1];\n zval tempZval;\n zend_string *arg2 = 0;\n\n");
@ -971,9 +971,9 @@ public:
Printf(f->code, "}\n\n\n"); Printf(f->code, "}\n\n\n");
Printf(f_h, "PHP_METHOD(%s,__isset);\n", class_name); Printf(f_h, "PHP_METHOD(%s%s,__isset);\n", prefix, class_name);
Printf(all_cs_entry, " PHP_ME(%s,__isset,swig_arginfo_1,ZEND_ACC_PUBLIC)\n", class_name); Printf(all_cs_entry, " PHP_ME(%s%s,__isset,swig_arginfo_1,ZEND_ACC_PUBLIC)\n", prefix, class_name);
Printf(f->code, "PHP_METHOD(%s,__isset) {\n",class_name); Printf(f->code, "PHP_METHOD(%s%s,__isset) {\n",prefix, class_name);
Printf(f->code, " swig_object_wrapper *arg = SWIG_Z_FETCH_OBJ_P(ZEND_THIS);\n", class_name); Printf(f->code, " swig_object_wrapper *arg = SWIG_Z_FETCH_OBJ_P(ZEND_THIS);\n", class_name);
Printf(f->code, " zval args[1];\n zval tempZval;\n zend_string *arg2 = 0;\n\n"); Printf(f->code, " zval args[1];\n zval tempZval;\n zend_string *arg2 = 0;\n\n");
@ -1161,7 +1161,7 @@ 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(", class_name, ",", wname, ") {\n", NIL); Printv(f->def, "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, "PHP_METHOD(", fake_class_name(), ",", wname, ") {\n",
@ -1176,7 +1176,7 @@ public:
} }
} else { } else {
if (class_name && Cmp(Getattr(n, "storage"), "friend") != 0) { if (class_name && Cmp(Getattr(n, "storage"), "friend") != 0) {
Printv(f->def, "PHP_METHOD(", class_name, ",", overloadwname, ") {\n", NIL); Printv(f->def, "PHP_METHOD(", prefix, class_name, ",", overloadwname, ") {\n", NIL);
} else { } else {
Printv(f->def, "ZEND_NAMED_FUNCTION(", overloadwname, ") {\n", NIL); Printv(f->def, "ZEND_NAMED_FUNCTION(", overloadwname, ") {\n", NIL);
} }
@ -1574,7 +1574,7 @@ public:
//if (nameSpace != NULL) //if (nameSpace != NULL)
//Printf(s_oinit, "INIT_CLASS_ENTRY(%s_internal_ce, \"%s\\\\%s\", class_%s_functions);\n", class_name, nameSpace ,class_name, class_name); //Printf(s_oinit, "INIT_CLASS_ENTRY(%s_internal_ce, \"%s\\\\%s\", class_%s_functions);\n", class_name, nameSpace ,class_name, class_name);
//else //else
Printf(s_oinit, " INIT_CLASS_ENTRY(SWIGTYPE_%s_internal_ce, \"%s\", class_%s_functions);\n", class_name, class_name, class_name); Printf(s_oinit, " INIT_CLASS_ENTRY(SWIGTYPE_%s_internal_ce, \"%s%s\", class_%s_functions);\n", class_name, prefix, class_name, class_name);
if (shadow) { if (shadow) {
char *rename = GetChar(n, "sym:name"); char *rename = GetChar(n, "sym:name");