Support php 8.0 grouped attributes with #[ (nikic#173)

The choice of null AST_ARG_LIST seems deliberate in php-src, so that
zend_ast_export_attribute_group can emit a different representation for
`attr()` and `attr`

Author: TysonAndre

README.md

@@ -454,6 +454,7 @@ AST_YIELD_FROM:           expr
 AST_ARG_LIST
 AST_ARRAY
 AST_ATTRIBUTE_LIST        // php 8.0+ attributes (version 80+)
+AST_ATTRIBUTE_GROUP       // php 8.0+ attributes (version 80+)
 AST_CATCH_LIST
 AST_CLASS_CONST_DECL
 AST_CLOSURE_USES

ast_data.c

@@ -20,6 +20,7 @@ const zend_ast_kind ast_kinds[] = {
 	ZEND_AST_USE,
 	ZEND_AST_TYPE_UNION,
 	ZEND_AST_ATTRIBUTE_LIST,
+	ZEND_AST_ATTRIBUTE_GROUP,
 	ZEND_AST_MATCH_ARM_LIST,
 	AST_NAME,
 	AST_CLOSURE_VAR,
@@ -130,6 +131,7 @@ const char *ast_kind_to_name(zend_ast_kind kind) {
 		case ZEND_AST_USE: return "AST_USE";
 		case ZEND_AST_TYPE_UNION: return "AST_TYPE_UNION";
 		case ZEND_AST_ATTRIBUTE_LIST: return "AST_ATTRIBUTE_LIST";
+		case ZEND_AST_ATTRIBUTE_GROUP: return "AST_ATTRIBUTE_GROUP";
 		case ZEND_AST_MATCH_ARM_LIST: return "AST_MATCH_ARM_LIST";
 		case AST_NAME: return "AST_NAME";
 		case AST_CLOSURE_VAR: return "AST_CLOSURE_VAR";
@@ -741,6 +743,7 @@ void ast_register_kind_constants(INIT_FUNC_ARGS) {
 	REGISTER_NS_LONG_CONSTANT("ast", "AST_USE", ZEND_AST_USE, CONST_CS | CONST_PERSISTENT);
 	REGISTER_NS_LONG_CONSTANT("ast", "AST_TYPE_UNION", ZEND_AST_TYPE_UNION, CONST_CS | CONST_PERSISTENT);
 	REGISTER_NS_LONG_CONSTANT("ast", "AST_ATTRIBUTE_LIST", ZEND_AST_ATTRIBUTE_LIST, CONST_CS | CONST_PERSISTENT);
+	REGISTER_NS_LONG_CONSTANT("ast", "AST_ATTRIBUTE_GROUP", ZEND_AST_ATTRIBUTE_GROUP, CONST_CS | CONST_PERSISTENT);
 	REGISTER_NS_LONG_CONSTANT("ast", "AST_MATCH_ARM_LIST", ZEND_AST_MATCH_ARM_LIST, CONST_CS | CONST_PERSISTENT);
 	REGISTER_NS_LONG_CONSTANT("ast", "AST_NAME", AST_NAME, CONST_CS | CONST_PERSISTENT);
 	REGISTER_NS_LONG_CONSTANT("ast", "AST_CLOSURE_VAR", AST_CLOSURE_VAR, CONST_CS | CONST_PERSISTENT);

ast_stub.php

@@ -26,6 +26,7 @@
 const AST_USE = 143;
 const AST_TYPE_UNION = 144;
 const AST_ATTRIBUTE_LIST = 145;
+const AST_ATTRIBUTE_GROUP = 146;
 const AST_MATCH_ARM_LIST = 147;
 const AST_NAME = 2048;
 const AST_CLOSURE_VAR = 2049;

package.xml

@@ -18,18 +18,18 @@
   <email>tandre@php.net</email>
   <active>yes</active>
  </lead>
- <date>2020-09-02</date>
+ <date>2020-09-03</date>
  <version>
-  <release>1.0.9</release>
-  <api>1.0.9</api>
+  <release>1.0.10dev</release>
+  <api>1.0.10dev</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  <license uri="https://github.com/nikic/php-ast/blob/master/LICENSE">BSD-3-Clause</license>
  <notes>
-- Support API change in php 8.0.0beta3.
+- Support attributes syntax change (`#[...]`) in php 8.0.0RC1.
  </notes>
  <contents>
   <dir name="/">
@@ -132,6 +132,21 @@
  <providesextension>ast</providesextension>
  <extsrcrelease />
  <changelog>
+  <release>
+  <date>2020-09-02</date>
+  <version>
+   <release>1.0.9</release>
+   <api>1.0.9</api>
+  </version>
+  <stability>
+   <release>stable</release>
+   <api>stable</api>
+  </stability>
+  <license uri="https://github.com/nikic/php-ast/blob/master/LICENSE">BSD-3-Clause</license>
+  <notes>
+- Support API change in php 8.0.0beta3.
+  </notes>
+  </release>
   <release>
    <date>2020-08-04</date>
    <version>

php_ast.h

@@ -7,7 +7,7 @@
 extern zend_module_entry ast_module_entry;
 #define phpext_ast_ptr &ast_module_entry
 
-#define PHP_AST_VERSION "1.0.9"
+#define PHP_AST_VERSION "1.0.10dev"
 
 #ifdef PHP_WIN32
 #	define PHP_AST_API __declspec(dllexport)
@@ -62,6 +62,7 @@ extern ast_str_globals str_globals;
 # define ZEND_AST_TYPE_UNION ((1 << (ZEND_AST_IS_LIST_SHIFT + 1)) - 2)
 # define ZEND_AST_ATTRIBUTE_LIST ((1 << (ZEND_AST_IS_LIST_SHIFT + 1)) - 3)
 # define ZEND_AST_MATCH_ARM_LIST ((1 << (ZEND_AST_IS_LIST_SHIFT + 1)) - 4)
+# define ZEND_AST_ATTRIBUTE_GROUP ((1 << (ZEND_AST_IS_LIST_SHIFT + 1)) - 5)
 /* 2 child nodes */
 # define ZEND_AST_CLASS_CONST_GROUP 0x2fe
 # define ZEND_AST_ATTRIBUTE 0x2fd

scripts/generate_ast_data.php

@@ -172,6 +172,7 @@
 	'ZEND_AST_USE',
 	'ZEND_AST_TYPE_UNION',
 	'ZEND_AST_ATTRIBUTE_LIST',
+	'ZEND_AST_ATTRIBUTE_GROUP',
 	'ZEND_AST_MATCH_ARM_LIST',
 ];
 

tests/attributes_01.phpt

@@ -11,13 +11,13 @@ $code = <<<'PHP'
 <?php
 namespace NS;
 
-@@SomeAttribute
-function test(@@namespace\SomeAttribute(2+2) Type $arg) {
+#[SomeAttribute]
+function test(#[namespace\SomeAttribute(2+2)] Type $arg) {
 }
 
-$x = @@SomeAttribute function () {};
+$x = #[SomeAttribute] function () {};
 
-$y = @@SomeAttribute fn (@@\SomeAttribute $a) => $x;
+$y = #[SomeAttribute] fn (#[\SomeAttribute] $a) => $x;
 PHP;
 
 echo ast_dump(ast\parse_code($code, $version=70));

tests/attributes_02.phpt

@@ -7,22 +7,29 @@ Attributes in PHP 8.0 on classes
 
 require __DIR__ . '/../util.php';
 
+// Some edge cases in parsing attributes to compare other parsers against
 $code = <<<'PHP'
 <?php
 namespace NS;
 
-@@\SomeAttribute()
+#[\SomeAttribute()]
 class X {
-    @@Attr1
-    @@Attr2(true)
+    #[Attr1]
+    #[
+        Attr2(true), # Line comment on an attribute
+    ]
     public $prop;
 
-    @@Attr3
+    #[Attr3]
     public const CONST_WITH_ATTRIBUTE = 123;
 
-    @@Attr4
-    public static function hasAttribute() {}
+    #[Attr4, Attr5()]
+    public static function hasAttribute(
+        #[ThisIsAnAttribute, \AnotherAttribute] $parameter
+    ) {}
 }
+#[Deprecated]
+function myGlobal() {}
 PHP;
 
 echo ast_dump(ast\parse_code($code, $version=70));
@@ -60,10 +67,23 @@ AST_STMT_LIST
                 name: "hasAttribute"
                 docComment: null
                 params: AST_PARAM_LIST
+                    0: AST_PARAM
+                        flags: 0
+                        type: null
+                        name: "parameter"
+                        default: null
                 stmts: AST_STMT_LIST
                 returnType: null
                 __declId: 0
         __declId: 1
+    2: AST_FUNC_DECL
+        flags: 0
+        name: "myGlobal"
+        docComment: null
+        params: AST_PARAM_LIST
+        stmts: AST_STMT_LIST
+        returnType: null
+        __declId: 2
 In version 80
 AST_STMT_LIST
     0: AST_NAMESPACE
@@ -86,20 +106,22 @@ AST_STMT_LIST
                         default: null
                         docComment: null
                 attributes: AST_ATTRIBUTE_LIST
-                    0: AST_ATTRIBUTE
-                        class: AST_NAME
-                            flags: NAME_NOT_FQ (%d)
-                            name: "Attr1"
-                        args: null
-                    1: AST_ATTRIBUTE
-                        class: AST_NAME
-                            flags: NAME_NOT_FQ (%d)
-                            name: "Attr2"
-                        args: AST_ARG_LIST
-                            0: AST_CONST
-                                name: AST_NAME
-                                    flags: NAME_NOT_FQ (%d)
-                                    name: "true"
+                    0: AST_ATTRIBUTE_GROUP
+                        0: AST_ATTRIBUTE
+                            class: AST_NAME
+                                flags: NAME_NOT_FQ (%d)
+                                name: "Attr1"
+                            args: null
+                    1: AST_ATTRIBUTE_GROUP
+                        0: AST_ATTRIBUTE
+                            class: AST_NAME
+                                flags: NAME_NOT_FQ (%d)
+                                name: "Attr2"
+                            args: AST_ARG_LIST
+                                0: AST_CONST
+                                    name: AST_NAME
+                                        flags: NAME_NOT_FQ (%d)
+                                        name: "true"
             1: AST_CLASS_CONST_GROUP
                 flags: MODIFIER_PUBLIC (%d)
                 const: AST_CLASS_CONST_DECL
@@ -109,24 +131,64 @@ AST_STMT_LIST
                         value: 123
                         docComment: null
                 attributes: AST_ATTRIBUTE_LIST
-                    0: AST_ATTRIBUTE
-                        class: AST_NAME
-                            flags: NAME_NOT_FQ (%d)
-                            name: "Attr3"
-                        args: null
+                    0: AST_ATTRIBUTE_GROUP
+                        0: AST_ATTRIBUTE
+                            class: AST_NAME
+                                flags: NAME_NOT_FQ (%d)
+                                name: "Attr3"
+                            args: null
             2: AST_METHOD
                 flags: MODIFIER_PUBLIC | MODIFIER_STATIC (%d)
                 name: "hasAttribute"
                 docComment: null
                 params: AST_PARAM_LIST
+                    0: AST_PARAM
+                        flags: 0
+                        type: null
+                        name: "parameter"
+                        default: null
+                        attributes: AST_ATTRIBUTE_LIST
+                            0: AST_ATTRIBUTE_GROUP
+                                0: AST_ATTRIBUTE
+                                    class: AST_NAME
+                                        flags: NAME_NOT_FQ (%d)
+                                        name: "ThisIsAnAttribute"
+                                    args: null
+                                1: AST_ATTRIBUTE
+                                    class: AST_NAME
+                                        flags: NAME_FQ (%d)
+                                        name: "AnotherAttribute"
+                                    args: null
+                        docComment: null
                 stmts: AST_STMT_LIST
                 returnType: null
                 attributes: AST_ATTRIBUTE_LIST
-                    0: AST_ATTRIBUTE
-                        class: AST_NAME
-                            flags: NAME_NOT_FQ (%d)
-                            name: "Attr4"
-                        args: null
+                    0: AST_ATTRIBUTE_GROUP
+                        0: AST_ATTRIBUTE
+                            class: AST_NAME
+                                flags: NAME_NOT_FQ (%d)
+                                name: "Attr4"
+                            args: null
+                        1: AST_ATTRIBUTE
+                            class: AST_NAME
+                                flags: NAME_NOT_FQ (%d)
+                                name: "Attr5"
+                            args: AST_ARG_LIST
                 __declId: 0
         attributes: null
-        __declId: 1
+        __declId: 1
+    2: AST_FUNC_DECL
+        flags: 0
+        name: "myGlobal"
+        docComment: null
+        params: AST_PARAM_LIST
+        stmts: AST_STMT_LIST
+        returnType: null
+        attributes: AST_ATTRIBUTE_LIST
+            0: AST_ATTRIBUTE_GROUP
+                0: AST_ATTRIBUTE
+                    class: AST_NAME
+                        flags: NAME_NOT_FQ (%d)
+                        name: "Deprecated"
+                    args: null
+        __declId: 2

tests/metadata.phpt

@@ -45,6 +45,7 @@ AST_TRAIT_ADAPTATIONS: []
 AST_USE: [USE_NORMAL, USE_FUNCTION, USE_CONST]
 AST_TYPE_UNION: []
 AST_ATTRIBUTE_LIST: []
+AST_ATTRIBUTE_GROUP: []
 AST_MATCH_ARM_LIST: []
 AST_NAME: [NAME_FQ, NAME_NOT_FQ, NAME_RELATIVE]
 AST_CLOSURE_VAR: [CLOSURE_USE_REF]