cleanup

Author: krakjoe

Zend/zend_partial.c

@@ -41,21 +41,7 @@ typedef struct _zend_partial {
     zend_partial_applied   frame;
 } zend_partial;
 
-zend_function* zend_partial_prototype(zend_object *zo) {
-    zend_partial *partial =
-        (zend_partial*) zo;
-
-    return &partial->prototype;
-}
-
-zend_function* zend_partial_function(zend_object *zo) {
-    zend_partial *partial =
-        (zend_partial*) zo;
-
-    return &partial->func;
-}
-
-zend_object* zend_partial_this(zend_object *object) {
+static zend_always_inline zend_object* zend_partial_this(zend_object *object) {
     while (object && instanceof_function(object->ce, zend_ce_closure)) {
         zend_partial *ptr = (zend_partial*) object;
 
@@ -73,7 +59,7 @@ zend_object* zend_partial_this(zend_object *object) {
     return object;
 }
 
-static zend_always_inline zend_object* zend_partial_parent(zval *This) {
+static zend_always_inline zend_partial* zend_partial_parent(zval *This) {
     if (Z_TYPE_P(This) != IS_OBJECT) {
         return NULL;
     }
@@ -88,14 +74,7 @@ static zend_always_inline zend_object* zend_partial_parent(zval *This) {
         return NULL;
     }
 
-    return Z_OBJ_P(This);
-}
-
-static zend_always_inline zend_partial_applied* zend_partial_frame(zend_object *zo) {
-    zend_partial *partial =
-        (zend_partial*) zo;
-
-    return &partial->frame;
+    return ptr;
 }
 
 static zend_always_inline void zend_partial_prototype_u(zend_partial *partial, zend_function *prototype) {
@@ -232,7 +211,7 @@ static zend_always_inline void i_zend_partial_trampoline(zend_partial *partial,
 	trampoline->internal_function.function_name = ZSTR_KNOWN(ZEND_STR_MAGIC_INVOKE);
 }
 
-static zend_object* zend_partial_new(zend_class_entry *type) {
+static zend_always_inline zend_object* zend_partial_new(zend_class_entry *type) {
     zend_partial *partial = ecalloc(1, sizeof(zend_partial));
 
     zend_object_std_init(&partial->std, type);
@@ -382,7 +361,7 @@ static zend_function *zend_partial_get_method(zend_object **object, zend_string
 }
 /* }}} */
 
-int zend_partial_get_trampoline(zend_object *obj, zend_class_entry **ce_ptr, zend_function **fptr_ptr, zend_object **obj_ptr, bool check_only)
+static int zend_partial_get_trampoline(zend_object *obj, zend_class_entry **ce_ptr, zend_function **fptr_ptr, zend_object **obj_ptr, bool check_only)
 {
     zend_partial *partial =
         (zend_partial*) obj;
@@ -541,25 +520,19 @@ ZEND_NAMED_FUNCTION(zend_partial_call_magic)
     efree(fci.params);
 }
 
-void zend_partial_apply(zval *res, zend_execute_data *call) {
+void zend_partial_apply(zval *result, zend_execute_data *call) {
     zend_function *function, *prototype = NULL;
 
-    ZVAL_OBJ(res, zend_partial_new(zend_ce_closure));
+    ZVAL_OBJ(result, zend_partial_new(zend_ce_closure));
 
-    zend_partial *partial =
-        (zend_partial*) Z_OBJ_P(res);
-
-    zend_object *parent =
-        zend_partial_parent(&call->This);
+    zend_partial *parent, *partial =
+        (zend_partial*) Z_OBJ_P(result);
 
-    if (parent) {
-        zend_partial_applied *frame =
-            zend_partial_frame(parent);
-
-        function =
-            zend_partial_function(parent);
-        prototype =
-            zend_partial_prototype(parent);
+    if ((parent = zend_partial_parent(&call->This))) {
+        function  = &parent->func;
+        prototype = &parent->prototype;
+        
+        zend_partial_applied *frame = &parent->frame;
 
         partial->frame.argc = frame->argc + ZEND_CALL_NUM_ARGS(call);
         partial->frame.argv = ecalloc(partial->frame.argc, sizeof(zval));

Zend/zend_partial.h

@@ -22,11 +22,7 @@ BEGIN_EXTERN_C()
 
 void zend_partial_startup(void);
 
-void zend_partial_apply(zval *res, zend_execute_data *call);
-
-zend_function* zend_partial_prototype(zend_object *zo);
-zend_function* zend_partial_function(zend_object *zo);
-zend_object* zend_partial_this(zend_object *object);
+void zend_partial_apply(zval *result, zend_execute_data *call);
 
 ZEND_NAMED_FUNCTION(zend_partial_call_magic);