commit 8da0c28d35fe3d613b5b10389ece5214160c2db0
author Chris Lattner <clattner@google.com> Fri Jun 29 11:15:56 2018 -0700
committer jpienaar <jpienaar@google.com> Fri Mar 29 12:27:07 2019 -0700
tree dfa87b64c429ba43e1c88b2fa2ca8facd91c3d2d
parent ed65a73a07f09ba344f53c5f7719c39c315c010d

Refactor information about tokens out into a new TokenKinds.def file.  Use this
to share code a bit more, and fixes a diagnostic bug Uday pointed out where
parseCommaSeparatedList would print the wrong diagnostic when the end signifier
was not a ).

PiperOrigin-RevId: 202676858

lib/Parser/Parser.cpp

diff --git a/lib/Parser/Parser.cpp b/lib/Parser/Parser.cpp
index c36d3b9..c62ee5d 100644
--- a/lib/Parser/Parser.cpp
+++ b/lib/Parser/Parser.cpp
@@ -94,21 +94,21 @@
   /// Advance the current lexer onto the next token, asserting what the expected
   /// current token is.  This is preferred to the above method because it leads
   /// to more self-documenting code with better checking.
-  void consumeToken(Token::TokenKind kind) {
+  void consumeToken(Token::Kind kind) {
     assert(curToken.is(kind) && "consumed an unexpected token");
     consumeToken();
   }
 
   /// If the current token has the specified kind, consume it and return true.
   /// If not, return false.
-  bool consumeIf(Token::TokenKind kind) {
+  bool consumeIf(Token::Kind kind) {
     if (curToken.isNot(kind))
       return false;
     consumeToken(kind);
     return true;
   }
 
-  ParseResult parseCommaSeparatedList(Token::TokenKind rightToken,
+  ParseResult parseCommaSeparatedList(Token::Kind rightToken,
                                const std::function<ParseResult()> &parseElement,
                                       bool allowEmptyList = true);
 
@@ -169,7 +169,7 @@
 ///   abstract-list ::= element (',' element)* rightToken
 ///
 ParseResult Parser::
-parseCommaSeparatedList(Token::TokenKind rightToken,
+parseCommaSeparatedList(Token::Kind rightToken,
                         const std::function<ParseResult()> &parseElement,
                         bool allowEmptyList) {
   // Handle the empty case.
@@ -192,7 +192,8 @@
 
   // Consume the end character.
   if (!consumeIf(rightToken))
-    return emitError("expected ',' or ')'");
+    return emitError("expected ',' or '" + Token::getTokenSpelling(rightToken) +
+                     "'");
 
   return ParseSuccess;
 }
@@ -487,7 +488,7 @@
 ///  dim-size ::= affine-expr | `min` `(` affine-expr ( `,` affine-expr)+ `)`
 ///
 ParseResult Parser::parseAffineMapDef() {
-  assert(curToken.is(Token::affine_map_id));
+  assert(curToken.is(Token::affine_map_identifier));
 
   StringRef affineMapId = curToken.getSpelling().drop_front();
   // Check that 'affineMapId' is unique.
@@ -495,7 +496,7 @@
   if (affineMaps.count(affineMapId) > 0)
     return emitError("redefinition of affine map id '" + affineMapId + "'");
 
-  consumeToken(Token::affine_map_id);
+  consumeToken(Token::affine_map_identifier);
 
   // TODO(andydavis,bondhugula) Parse affine map definition.
   affineMaps[affineMapId].reset(new AffineMap(1, 0));
@@ -829,7 +830,7 @@
     case Token::kw_cfgfunc:
       if (parseCFGFunc()) return nullptr;
       break;
-    case Token::affine_map_id:
+    case Token::affine_map_identifier:
       if (parseAffineMapDef()) return nullptr;
       break;