Eliminate PeekToken overload

Author: slozier

src/core/IronPython/Compiler/Parser.cs

@@ -2340,7 +2340,7 @@ private IReadOnlyList<Node> FinishArgListOrGenExpr() {
 
                 if (MaybeEat(TokenKind.Assign)) {               //  Keyword argument
                     a = FinishKeywordArgument(e);
-                } else if (PeekToken(Tokens.KeywordForToken)) {    //  Generator expression
+                } else if (PeekToken(TokenKind.KeywordFor)) {    //  Generator expression
                     a = ParseGeneratorExpression(e);
                     Eat(TokenKind.RightParenthesis);
                     a.SetLoc(_globalParent, start, GetEnd());
@@ -2599,7 +2599,7 @@ private Expression FinishTupleOrGenExp() {
                     if (MaybeEat(TokenKind.Comma)) {
                         // "(" expression "," ...
                         ret = FinishExpressionListAsExpr(expr);
-                    } else if (PeekToken(Tokens.KeywordForToken)) {
+                    } else if (PeekToken(TokenKind.KeywordFor)) {
                         // "(" expression "for" ...
                         if (expr is StarredExpression) ReportSyntaxError(expr.StartIndex, expr.EndIndex, "iterable unpacking cannot be used in comprehension");
                         ret = ParseGeneratorExpression(expr);
@@ -2634,9 +2634,9 @@ private Expression ParseGeneratorExpression(Expression expr) {
             Statement current = root;
 
             for (; ; ) {
-                if (PeekToken(Tokens.KeywordForToken)) {
+                if (PeekToken(TokenKind.KeywordFor)) {
                     current = NestGenExpr(current, ParseGenExprFor());
-                } else if (PeekToken(Tokens.KeywordIfToken)) {
+                } else if (PeekToken(TokenKind.KeywordIf)) {
                     current = NestGenExpr(current, ParseGenExprIf());
                 } else {
                     // Generator Expressions have an implicit function definition and yield around their expression.
@@ -2754,7 +2754,7 @@ private Expression FinishDictOrSetValue() {
                         }
                         var expr = ParseStarExpr();
 
-                        if (PeekToken(Tokens.KeywordForToken)) {
+                        if (PeekToken(TokenKind.KeywordFor)) {
                             if (!first) ReportSyntaxError("invalid syntax");
                         }
 
@@ -2770,7 +2770,7 @@ private Expression FinishDictOrSetValue() {
                             }
                             Expression e2 = ParseTest();
 
-                            if (PeekToken(Tokens.KeywordForToken)) {
+                            if (PeekToken(TokenKind.KeywordFor)) {
                                 if (!first) {
                                     ReportSyntaxError("invalid syntax");
                                 }
@@ -2788,7 +2788,7 @@ private Expression FinishDictOrSetValue() {
                                 first = true;
                             }
 
-                            if (PeekToken(Tokens.KeywordForToken)) {
+                            if (PeekToken(TokenKind.KeywordFor)) {
                                 if (!first) {
                                     ReportSyntaxError("invalid syntax");
                                 }
@@ -2876,9 +2876,9 @@ private ComprehensionIterator[] ParseCompIter() {
             iters.Add(firstFor);
 
             while (true) {
-                if (PeekToken(Tokens.KeywordForToken)) {
+                if (PeekToken(TokenKind.KeywordFor)) {
                     iters.Add(ParseCompFor());
-                } else if (PeekToken(Tokens.KeywordIfToken)) {
+                } else if (PeekToken(TokenKind.KeywordIf)) {
                     iters.Add(ParseCompIf());
                 } else {
                     break;
@@ -2934,7 +2934,7 @@ private Expression FinishListValue() {
                     // (comp_for | (',' (test|star_expr))* [','] )
 
                     // comp_for
-                    if (PeekToken(Tokens.KeywordForToken)) {
+                    if (PeekToken(TokenKind.KeywordFor)) {
                         // although it's calling ParseCompIter(), because the peek token is a FOR it is going to
                         // do the right thing.
                         if (expr is StarredExpression) ReportSyntaxError(expr.StartIndex, expr.EndIndex, "iterable unpacking cannot be used in comprehension");
@@ -3177,7 +3177,7 @@ private PythonAst ParseFileWorker(bool makeModule, bool returnValue) {
 
             // from __future__
             if (_fromFutureAllowed) {
-                while (PeekToken(Tokens.KeywordFromToken)) {
+                while (PeekToken(TokenKind.KeywordFrom)) {
                     Statement s = ParseStmt();
                     l.Add(s);
                     if (s is FromImportStatement fis && !fis.IsFromFuture) {
@@ -3417,10 +3417,6 @@ private bool PeekToken(TokenKind kind) {
             return PeekToken().Kind == kind;
         }
 
-        private bool PeekToken(Token check) {
-            return PeekToken() == check;
-        }
-
         private bool Eat(TokenKind kind) {
             Token next = PeekToken();
             if (next.Kind != kind) {