Add support for "iterable" type

Author: nikic

README.md

@@ -224,6 +224,7 @@ ast\flags\TYPE_BOOL         // since version 40
 ast\flags\TYPE_LONG         // since version 40
 ast\flags\TYPE_DOUBLE       // since version 40
 ast\flags\TYPE_STRING       // since version 40
+ast\flags\TYPE_ITERABLE     // since version 40
 
 // Used by ast\AST_CAST (exclusive)
 ast\flags\TYPE_NULL
@@ -428,8 +429,8 @@ Version changelog
   call would return it as `'bar'`. Now always the latter form is used.
 * `null` elements are now stripped from `AST_STMT_LIST`. Previously these could be caused by nop
   statements (`;`).
-* Type hints `int`, `float`, `string`, `bool` and `void` will now be represented as `AST_TYPE`
-  nodes with a respective flag.
+* Type hints `int`, `float`, `string`, `bool`, `void` and `iterable` will now be represented as
+  `AST_TYPE` nodes with a respective flag.
 * Many `stmts` children could previously hold one of `null`, a single node or an `AST_STMT_LIST`.
   These will now be normalized to always use an `AST_STMT_LIST`. A `null` is only allowed if it is
   semantically meaningful, e.g. in the case of `declare(ticks=1);` vs `declare(ticks=1) {}`.

ast.c

@@ -43,8 +43,9 @@
 #define AST_MINUS 262
 
 /* Define "void" for PHP 7.0 */
-#ifndef IS_VOID
-#define IS_VOID 18
+#if PHP_VERSION_ID < 70100
+# define IS_VOID 18
+# define IS_ITERABLE 19
 #endif
 
 static inline void ast_update_property(zval *object, zend_string *name, zval *value, void **cache_slot) {
@@ -194,6 +195,7 @@ static const builtin_type_info builtin_types[] = {
 	{ZEND_STRL("string"), IS_STRING},
 	{ZEND_STRL("bool"), _IS_BOOL},
 	{ZEND_STRL("void"), IS_VOID},
+	{ZEND_STRL("iterable"), IS_ITERABLE},
 	{NULL, 0, IS_UNDEF}
 };
 static inline zend_uchar lookup_builtin_type(const zend_string *name) {
@@ -725,6 +727,7 @@ PHP_MINIT_FUNCTION(ast) {
 	ast_register_flag_constant("TYPE_OBJECT", IS_OBJECT);
 	ast_register_flag_constant("TYPE_CALLABLE", IS_CALLABLE);
 	ast_register_flag_constant("TYPE_VOID", IS_VOID);
+	ast_register_flag_constant("TYPE_ITERABLE", IS_ITERABLE);
 
 	ast_register_flag_constant("UNARY_BOOL_NOT", ZEND_BOOL_NOT);
 	ast_register_flag_constant("UNARY_BITWISE_NOT", ZEND_BW_NOT);

tests/type_hints.phpt

@@ -8,7 +8,7 @@ require __DIR__ . '/../util.php';
 $code = <<<'PHP'
 <?php
 function test(
-    A $a, array $b, callable $c, INT $d, Float $e, string $f, bool $g
+    A $a, array $b, callable $c, INT $d, Float $e, string $f, bool $g, iterable $h
 ) : void {
 }
 PHP;
@@ -70,6 +70,13 @@ AST_STMT_LIST
                     name: "bool"
                 name: "g"
                 default: null
+            7: AST_PARAM
+                flags: 0
+                type: AST_NAME
+                    flags: NAME_NOT_FQ (1)
+                    name: "iterable"
+                name: "h"
+                default: null
         uses: null
         stmts: AST_STMT_LIST
         returnType: AST_NAME
@@ -123,6 +130,12 @@ AST_STMT_LIST
                     flags: TYPE_BOOL (13)
                 name: "g"
                 default: null
+            7: AST_PARAM
+                flags: 0
+                type: AST_TYPE
+                    flags: TYPE_ITERABLE (19)
+                name: "h"
+                default: null
         uses: null
         stmts: AST_STMT_LIST
         returnType: AST_TYPE

util.php

@@ -29,6 +29,7 @@ function get_flag_info() : array {
         flags\TYPE_OBJECT => 'TYPE_OBJECT',
         flags\TYPE_CALLABLE => 'TYPE_CALLABLE',
         flags\TYPE_VOID => 'TYPE_VOID',
+        flags\TYPE_ITERABLE => 'TYPE_ITERABLE',
     ];
     $useTypes = [
         flags\USE_NORMAL => 'USE_NORMAL',