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

Eliminate irrelevant formatting differences from master

Browse source
This commit is contained in:
Olly Betts 2021-03-24 11:59:25 +13:00
commit 786efd0ae0
2 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/php/phprun.swg
View file

@ -299,4 +299,3 @@ static swig_module_info *SWIG_Php_GetModule() {
static void SWIG_Php_SetModule(swig_module_info *pointer) { static void SWIG_Php_SetModule(swig_module_info *pointer) {
REGISTER_MAIN_LONG_CONSTANT(const_name, (long) pointer, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT(const_name, (long) pointer, CONST_PERSISTENT | CONST_CS);
} }

15
Source/Modules/php.cxx
View file

@ -205,14 +205,12 @@ static void SwigPHP_emit_resource_registrations() {
Iterator ki; Iterator ki;
bool emitted_default_dtor = false; bool emitted_default_dtor = false;
if (!zend_types) { if (!zend_types)
return; return;
}
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;
@ -223,9 +221,8 @@ static void SwigPHP_emit_resource_registrations() {
if (class_node != NOTCLASS) { if (class_node != NOTCLASS) {
String *destructor = Getattr(class_node, "destructor"); String *destructor = Getattr(class_node, "destructor");
human_name = Getattr(class_node, "sym:name"); human_name = Getattr(class_node, "sym:name");
if (!human_name) { if (!human_name)
human_name = Getattr(class_node, "name"); human_name = Getattr(class_node, "name");
}
// Do we have a known destructor for this type? // Do we have a known destructor for this type?
if (destructor) { if (destructor) {
rsrc_dtor_name = NewStringf("_wrap_destroy%s", key); rsrc_dtor_name = NewStringf("_wrap_destroy%s", key);
@ -1779,9 +1776,8 @@ public:
if (overloaded && Getattr(n, "sym:nextSibling") != 0) if (overloaded && Getattr(n, "sym:nextSibling") != 0)
return SWIG_OK; return SWIG_OK;
if (!s_oowrappers) { if (!s_oowrappers)
s_oowrappers = NewStringEmpty(); s_oowrappers = NewStringEmpty();
}
if (newobject || wrapperType == memberfn || wrapperType == staticmemberfn || wrapperType == standard || wrapperType == staticmembervar) { if (newobject || wrapperType == memberfn || wrapperType == staticmemberfn || wrapperType == standard || wrapperType == staticmembervar) {
bool handle_as_overload = false; bool handle_as_overload = false;
@ -2739,6 +2735,7 @@ done:
String *symname = Getattr(n, "sym:name"); String *symname = Getattr(n, "sym:name");
Setattr(n, "php:proxy", symname); Setattr(n, "php:proxy", symname);
} }
return Language::classDeclaration(n); return Language::classDeclaration(n);
} }
@ -3141,6 +3138,7 @@ done:
} }
Language::constructorHandler(n); Language::constructorHandler(n);
wrapperType = standard; wrapperType = standard;
return SWIG_OK; return SWIG_OK;
} }
@ -3164,7 +3162,6 @@ done:
Setattr(classnode, "destructor", destructorname); Setattr(classnode, "destructor", destructorname);
Wrapper *f = NewWrapper(); Wrapper *f = NewWrapper();
Printf(f->def, "/* This function is designed to be called by the zend list destructors */\n"); Printf(f->def, "/* This function is designed to be called by the zend list destructors */\n");
Printf(f->def, "/* to typecast and do the actual destruction */\n"); Printf(f->def, "/* to typecast and do the actual destruction */\n");
Printf(f->def, "static void %s(zend_resource *res, const char *type_name) {\n", destructorname); Printf(f->def, "static void %s(zend_resource *res, const char *type_name) {\n", destructorname);