php8.1: added first class callable syntax (#18)

pkg/ast/node.go

@@ -1506,6 +1506,7 @@ type ExprFunctionCall struct {
 	OpenParenthesisTkn  *token.Token
 	Args                []Vertex
 	SeparatorTkns       []*token.Token
+	EllipsisTkn         *token.Token
 	CloseParenthesisTkn *token.Token
 }
 
@@ -1610,6 +1611,7 @@ type ExprMethodCall struct {
 	OpenParenthesisTkn   *token.Token
 	Args                 []Vertex
 	SeparatorTkns        []*token.Token
+	EllipsisTkn          *token.Token
 	CloseParenthesisTkn  *token.Token
 }
 
@@ -1632,6 +1634,7 @@ type ExprNullsafeMethodCall struct {
 	OpenParenthesisTkn   *token.Token
 	Args                 []Vertex
 	SeparatorTkns        []*token.Token
+	EllipsisTkn          *token.Token
 	CloseParenthesisTkn  *token.Token
 }
 
@@ -1830,6 +1833,7 @@ type ExprStaticCall struct {
 	OpenParenthesisTkn   *token.Token
 	Args                 []Vertex
 	SeparatorTkns        []*token.Token
+	EllipsisTkn          *token.Token
 	CloseParenthesisTkn  *token.Token
 }
 

pkg/visitor/dumper/dumper.go

@@ -1323,6 +1323,7 @@ func (v *Dumper) ExprFunctionCall(n *ast.ExprFunctionCall) {
 	v.dumpToken("OpenParenthesisTkn", n.OpenParenthesisTkn)
 	v.dumpVertexList("Args", n.Args)
 	v.dumpTokenList("SeparatorTkns", n.SeparatorTkns)
+	v.dumpToken("EllipsisTkn", n.EllipsisTkn)
 	v.dumpToken("CloseParenthesisTkn", n.CloseParenthesisTkn)
 
 	v.indent--
@@ -1409,6 +1410,7 @@ func (v *Dumper) ExprMethodCall(n *ast.ExprMethodCall) {
 	v.dumpToken("OpenParenthesisTkn", n.OpenParenthesisTkn)
 	v.dumpVertexList("Args", n.Args)
 	v.dumpTokenList("SeparatorTkns", n.SeparatorTkns)
+	v.dumpToken("EllipsisTkn", n.EllipsisTkn)
 	v.dumpToken("CloseParenthesisTkn", n.CloseParenthesisTkn)
 
 	v.indent--
@@ -1428,6 +1430,7 @@ func (v *Dumper) ExprNullsafeMethodCall(n *ast.ExprNullsafeMethodCall) {
 	v.dumpToken("OpenParenthesisTkn", n.OpenParenthesisTkn)
 	v.dumpVertexList("Args", n.Args)
 	v.dumpTokenList("SeparatorTkns", n.SeparatorTkns)
+	v.dumpToken("EllipsisTkn", n.EllipsisTkn)
 	v.dumpToken("CloseParenthesisTkn", n.CloseParenthesisTkn)
 
 	v.indent--
@@ -1591,6 +1594,7 @@ func (v *Dumper) ExprStaticCall(n *ast.ExprStaticCall) {
 	v.dumpVertexList("Args", n.Args)
 	v.dumpTokenList("SeparatorTkns", n.SeparatorTkns)
 	v.dumpToken("CloseParenthesisTkn", n.CloseParenthesisTkn)
+	v.dumpToken("EllipsisTkn", n.EllipsisTkn)
 
 	v.indent--
 	v.print(v.indent, "},\n")

pkg/visitor/formatter/formatter.go

@@ -1364,6 +1364,9 @@ func (f *formatter) ExprFunctionCall(n *ast.ExprFunctionCall) {
 	if len(n.Args) > 0 {
 		n.SeparatorTkns = f.formatList(n.Args, ',')
 	}
+	if n.EllipsisTkn != nil {
+		n.EllipsisTkn = f.newToken(token.T_ELLIPSIS, []byte("..."))
+	}
 	n.CloseParenthesisTkn = f.newToken(')', []byte(")"))
 }
 
@@ -1424,6 +1427,9 @@ func (f *formatter) ExprMethodCall(n *ast.ExprMethodCall) {
 	if len(n.Args) > 0 {
 		n.SeparatorTkns = f.formatList(n.Args, ',')
 	}
+	if n.EllipsisTkn != nil {
+		n.EllipsisTkn = f.newToken(token.T_ELLIPSIS, []byte("..."))
+	}
 	n.CloseParenthesisTkn = f.newToken(')', []byte(")"))
 }
 
@@ -1448,6 +1454,9 @@ func (f *formatter) ExprNullsafeMethodCall(n *ast.ExprNullsafeMethodCall) {
 	if len(n.Args) > 0 {
 		n.SeparatorTkns = f.formatList(n.Args, ',')
 	}
+	if n.EllipsisTkn != nil {
+		n.EllipsisTkn = f.newToken(token.T_ELLIPSIS, []byte("..."))
+	}
 	n.CloseParenthesisTkn = f.newToken(')', []byte(")"))
 }
 
@@ -1569,6 +1578,9 @@ func (f *formatter) ExprStaticCall(n *ast.ExprStaticCall) {
 	if len(n.Args) > 0 {
 		n.SeparatorTkns = f.formatList(n.Args, ',')
 	}
+	if n.EllipsisTkn != nil {
+		n.EllipsisTkn = f.newToken(token.T_ELLIPSIS, []byte("..."))
+	}
 	n.CloseParenthesisTkn = f.newToken(')', []byte(")"))
 }
 

pkg/visitor/printer/printer.go

@@ -787,6 +787,7 @@ func (p *printer) ExprFunctionCall(n *ast.ExprFunctionCall) {
 	p.printNode(n.Function)
 	p.printToken(n.OpenParenthesisTkn, []byte("("))
 	p.printSeparatedList(n.Args, n.SeparatorTkns, []byte(","))
+	p.printToken(n.EllipsisTkn, nil)
 	p.printToken(n.CloseParenthesisTkn, []byte(")"))
 }
 
@@ -828,6 +829,7 @@ func (p *printer) ExprMethodCall(n *ast.ExprMethodCall) {
 	p.printToken(n.CloseCurlyBracketTkn, nil)
 	p.printToken(n.OpenParenthesisTkn, []byte("("))
 	p.printSeparatedList(n.Args, n.SeparatorTkns, []byte(","))
+	p.printToken(n.EllipsisTkn, nil)
 	p.printToken(n.CloseParenthesisTkn, []byte(")"))
 }
 
@@ -839,6 +841,7 @@ func (p *printer) ExprNullsafeMethodCall(n *ast.ExprNullsafeMethodCall) {
 	p.printToken(n.CloseCurlyBracketTkn, nil)
 	p.printToken(n.OpenParenthesisTkn, []byte("("))
 	p.printSeparatedList(n.Args, n.SeparatorTkns, []byte(","))
+	p.printToken(n.EllipsisTkn, nil)
 	p.printToken(n.CloseParenthesisTkn, []byte(")"))
 }
 
@@ -915,6 +918,7 @@ func (p *printer) ExprStaticCall(n *ast.ExprStaticCall) {
 	p.printToken(n.CloseCurlyBracketTkn, nil)
 	p.printToken(n.OpenParenthesisTkn, p.ifNodeList(n.Args, []byte("(")))
 	p.printSeparatedList(n.Args, n.SeparatorTkns, []byte(","))
+	p.printToken(n.EllipsisTkn, nil)
 	p.printToken(n.CloseParenthesisTkn, p.ifNodeList(n.Args, []byte(")")))
 }
 

pkg/visitor/printer/printer_php8_1_test.go

@@ -84,3 +84,23 @@ class Foo {
 }
 `)
 }
+
+func TestFirstClassCallableSyntaxPHP81(t *testing.T) {
+	tester.NewParserPrintTestSuite(t).UsePHP8().Run(`<?php
+$fn = id(...);
+stdClass::doesNotExist(...);
+(new stdClass)->doesNotExist(...);
+Test::privateMethod(...);
+Test::instanceMethod(...);
+$fn = (new A)->$name2(...);
+false && strlen(...);
+$foo?->foo->bar(...);
+$foo?->foo($foo->bar(...));
+$foo = $closure->__invoke(...);
+
+// #[Attribute(...)] // not working
+// class Foo {}
+
+// new Foo(...); // not working
+`)
+}