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/ParseStmt.cpp

diff --git a/clang/Parse/ParseStmt.cpp b/clang/Parse/ParseStmt.cpp
index 83f4488..5e1feac 100644
--- a/clang/Parse/ParseStmt.cpp
+++ b/clang/Parse/ParseStmt.cpp
@@ -362,8 +362,7 @@
 ///
 Parser::StmtResult Parser::ParseCompoundStatement() {
   assert(Tok.getKind() == tok::l_brace && "Not a compount stmt!");
-  SourceLocation LBraceLoc = Tok.getLocation();
-  ConsumeBrace();  // eat the '{'.
+  SourceLocation LBraceLoc = ConsumeBrace();  // eat the '{'.
   
   SmallVector<StmtTy*, 32> Stmts;
   while (Tok.getKind() != tok::r_brace && Tok.getKind() != tok::eof) {
@@ -378,8 +377,7 @@
     return 0;
   }
 
-  SourceLocation RBraceLoc = Tok.getLocation();
-  ConsumeBrace();
+  SourceLocation RBraceLoc = ConsumeBrace();
   return Actions.ParseCompoundStmt(LBraceLoc, RBraceLoc,
                                    &Stmts[0], Stmts.size());
 }
@@ -519,8 +517,7 @@
     return true;
   }
 
-  SourceLocation LParenLoc = Tok.getLocation();
-  ConsumeParen();
+  SourceLocation LParenLoc = ConsumeParen();
   
   ExprResult Value;
   
@@ -661,8 +658,7 @@
     SkipUntil(tok::r_paren);
     return true;
   }
-  Loc = Tok.getLocation();
-  ConsumeParen();
+  Loc = ConsumeParen();
   
   ParseAsmStringLiteral();
   
@@ -717,8 +713,7 @@
   while (1) {
     // Read the [id] if present.
     if (Tok.getKind() == tok::l_square) {
-      SourceLocation Loc = Tok.getLocation();
-      ConsumeBracket();
+      SourceLocation Loc = ConsumeBracket();
       
       if (Tok.getKind() != tok::identifier) {
         Diag(Tok, diag::err_expected_ident);