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

Eliminate CALL_METHOD and CALL_METHOD_PARAM_1 macros

Browse source 
These names lack a "SWIG_" prefix to help prevent collisions with code
being wrapped, but they're each only used in one place so just inline
them there.
This commit is contained in:
Olly Betts 2021-04-13 14:42:33 +12:00
commit 623dd7a394
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/Modules/php.cxx
View file

@ -435,12 +435,6 @@ public:
Printf(s_header, "#ifdef __cplusplus\n#define SWIG_remove(zv) delete zv\n"); Printf(s_header, "#ifdef __cplusplus\n#define SWIG_remove(zv) delete zv\n");
Printf(s_header, "#else\n#define SWIG_remove(zv) free(zv)\n#endif\n\n"); Printf(s_header, "#else\n#define SWIG_remove(zv) free(zv)\n#endif\n\n");
Printf(s_header, "#define CALL_METHOD(name, retval, thisptr) \
call_user_function(EG(function_table),thisptr,&name,retval,0,NULL);\n\n");
Printf(s_header, "#define CALL_METHOD_PARAM_1(name, retval, thisptr, param) \
call_user_function(EG(function_table),thisptr,&name,retval,1,&param);\n\n");
if (directorsEnabled()) { if (directorsEnabled()) {
// Insert director runtime // Insert director runtime
Swig_insert_file("director_common.swg", s_header); Swig_insert_file("director_common.swg", s_header);
@ -1083,12 +1077,11 @@ public:
Printf(magic_set, "\nelse if (strcmp(ZSTR_VAL(arg2),\"%s\") == 0) {\n",v_name); Printf(magic_set, "\nelse if (strcmp(ZSTR_VAL(arg2),\"%s\") == 0) {\n",v_name);
Printf(magic_set, "ZVAL_STRING(&tempZval, \"%s_set\");\n",v_name); Printf(magic_set, "ZVAL_STRING(&tempZval, \"%s_set\");\n",v_name);
Printf(magic_set, "CALL_METHOD_PARAM_1(tempZval, return_value, ZEND_THIS, args[1]);\n}\n\n"); Printf(magic_set, "call_user_function(EG(function_table),ZEND_THIS,&tempZval,return_value,1,&args[1]);\n}\n");
Printf(magic_get, "\nelse if (strcmp(ZSTR_VAL(arg2),\"%s\") == 0) {\n",v_name); Printf(magic_get, "\nelse if (strcmp(ZSTR_VAL(arg2),\"%s\") == 0) {\n",v_name);
Printf(magic_get, "ZVAL_STRING(&tempZval, \"%s_get\");\n",v_name); Printf(magic_get, "ZVAL_STRING(&tempZval, \"%s_get\");\n",v_name);
Printf(magic_get, "CALL_METHOD(tempZval, return_value, ZEND_THIS);\n}\n"); Printf(magic_get, "call_user_function(EG(function_table),ZEND_THIS,&tempZval,return_value,0,NULL);\n}\n");
} }
String *getAccessMode(String *access) { String *getAccessMode(String *access) {