Skip to content

Implement first-class callable syntax #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jul 12, 2021
Merged

Implement first-class callable syntax #114

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1fd3f5b
Implement first-class callable syntax
thekid Jul 2, 2021
29c2a1c
Emit callable expressions as regular `function` closures for PHP < 7.4
thekid Jul 2, 2021
ab460ef
Add tests for callable syntax
thekid Jul 2, 2021
6b85e46
Remove unused imports
thekid Jul 2, 2021
24f3b2c
Add variations to variable method reference tests
thekid Jul 3, 2021
a9bc033
Extract assertion into helper method
thekid Jul 3, 2021
12e517b
Make code consistent with other places in emitter
thekid Jul 4, 2021
1c2279b
QA: Compress whitespace
thekid Jul 4, 2021
0c84bef
Add changelog entry
thekid Jul 4, 2021
a321734
Add test for `fn() => ...` style closures
thekid Jul 4, 2021
8ef7349
Ensure exceptions are raised for non-existant callables
thekid Jul 4, 2021
f25b9d2
Use release version of xp-framework/ast
thekid Jul 12, 2021
e219849
MFH
thekid Jul 12, 2021
cf6f56a
Fix PHP 8.1 compatibility
thekid Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"keywords": ["module", "xp"],
"require" : {
"xp-framework/core": "^10.0 | ^9.0 | ^8.0 | ^7.0",
"xp-framework/ast": "^7.3",
"xp-framework/ast": "dev-feature/first_class_callable_syntax as 7.4.0",
"php" : ">=7.0.0"
},
"require-dev" : {
Expand Down
7 changes: 7 additions & 0 deletions src/main/php/lang/ast/emit/PHP.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,13 @@ protected function emitNewClass($result, $new) {
array_shift($result->type);
}

protected function emitCallable($result, $callable) {
$t= $result->temp();
$result->out->write('fn(...'.$t.') => ');
$this->emitOne($result, $callable->expression);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once the RFC merged to PHP 8.1, we should move this to a trait for PHP 7.4 and 8.0 and emit native code on PHP 8.1

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now the only thing we need to do is to remove the use CallablesAsClosures from the PHP81 emitter.

$result->out->write('(... '.$t.')');
}

protected function emitInvoke($result, $invoke) {
$this->emitOne($result, $invoke->expression);
$result->out->write('(');
Expand Down
2 changes: 1 addition & 1 deletion src/main/php/lang/ast/emit/PHP70.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @see https://wiki.php.net/rfc#php_70
*/
class PHP70 extends PHP {
use OmitPropertyTypes, OmitConstModifiers;
use OmitPropertyTypes, OmitConstModifiers, CallablesAsClosures;
use RewriteNullCoalesceAssignment, RewriteLambdaExpressions, RewriteMultiCatch, RewriteClassOnObjects, RewriteExplicitOctals;

/** Sets up type => literal mappings */
Expand Down
2 changes: 1 addition & 1 deletion src/main/php/lang/ast/emit/PHP71.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @see https://wiki.php.net/rfc#php_71
*/
class PHP71 extends PHP {
use OmitPropertyTypes;
use OmitPropertyTypes, CallablesAsClosures;
use RewriteNullCoalesceAssignment, RewriteLambdaExpressions, RewriteClassOnObjects, RewriteExplicitOctals;

/** Sets up type => literal mappings */
Expand Down
2 changes: 1 addition & 1 deletion src/main/php/lang/ast/emit/PHP72.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @see https://wiki.php.net/rfc#php_72
*/
class PHP72 extends PHP {
use OmitPropertyTypes;
use OmitPropertyTypes, CallablesAsClosures;
use RewriteNullCoalesceAssignment, RewriteLambdaExpressions, RewriteClassOnObjects, RewriteExplicitOctals;

/** Sets up type => literal mappings */
Expand Down