commit 04132371bb316b86bf1a43fd0e76f6388ef7d5fa
author Chris Lattner <sabre@nondot.org> Mon Oct 16 06:12:55 2006 +0000
committer Chris Lattner <sabre@nondot.org> Mon Oct 16 06:12:55 2006 +0000
tree 7d3662dcb823964c3fd2354da7ec9442c0cfae1f
parent af63531ac3be8d1e3ef96c879aadec182b4d6451

Make ConsumeFoo methods return the location of the consumed token.

llvm-svn: 38995

clang/Parse/ParseExpr.cpp

diff --git a/clang/Parse/ParseExpr.cpp b/clang/Parse/ParseExpr.cpp
index 77edcf9..f11f04e 100644
--- a/clang/Parse/ParseExpr.cpp
+++ b/clang/Parse/ParseExpr.cpp
@@ -582,8 +582,7 @@
     default:  // Not a postfix-expression suffix.
       return LHS;
     case tok::l_square: {  // postfix-expression: p-e '[' expression ']'
-      Loc = Tok.getLocation();
-      ConsumeBracket();
+      Loc = ConsumeBracket();
       ExprResult Idx = ParseExpression();
       
       SourceLocation RLoc = Tok.getLocation();
@@ -603,8 +602,7 @@
       SmallVector<SourceLocation, 8> CommaLocs;
       bool ArgExprsOk = true;
       
-      Loc = Tok.getLocation();
-      ConsumeParen();
+      Loc = ConsumeParen();
       
       if (Tok.getKind() != tok::r_paren) {
         while (1) {
@@ -729,8 +727,7 @@
     return ExprResult(true);
   }
   
-  SourceLocation LParenLoc = Tok.getLocation();
-  ConsumeParen();
+  SourceLocation LParenLoc = ConsumeParen();
   // TODO: Build AST.
 
   switch (T) {
@@ -769,8 +766,7 @@
           return ExprResult(true);
       } else if (Tok.getKind() == tok::l_square) {
         // offsetof-member-designator: offsetof-member-design '[' expression ']'
-        SourceLocation LSquareLoc = Tok.getLocation();
-        ConsumeBracket();
+        SourceLocation LSquareLoc = ConsumeBracket();
         Res = ParseExpression();
         if (Res.isInvalid) {
           SkipUntil(tok::r_paren);
@@ -831,8 +827,7 @@
                                                 TypeTy *&CastTy,
                                                 SourceLocation &RParenLoc) {
   assert(Tok.getKind() == tok::l_paren && "Not a paren expr!");
-  SourceLocation OpenLoc = Tok.getLocation();
-  ConsumeParen();
+  SourceLocation OpenLoc = ConsumeParen();
   ExprResult Result(false);
   CastTy = 0;
   
@@ -847,12 +842,10 @@
     TypeTy *Ty = ParseTypeName();
 
     // Match the ')'.
-    if (Tok.getKind() == tok::r_paren) {
-      RParenLoc = Tok.getLocation();
-      ConsumeParen();
-    } else {
+    if (Tok.getKind() == tok::r_paren)
+      RParenLoc = ConsumeParen();
+    else
       MatchRHSPunctuation(tok::r_paren, OpenLoc);
-    }
     
     if (Tok.getKind() == tok::l_brace) {
       if (!getLang().C99)   // Compound literals don't exist in C90.
@@ -882,12 +875,10 @@
   if (Result.isInvalid)
     SkipUntil(tok::r_paren);
   else {
-    if (Tok.getKind() == tok::r_paren) {
-      RParenLoc = Tok.getLocation();
-      ConsumeParen();
-    } else {
+    if (Tok.getKind() == tok::r_paren)
+      RParenLoc = ConsumeParen();
+    else
       MatchRHSPunctuation(tok::r_paren, OpenLoc);
-    }
   }
   
   return Result;