[cfe-commits] r38895 - in /cfe/cfe/trunk/Parse: ParseDecl.cpp ParseExpr.cpp

[sabre at cs.uiuc.edu]

Author: sabre
Date: Wed Jul 11 11:25:33 2007
New Revision: 38895

URL: http://llvm.org/viewvc/llvm-project?rev=38895&view=rev
Log:
Use ExpectAndConsume more

Modified:
    cfe/cfe/trunk/Parse/ParseDecl.cpp
    cfe/cfe/trunk/Parse/ParseExpr.cpp

Modified: cfe/cfe/trunk/Parse/ParseDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/Parse/ParseDecl.cpp?rev=38895&r1=38894&r2=38895&view=diff

==============================================================================
--- cfe/cfe/trunk/Parse/ParseDecl.cpp (original)
+++ cfe/cfe/trunk/Parse/ParseDecl.cpp Wed Jul 11 11:25:33 2007
@@ -607,16 +607,10 @@
       // Eat the comma.
       ConsumeToken();
       
-      if (Tok.getKind() != tok::identifier) {
-        // If not identifier, diagnose the error.
-        Diag(Tok, diag::err_expected_ident);
+      if (ExpectAndConsume(tok::identifier, diag::err_expected_ident)) {
         ErrorEmitted = true;
         break;
       }
-
-      // Eat the id.
-      // TODO: remember it!
-      ConsumeToken();
     }
     
     // K&R 'prototype'.

Modified: cfe/cfe/trunk/Parse/ParseExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/Parse/ParseExpr.cpp?rev=38895&r1=38894&r2=38895&view=diff

==============================================================================
--- cfe/cfe/trunk/Parse/ParseExpr.cpp (original)
+++ cfe/cfe/trunk/Parse/ParseExpr.cpp Wed Jul 11 11:25:33 2007
@@ -576,9 +576,8 @@
   ConsumeToken();
   
   // If the operand doesn't start with an '(', it must be an expression.
-  if (Tok.getKind() != tok::l_paren) {
+  if (Tok.getKind() != tok::l_paren)
     return ParseCastExpression(true);
-  }
   
   // If it starts with a '(', we know that it is either a parenthesized
   // type-name, or it is a unary-expression that starts with a compound literal,
@@ -626,13 +625,10 @@
       SkipUntil(tok::r_paren);
       return Res;
     }
-    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;