Deprecate IterableKeyword in favor of IterableReservedWord

dantleech · dantleech · commit 55436ce6b858 · 2020-12-23T15:56:32.000Z
diff --git a/src/Parser.php b/src/Parser.php
@@ -142,7 +142,7 @@ public function __construct() {
             [TokenKind::ArrayKeyword, TokenKind::CallableKeyword, TokenKind::BoolReservedWord,
             TokenKind::FloatReservedWord, TokenKind::IntReservedWord, TokenKind::StringReservedWord,
             TokenKind::ObjectReservedWord, TokenKind::NullReservedWord, TokenKind::FalseReservedWord,
-            TokenKind::IterableKeyword, TokenKind::MixedReservedWord]; // TODO update spec
+            TokenKind::IterableReservedWord, TokenKind::MixedReservedWord]; // TODO update spec
         $this->returnTypeDeclarationTokens = \array_merge([TokenKind::VoidReservedWord, TokenKind::NullReservedWord, TokenKind::FalseReservedWord, TokenKind::StaticKeyword], $this->parameterTypeDeclarationTokens);
     }
 
diff --git a/src/TokenKind.php b/src/TokenKind.php
@@ -87,7 +87,7 @@ class TokenKind {
     const YieldFromKeyword = 167;
     const FnKeyword = 168;
     const MatchKeyword = 169;
-    const IterableKeyword = 170;
+    /** @deprecated use IterableReservedWord */const IterableKeyword = 170;
 
     const OpenBracketToken = 201;
     const CloseBracketToken = 202;
@@ -171,6 +171,7 @@ class TokenKind {
     const BoolReservedWord = 321;
     const NullReservedWord = 322;
     const MixedReservedWord = 420;
+    const IterableReservedWord = 170;
 
     const ScriptSectionStartTag = 323;
     const ScriptSectionEndTag = 324;
diff --git a/src/TokenStringMaps.php b/src/TokenStringMaps.php
@@ -104,7 +104,7 @@ class TokenStringMaps {
         "object" => TokenKind::ObjectReservedWord,
         "real" => TokenKind::RealReservedWord,
         "void" => TokenKind::VoidReservedWord,
-        "iterable" => TokenKind::IterableKeyword,
+        "iterable" => TokenKind::IterableReservedWord,
         "mixed" => TokenKind::MixedReservedWord,
     ];
 
diff --git a/tests/cases/parser74/arrowFunctionUnionTypes.php.tree b/tests/cases/parser74/arrowFunctionUnionTypes.php.tree
@@ -241,7 +241,7 @@
                                                 "visibilityToken": null,
                                                 "questionToken": null,
                                                 "typeDeclaration": {
-                                                    "kind": "IterableKeyword",
+                                                    "kind": "IterableReservedWord",
                                                     "textLength": 8
                                                 },
                                                 "otherTypeDeclarations": {
@@ -398,7 +398,7 @@
                                                 "visibilityToken": null,
                                                 "questionToken": null,
                                                 "typeDeclaration": {
-                                                    "kind": "IterableKeyword",
+                                                    "kind": "IterableReservedWord",
                                                     "textLength": 8
                                                 },
                                                 "otherTypeDeclarations": {
@@ -573,7 +573,7 @@
                                             "textLength": 1
                                         },
                                         {
-                                            "kind": "IterableKeyword",
+                                            "kind": "IterableReservedWord",
                                             "textLength": 8
                                         }
                                     ]

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public function __construct() {`
`142`	`142`	`[TokenKind::ArrayKeyword, TokenKind::CallableKeyword, TokenKind::BoolReservedWord,`
`143`	`143`	`TokenKind::FloatReservedWord, TokenKind::IntReservedWord, TokenKind::StringReservedWord,`
`144`	`144`	`TokenKind::ObjectReservedWord, TokenKind::NullReservedWord, TokenKind::FalseReservedWord,`
`145`		`- TokenKind::IterableKeyword, TokenKind::MixedReservedWord]; // TODO update spec`
	`145`	`+ TokenKind::IterableReservedWord, TokenKind::MixedReservedWord]; // TODO update spec`
`146`	`146`	`$this->returnTypeDeclarationTokens = \array_merge([TokenKind::VoidReservedWord, TokenKind::NullReservedWord, TokenKind::FalseReservedWord, TokenKind::StaticKeyword], $this->parameterTypeDeclarationTokens);`
`147`	`147`	`}`
`148`	`148`