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

[php] Whitespace improvements in generated C/C++ code

Browse source
This commit is contained in:
Olly Betts 2019-02-12 10:14:25 +13:00
commit 950473d77e
3 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/php/globalvar.i
View file

@ -136,7 +136,7 @@
%typemap(varin) SWIGTYPE [] %typemap(varin) SWIGTYPE []
{ {
if($1) { if ($1) {
zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1); zval *z_var = zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1);
SWIG_SetPointerZval(z_var, (void*)$1, $1_descriptor, $owner); SWIG_SetPointerZval(z_var, (void*)$1, $1_descriptor, $owner);
} }
@ -144,15 +144,15 @@
%typemap(varin) char [ANY] %typemap(varin) char [ANY]
{ {
zval **z_var; zval **z_var;
char *s1; char *s1;
zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1, (void**)&z_var); zend_hash_str_find(&EG(symbol_table), "$1", sizeof("$1") - 1, (void**)&z_var);
s1 = Z_STRVAL_P(z_var); s1 = Z_STRVAL_P(z_var);
if ((s1 == NULL) || ($1 == NULL) || strcmp(s1, $1)) { if ((s1 == NULL) || ($1 == NULL) || strcmp(s1, $1)) {
if (s1) if (s1)
strncpy($1, s1, $1_dim0); strncpy($1, s1, $1_dim0);
} }
} }
%typemap(varin) SWIGTYPE %typemap(varin) SWIGTYPE
@ -166,7 +166,6 @@
} }
$1 = *($&1_ltype)_temp; $1 = *($&1_ltype)_temp;
} }
%typemap(varin) SWIGTYPE *, SWIGTYPE &, SWIGTYPE && %typemap(varin) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&
@ -245,7 +244,7 @@
(z_var)->value.str.val = 0; (z_var)->value.str.val = 0;
(z_var)->value.str.len = 0; (z_var)->value.str.len = 0;
} }
} }
} }
%typemap(varout) SWIGTYPE %typemap(varout) SWIGTYPE

6
Lib/php/phpinit.swg
View file

