[RFC] Partial Function Application

Zend/Optimizer/zend_call_graph.c

@@ -106,6 +106,7 @@ ZEND_API int zend_analyze_calls(zend_arena **arena, zend_script *script, uint32_
 			case ZEND_DO_ICALL:
 			case ZEND_DO_UCALL:
 			case ZEND_DO_FCALL_BY_NAME:
+			case ZEND_DO_FCALL_PARTIAL:
 				func_info->flags |= ZEND_FUNC_HAS_CALLS;
 				if (call_info) {
 					call_info->caller_call_opline = opline;
@@ -122,6 +123,7 @@ ZEND_API int zend_analyze_calls(zend_arena **arena, zend_script *script, uint32_
 			case ZEND_SEND_VAR_NO_REF:
 			case ZEND_SEND_VAR_NO_REF_EX:
 			case ZEND_SEND_USER:
+			case ZEND_SEND_PLACEHOLDER:
 				if (call_info) {
 					if (opline->op2_type == IS_CONST) {
 						call_info->named_args = 1;

Zend/tests/partial_application/compile_errors_001.phpt

@@ -0,0 +1,9 @@
+--TEST--
+Partial application compile errors: multiple ...
+--FILE--
+<?php
+foo(..., ...);
+?>
+--EXPECTF--
+Fatal error: Variadic placeholder may only appear once in %s on line %d
+

Zend/tests/partial_application/compile_errors_002.phpt

@@ -0,0 +1,9 @@
+--TEST--
+Partial application compile errors: only named arguments after ...
+--FILE--
+<?php
+foo(..., ?);
+?>
+--EXPECTF--
+Fatal error: Only named arguments may follow variadic placeholder in %s on line %d
+

Zend/tests/partial_application/compile_errors_003.phpt

@@ -0,0 +1,9 @@
+--TEST--
+Partial application compile errors: named arguments must come after placeholder
+--FILE--
+<?php
+foo(n: 5, ?);
+?>
+--EXPECTF--
+Fatal error: Named arguments must come after all placeholders in %s on line %d
+

Zend/tests/partial_application/compile_errors_004.phpt

@@ -0,0 +1,8 @@
+--TEST--
+Partial application compile errors: named arguments must come after variadic placeholder
+--FILE--
+<?php
+foo(n: 5, ...);
+?>
+--EXPECTF--
+Fatal error: Named arguments must come after all placeholders in %s on line %d

Zend/tests/partial_application/compile_errors_005.phpt

@@ -0,0 +1,9 @@
+--TEST--
+Partial application compile errors: follow variadic with un-named arg
+--FILE--
+<?php
+foo(..., $a);
+?>
+--EXPECTF--
+Fatal error: Only named arguments may follow variadic placeholder in %s on line %d
+

Zend/tests/partial_application/compile_errors_006.phpt

@@ -0,0 +1,9 @@
+--TEST--
+Partial application compile errors: mix application with unpack (placeholder after)
+--FILE--
+<?php
+foo(...["foo" => "bar"], ...);
+?>
+--EXPECTF--
+Fatal error: Cannot combine partial application and unpacking %s on line %d
+

Zend/tests/partial_application/compile_errors_007.phpt

@@ -0,0 +1,9 @@
+--TEST--
+Partial application compile errors: mix application with unpack (placeholder before)
+--FILE--
+<?php
+foo(..., ...["foo" => "bar"]);
+?>
+--EXPECTF--
+Fatal error: Cannot combine partial application and unpacking %s on line %d
+

Zend/tests/partial_application/errors_001.phpt

@@ -0,0 +1,38 @@
+--TEST--
+Partial application errors: placeholder count errors
+--FILE--
+<?php
+function foo($a, $b, $c) {
+
+}
+
+try {
+    foo(?);
+} catch (Error $ex) {
+    printf("%s\n", $ex->getMessage());
+}
+
+try {
+    foo(?, ?, ?, ?);
+} catch (Error $ex) {
+    printf("%s\n", $ex->getMessage());
+}
+
+try {
+    property_exists(?);
+} catch (Error $ex) {
+    printf("%s\n", $ex->getMessage());
+}
+
+try {
+    usleep(?, ?);
+} catch (Error $ex) {
+    printf("%s\n", $ex->getMessage());
+}
+?>
+--EXPECTF--
+not enough arguments or placeholders for application of foo, 1 given and exactly 3 expected, declared in %s on line 2
+too many arguments or placeholders for application of foo, 4 given and a maximum of 3 expected, declared in %s on line 2
+not enough arguments or placeholders for application of property_exists, 1 given and exactly 2 expected
+too many arguments or placeholders for application of usleep, 2 given and a maximum of 1 expected
+

Zend/tests/partial_application/errors_002.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Partial application errors: named parameter overwrites placeholder
+--FILE--
+<?php
+function foo($a) {
+
+}
+
+try {
+    foo(?, a: 1);
+} catch (Error $ex) {
+    printf("%s\n", $ex->getMessage());
+}
+?>
+--EXPECT--
+Named parameter $a overwrites previous placeholder
+

Zend/tests/partial_application/errors_003.phpt

@@ -0,0 +1,78 @@
+--TEST--
+Partial application errors: missing parameters
+--FILE--
+<?php
+function foo($a, ...$b) {
+
+}
+
+function bar($a, $b, $c) {}
+
+$foo = foo(?);
+
+try {
+    $foo();
+} catch (Error $ex) {
+    printf("%s\n", $ex->getMessage());
+}
+
+$foo = foo(?, ?);
+
+try {
+    $foo(1);    
+} catch (Error $ex) {
+    printf("%s\n", $ex->getMessage());
+}
+
+$bar = bar(?, ?, ...);
+
+try {
+    $bar(1);
+} catch (Error $ex) {
+    printf("%s\n", $ex->getMessage());
+}
+
+class Foo {
+    public function bar($a, ...$b) {}
+}
+
+$foo = new Foo;
+
+$bar = $foo->bar(?);
+
+try {
+    $bar();
+} catch (Error $ex) {
+    printf("%s\n", $ex->getMessage());
+}
+
+$usleep = usleep(...);
+
+try {
+    $usleep();
+} catch (Error $ex) {
+    printf("%s\n", $ex->getMessage());
+}
+
+$usleep = usleep(?);
+
+try {
+    $usleep();
+} catch (Error $ex) {
+    printf("%s\n", $ex->getMessage());
+}
+
+try {
+    $usleep(1, 2);
+} catch (Error $ex) {
+    printf("%s\n", $ex->getMessage());
+}
+?>
+--EXPECTF--
+not enough arguments for application of foo, 0 given and exactly 1 expected, declared in %s on line 8
+not enough arguments for application of foo, 1 given and exactly 2 expected, declared in %s on line 16
+not enough arguments for application of bar, 1 given and at least 2 expected, declared in %s on line 24
+not enough arguments for application of Foo::bar, 0 given and exactly 1 expected, declared in %s on line 38
+not enough arguments for implementation of usleep, 0 given and exactly 1 expected
+not enough arguments for application of usleep, 0 given and exactly 1 expected
+too many arguments for application of usleep, 2 given and a maximum of 1 expected

Zend/tests/partial_application/export_001.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Partial application ast export
+--INI--
+assert.exception=1
+--FILE--
+<?php
+try {
+    assert(0 && foo(?) && foo(...));
+} catch (Error $ex) {
+    printf("%s\n", $ex->getMessage());
+}
+?>
+--EXPECT--
+assert(0 && foo(?) && foo(...))

Zend/tests/partial_application/extra_collect_001.phpt

@@ -0,0 +1,50 @@
+--TEST--
+Partial application named parameters: extra collection
+--FILE--
+<?php
+function foo(...$args) {
+    var_dump($args);
+}
+
+$foo = foo(..., foo: "foo");
+
+$bar = $foo(..., bar: "bar");
+
+$baz = $bar(..., baz: "baz");
+
+$baz();
+
+$foo = foo(...);
+
+$bar = $foo(..., bar: "bar");
+
+$baz = $bar(..., baz: "baz");
+
+$baz();
+
+$foo = foo(..., foo: "foo");
+
+$foo(bar: "bar");
+?>
+--EXPECT--
+array(3) {
+  ["foo"]=>
+  string(3) "foo"
+  ["bar"]=>
+  string(3) "bar"
+  ["baz"]=>
+  string(3) "baz"
+}
+array(2) {
+  ["bar"]=>
+  string(3) "bar"
+  ["baz"]=>
+  string(3) "baz"
+}
+array(2) {
+  ["foo"]=>
+  string(3) "foo"
+  ["bar"]=>
+  string(3) "bar"
+}
+

Zend/tests/partial_application/factory_001.phpt

@@ -0,0 +1,24 @@
+--TEST--
+Partial application factory: pass
+--FILE--
+<?php
+class Foo {
+    public function __destruct() {
+        printf("%s\n", __METHOD__);
+    }
+}
+
+$foo = new Foo(...);
+
+$two = [$foo(), $foo()];
+
+if ($two[0] === $two[1]) {
+    var_dump($two);
+} else {
+    echo "OK\n";
+}
+?>
+--EXPECTF--
+OK
+Foo::__destruct
+Foo::__destruct

Zend/tests/partial_application/factory_002.phpt

@@ -0,0 +1,30 @@
+--TEST--
+Partial application factory: normal
+--FILE--
+<?php
+class Foo {
+    public function __construct($a) {
+        printf("%s\n", __METHOD__);
+    }
+
+    public function __destruct() {
+        printf("%s\n", __METHOD__);
+    }
+}
+
+$foo = new Foo(...);
+
+$two = [$foo(1), $foo(1)];
+
+if ($two[0] === $two[1]) {
+    var_dump($two);
+} else {
+    echo "OK\n";
+}
+?>
+--EXPECTF--
+Foo::__construct
+Foo::__construct
+OK
+Foo::__destruct
+Foo::__destruct

Zend/tests/partial_application/factory_003.phpt

@@ -0,0 +1,24 @@
+--TEST--
+Partial application factory: exception
+--FILE--
+<?php
+class Foo {
+    public function __construct() {
+        throw new Exception("boo");
+    }
+
+    public function __destruct() {
+        printf("%s\n", __METHOD__);
+    }
+}
+
+$foo = new Foo(...);
+
+try {
+    $foo();
+} catch (Exception $ex) {
+    printf("%s\n", $ex->getMessage());
+}
+?>
+--EXPECT--
+boo

Zend/tests/partial_application/factory_004.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Partial application factory object properties initialization
+--FILE--
+<?php
+class Foo {
+    public function __construct(public int $arg = 1) {}
+}
+
+$foo = new Foo(...);
+
+var_dump($foo());
+?>
+--EXPECTF--
+object(Foo)#%d (1) {
+  ["arg"]=>
+  int(1)
+}
+