From 8dadbcc7446430c35cb5119ab17295e990486bf7 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Wed, 12 May 2021 15:05:09 +1200 Subject: [PATCH] [php] Simplify naming of overloaded method wrappers The underlying wrapper function is now always named using ZEND_NAMED_FUNCTION even if it's a method (in PHP a function and a method only differ in how they're used). --- Source/Modules/php.cxx | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 6914386f8..ab7aaf375 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -1193,11 +1193,7 @@ public: } } } else { - if (class_name && Cmp(Getattr(n, "storage"), "friend") != 0) { - Printv(f->def, "PHP_METHOD(", prefix, class_name, ",", overloadwname, ") {\n", NIL); - } else { - Printv(f->def, "ZEND_NAMED_FUNCTION(", overloadwname, ") {\n", NIL); - } + Printv(f->def, "ZEND_NAMED_FUNCTION(", overloadwname, ") {\n", NIL); } emit_parameter_variables(l, f); @@ -1365,13 +1361,7 @@ public: if (!overloaded) { Setattr(n, "wrap:name", wname); } else { - if (class_name && Cmp(Getattr(n, "storage"), "friend") != 0) { - String *m_call = NewStringEmpty(); - Printf(m_call, "ZEND_MN(%s_%s)", class_name, overloadwname); - Setattr(n, "wrap:name", m_call); - } else { - Setattr(n, "wrap:name", overloadwname); - } + Setattr(n, "wrap:name", overloadwname); } Setattr(n, "wrapper:method:name", wname);