Clean up constructor handling in com_dotnet

We substitute the construction magic with standard constructors, move
the ZPP checks to the beginning of the ctors, and also let the function
entries be generated from the stubs.

1 files changed, 1 insertions, 33 deletions

diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c
index 31e01061e3..cd1f59f555 100644
--- a/ext/com_dotnet/com_handlers.c
+++ b/ext/com_dotnet/com_handlers.c
@@ -387,38 +387,6 @@ static zend_function *com_method_get(zend_object **object_ptr, zend_string *name
 	return NULL;
 }
 
-static zend_function *com_constructor_get(zend_object *object)
-{
-	php_com_dotnet_object *obj = (php_com_dotnet_object *) object;
-	static zend_internal_function c, d, v;
-
-#define POPULATE_CTOR(f, fn)	\
-	f.type = ZEND_INTERNAL_FUNCTION; \
-	f.function_name = obj->ce->name; \
-	f.scope = obj->ce; \
-	f.arg_info = NULL; \
-	f.num_args = 0; \
-	f.fn_flags = 0; \
-	f.handler = ZEND_FN(fn); \
-	return (zend_function*)&f;
-
-	switch (obj->ce->name->val[0]) {
-#if HAVE_MSCOREE_H
-		case 'd':
-			POPULATE_CTOR(d, com_dotnet_create_instance);
-#endif
-
-		case 'c':
-			POPULATE_CTOR(c, com_create_instance);
-
-		case 'v':
-			POPULATE_CTOR(v, com_variant_create_instance);
-
-		default:
-			return NULL;
-	}
-}
-
 static zend_string* com_class_name_get(const zend_object *object)
 {
 	php_com_dotnet_object *obj = (php_com_dotnet_object *)object;
@@ -553,7 +521,7 @@ zend_object_handlers php_com_object_handlers = {
 	com_dimension_delete,
 	com_properties_get,
 	com_method_get,
-	com_constructor_get,
+	zend_std_get_constructor,
 	com_class_name_get,
 	com_object_cast,
 	com_object_count,