Revert "Refactor: Rename Parser::consumeToken, consumeLoc. Add consumeToken API."

This reverts commit 39bfc12.

Author: bitjammer

include/swift/Parse/Parser.h

@@ -321,10 +321,10 @@ class Parser {
   void restoreParserPosition(ParserPosition PP) {
     L->restoreState(PP.LS);
 
-    // We might be at tok::eof now, so ensure that consumeLoc()
+    // We might be at tok::eof now, so ensure that consumeToken()
     // does not assert about lexing past eof.
     Tok = syntax::Token::unknown();
-    consumeLoc();
+    consumeToken();
 
     PreviousLoc = PP.PreviousLoc;
   }
@@ -334,10 +334,10 @@ class Parser {
 
     L->backtrackToState(PP.LS);
 
-    // We might be at tok::eof now, so ensure that consumeLoc()
+    // We might be at tok::eof now, so ensure that consumeToken()
     // does not assert about lexing past eof.
     Tok = syntax::Token::unknown();
-    consumeLoc();
+    consumeToken();
 
     PreviousLoc = PP.PreviousLoc;
   }
@@ -386,22 +386,21 @@ class Parser {
   //===--------------------------------------------------------------------===//
   // Utilities
 
-  /// \brief Return the next token that will be installed by \c consumeLoc.
+  /// \brief Return the next token that will be installed by \c consumeToken.
   const syntax::Token &peekToken();
 
-  syntax::Token consumeToken();
-  SourceLoc consumeLoc();
-  SourceLoc consumeLoc(tok K) {
+  SourceLoc consumeToken();
+  SourceLoc consumeToken(tok K) {
     assert(Tok.is(K) && "Consuming wrong token kind");
-    return consumeLoc();
+    return consumeToken();
   }
 
   SourceLoc consumeIdentifier(Identifier *Result = nullptr) {
     assert(Tok.isAny(tok::identifier, tok::kw_self,
                      tok::kw_Self, tok::kw_throws));
     if (Result)
       *Result = Context.getIdentifier(Tok.getText().str());
-    return consumeLoc();
+    return consumeToken();
   }
 
   /// \brief Retrieve the location just past the end of the previous
@@ -412,15 +411,15 @@ class Parser {
   /// return true.  Otherwise, return false without consuming it.
   bool consumeIf(tok K) {
     if (Tok.isNot(K)) return false;
-    consumeLoc(K);
+    consumeToken(K);
     return true;
   }
 
   /// \brief If the current token is the specified kind, consume it and
   /// return true.  Otherwise, return false without consuming it.
   bool consumeIf(tok K, SourceLoc &consumedLoc) {
     if (Tok.isNot(K)) return false;
-    consumedLoc = consumeLoc(K);
+    consumedLoc = consumeToken(K);
     return true;
   }