iterable is now a token instead of a Name

Author: camilledejoye

src/Parser.php

@@ -141,7 +141,8 @@ public function __construct() {
         $this->parameterTypeDeclarationTokens =
             [TokenKind::ArrayKeyword, TokenKind::CallableKeyword, TokenKind::BoolReservedWord,
             TokenKind::FloatReservedWord, TokenKind::IntReservedWord, TokenKind::StringReservedWord,
-            TokenKind::ObjectReservedWord, TokenKind::NullReservedWord, TokenKind::FalseReservedWord]; // TODO update spec
+            TokenKind::ObjectReservedWord, TokenKind::NullReservedWord, TokenKind::FalseReservedWord,
+            TokenKind::IterableKeyword]; // TODO update spec
         $this->returnTypeDeclarationTokens = \array_merge([TokenKind::VoidReservedWord, TokenKind::NullReservedWord, TokenKind::FalseReservedWord, TokenKind::StaticKeyword], $this->parameterTypeDeclarationTokens);
     }
 

src/TokenKind.php

@@ -87,6 +87,7 @@ class TokenKind {
     const YieldFromKeyword = 167;
     const FnKeyword = 168;
     const MatchKeyword = 169;
+    const IterableKeyword = 170;
 
     const OpenBracketToken = 201;
     const CloseBracketToken = 202;

src/TokenStringMaps.php

@@ -103,7 +103,8 @@ class TokenStringMaps {
         "integer" => TokenKind::IntegerReservedWord,
         "object" => TokenKind::ObjectReservedWord,
         "real" => TokenKind::RealReservedWord,
-        "void" => TokenKind::VoidReservedWord
+        "void" => TokenKind::VoidReservedWord,
+        "iterable" => TokenKind::IterableKeyword,
     ];
 
     const OPERATORS_AND_PUNCTUATORS = array(

tests/cases/parser74/arrowFunctionUnionTypes.php.tree

@@ -241,16 +241,8 @@
                                                 "visibilityToken": null,
                                                 "questionToken": null,
                                                 "typeDeclaration": {
-                                                    "QualifiedName": {
-                                                        "globalSpecifier": null,
-                                                        "relativeSpecifier": null,
-                                                        "nameParts": [
-                                                            {
-                                                                "kind": "Name",
-                                                                "textLength": 8
-                                                            }
-                                                        ]
-                                                    }
+                                                    "kind": "IterableKeyword",
+                                                    "textLength": 8
                                                 },
                                                 "otherTypeDeclarations": {
                                                     "QualifiedNameList": {
@@ -406,16 +398,8 @@
                                                 "visibilityToken": null,
                                                 "questionToken": null,
                                                 "typeDeclaration": {
-                                                    "QualifiedName": {
-                                                        "globalSpecifier": null,
-                                                        "relativeSpecifier": null,
-                                                        "nameParts": [
-                                                            {
-                                                                "kind": "Name",
-                                                                "textLength": 8
-                                                            }
-                                                        ]
-                                                    }
+                                                    "kind": "IterableKeyword",
+                                                    "textLength": 8
                                                 },
                                                 "otherTypeDeclarations": {
                                                     "QualifiedNameList": {
@@ -589,16 +573,8 @@
                                             "textLength": 1
                                         },
                                         {
-                                            "QualifiedName": {
-                                                "globalSpecifier": null,
-                                                "relativeSpecifier": null,
-                                                "nameParts": [
-                                                    {
-                                                        "kind": "Name",
-                                                        "textLength": 8
-                                                    }
-                                                ]
-                                            }
+                                            "kind": "IterableKeyword",
+                                            "textLength": 8
                                         }
                                     ]
                                 }