commit dbb2a46915ab866bd458ac68cc2414ef7ae20b69
author Chris Lattner <sabre@nondot.org> Sat Aug 12 19:26:13 2006 +0000
committer Chris Lattner <sabre@nondot.org> Sat Aug 12 19:26:13 2006 +0000
tree f06d4b0a9532feed0d2c4096bde2f33f4b1e1e89
parent 1112435558442af3104ae8e1f52134196384d506

Add a new ExpectAndConsume method to make parsing easier, and add a new
ConsumeAnyToken method.

llvm-svn: 38894

clang/Parse/ParseExpr.cpp

diff --git a/clang/Parse/ParseExpr.cpp b/clang/Parse/ParseExpr.cpp
index 552e05a..adc1e4b 100644
--- a/clang/Parse/ParseExpr.cpp
+++ b/clang/Parse/ParseExpr.cpp
@@ -639,32 +639,22 @@
   case tok::kw___builtin_offsetof:
     ParseTypeName();
 
-    if (Tok.getKind() != tok::comma) {
-      Diag(Tok, diag::err_expected_comma);
-      SkipUntil(tok::r_paren);
+    if (ExpectAndConsume(tok::comma, diag::err_expected_comma, tok::r_paren))
       return ExprResult(true);
-    }
-    ConsumeToken();
     
     // We must have at least one identifier here.
-    if (Tok.getKind() != tok::identifier) {
-      Diag(Tok, diag::err_expected_ident);
-      SkipUntil(tok::r_paren);
+    if (ExpectAndConsume(tok::identifier, diag::err_expected_ident,
+                         tok::r_paren))
       return ExprResult(true);
-    }
-    ConsumeToken();
-    
+
     while (1) {
       if (Tok.getKind() == tok::period) {
         // offsetof-member-designator: offsetof-member-designator '.' identifier
         ConsumeToken();
         
-        if (Tok.getKind() != tok::identifier) {
-          Diag(Tok, diag::err_expected_ident);
-          SkipUntil(tok::r_paren);
+        if (ExpectAndConsume(tok::identifier, diag::err_expected_ident,
+                             tok::r_paren))
           return ExprResult(true);
-        }
-        ConsumeToken();
       } else if (Tok.getKind() == tok::l_square) {
         // offsetof-member-designator: offsetof-member-design '[' expression ']'
         SourceLocation LSquareLoc = Tok.getLocation();
@@ -685,33 +675,21 @@
   case tok::kw___builtin_choose_expr:
     Res = ParseAssignmentExpression();
     
-    if (Tok.getKind() != tok::comma) {
-      Diag(Tok, diag::err_expected_comma);
-      SkipUntil(tok::r_paren);
+    if (ExpectAndConsume(tok::comma, diag::err_expected_comma, tok::r_paren))
       return ExprResult(true);
-    }
-    ConsumeToken();
     
     Res = ParseAssignmentExpression();
     
-    if (Tok.getKind() != tok::comma) {
-      Diag(Tok, diag::err_expected_comma);
-      SkipUntil(tok::r_paren);
+    if (ExpectAndConsume(tok::comma, diag::err_expected_comma, tok::r_paren))
       return ExprResult(true);
-    }
-    ConsumeToken();
     
     Res = ParseAssignmentExpression();
     break;
   case tok::kw___builtin_types_compatible_p:
     ParseTypeName();
     
-    if (Tok.getKind() != tok::comma) {
-      Diag(Tok, diag::err_expected_comma);
-      SkipUntil(tok::r_paren);
+    if (ExpectAndConsume(tok::comma, diag::err_expected_comma, tok::r_paren))
       return ExprResult(true);
-    }
-    ConsumeToken();
     
     ParseTypeName();
     break;