@ -1,13 +1,13 @@
/* ------------------------------------------------------------ /* ------------------------------------------------------------
* The start of the PHP initialization function * The start of the PHP initialization function
* ------------------------------------------------------------ */ * ------------------------------------------------------------ */
%insert(init) "swiginit.swg" %insert(init) "swiginit.swg"
%init %{ %init %{
SWIG_php_minit { SWIG_php_minit {
SWIG_InitializeModule((void*)&module_number); SWIG_InitializeModule((void*)&module_number);
%} %}
%fragment("swig_php_init_member_ptr2", "header") %{ %fragment("swig_php_init_member_ptr2", "header") %{
@ -21,5 +21,5 @@ static int swig_member_ptr = 0;
%} %}
%fragment("swig_php_init_member_ptr", "init", fragment="swig_php_init_member_ptr2") %{ %fragment("swig_php_init_member_ptr", "init", fragment="swig_php_init_member_ptr2") %{
swig_member_ptr = zend_register_list_destructors_ex(swig_member_ptr_dtor, NULL, SWIG_MEMBER_PTR, module_number); swig_member_ptr = zend_register_list_destructors_ex(swig_member_ptr_dtor, NULL, SWIG_MEMBER_PTR, module_number);
%} %}

28
Source/Modules/php.cxx
View file

@ -142,7 +142,7 @@ static void SwigPHP_emit_resource_registrations() {
ki = First(zend_types); ki = First(zend_types);
if (ki.key) if (ki.key)
Printf(s_oinit, "\n/* Register resource destructors for pointer types */\n"); Printf(s_oinit, "\n /* Register resource destructors for pointer types */\n");
while (ki.key) { while (ki.key) {
DOH *key = ki.key; DOH *key = ki.key;
Node *class_node = ki.item; Node *class_node = ki.item;
@ -180,11 +180,11 @@ static void SwigPHP_emit_resource_registrations() {
Printf(s_vdecl, "static int le_swig_%s=0; /* handle for %s */\n", key, human_name); Printf(s_vdecl, "static int le_swig_%s=0; /* handle for %s */\n", key, human_name);
// register with php // register with php
Printf(s_oinit, "le_swig_%s=zend_register_list_destructors_ex" Printf(s_oinit, " le_swig_%s=zend_register_list_destructors_ex"
"(%s, NULL, SWIGTYPE%s->name, module_number);\n", key, rsrc_dtor_name, key); "(%s, NULL, SWIGTYPE%s->name, module_number);\n", key, rsrc_dtor_name, key);
// store php type in class struct // store php type in class struct
Printf(s_oinit, "SWIG_TypeClientData(SWIGTYPE%s,&le_swig_%s);\n", key, key); Printf(s_oinit, " SWIG_TypeClientData(SWIGTYPE%s,&le_swig_%s);\n", key, key);
Delete(rsrc_dtor_name); Delete(rsrc_dtor_name);
@ -272,8 +272,8 @@ public:
/* subsections of the init section */ /* subsections of the init section */
s_vinit = NewStringEmpty(); s_vinit = NewStringEmpty();
s_vdecl = NewString("/* vdecl subsection */\n"); s_vdecl = NewString("/* vdecl subsection */\n");
s_cinit = NewString("/* cinit subsection */\n"); s_cinit = NewString(" /* cinit subsection */\n");
s_oinit = NewString("/* oinit subsection */\n"); s_oinit = NewString(" /* oinit subsection */\n");
pragma_phpinfo = NewStringEmpty(); pragma_phpinfo = NewStringEmpty();
s_phpclasses = NewString("/* PHP Proxy Classes */\n"); s_phpclasses = NewString("/* PHP Proxy Classes */\n");
f_directors_h = NewStringEmpty(); f_directors_h = NewStringEmpty();
@ -364,7 +364,7 @@ public:
/* Initialize the rest of the module */ /* Initialize the rest of the module */
Printf(s_oinit, "ZEND_INIT_MODULE_GLOBALS(%s, %s_init_globals, NULL);\n", module, module); Printf(s_oinit, " ZEND_INIT_MODULE_GLOBALS(%s, %s_init_globals, NULL);\n", module, module);
/* start the header section */ /* start the header section */
Printf(s_header, "ZEND_BEGIN_MODULE_GLOBALS(%s)\n", module); Printf(s_header, "ZEND_BEGIN_MODULE_GLOBALS(%s)\n", module);
@ -549,17 +549,17 @@ public:
// Printv(s_init,s_resourcetypes,NIL); // Printv(s_init,s_resourcetypes,NIL);
/* We need this after all classes written out by ::top */ /* We need this after all classes written out by ::top */
Printf(s_oinit, "CG(active_class_entry) = NULL;\n"); Printf(s_oinit, " CG(active_class_entry) = NULL;\n");
Printf(s_oinit, "/* end oinit subsection */\n"); Printf(s_oinit, " /* end oinit subsection */\n");
Printf(s_init, "%s\n", s_oinit); Printf(s_init, "%s\n", s_oinit);
/* Constants generated during top call */ /* Constants generated during top call */
Printf(s_cinit, "/* end cinit subsection */\n"); Printf(s_cinit, " /* end cinit subsection */\n");
Printf(s_init, "%s\n", s_cinit); Printf(s_init, "%s\n", s_cinit);
Clear(s_cinit); Clear(s_cinit);
Delete(s_cinit); Delete(s_cinit);
Printf(s_init, " return SUCCESS;\n"); Printf(s_init, " return SUCCESS;\n");
Printf(s_init, "}\n\n"); Printf(s_init, "}\n\n");
// Now do REQUEST init which holds any user specified %rinit, and also vinit // Now do REQUEST init which holds any user specified %rinit, and also vinit
@ -577,15 +577,15 @@ public:
if (Len(s_vinit) > 0) { if (Len(s_vinit) > 0) {
/* finish our init section which will have been used by class wrappers */ /* finish our init section which will have been used by class wrappers */
Printv(s_init, Printv(s_init,
"/* vinit subsection */\n", " /* vinit subsection */\n",
s_vinit, "\n" s_vinit, "\n"
"/* end vinit subsection */\n", " /* end vinit subsection */\n",
NIL); NIL);
Clear(s_vinit); Clear(s_vinit);
} }
Delete(s_vinit); Delete(s_vinit);
Printf(s_init, " return SUCCESS;\n"); Printf(s_init, " return SUCCESS;\n");
Printf(s_init, "}\n\n"); Printf(s_init, "}\n\n");
} }
@ -598,7 +598,7 @@ public:
"/* shutdown section */\n" "/* shutdown section */\n"
"{\n", "{\n",
s_shutdown, s_shutdown,
" return SUCCESS;\n" " return SUCCESS;\n"
"}\n\n", NIL); "}\n\n", NIL);
} }