[cfe-commits] r66983 - in /cfe/trunk: include/clang/Parse/Action.h lib/Parse/ParseDeclCXX.cpp

[Anders Carlsson]

Author: andersca
Date: Fri Mar 13 18:29:20 2009
New Revision: 66983

URL: http://llvm.org/viewvc/llvm-project?rev=66983&view=rev
Log:
Pass more sane arguments to ActOnStaticAssertDeclaration

Modified:
    cfe/trunk/include/clang/Parse/Action.h
    cfe/trunk/lib/Parse/ParseDeclCXX.cpp

Modified: cfe/trunk/include/clang/Parse/Action.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Action.h?rev=66983&r1=66982&r2=66983&view=diff

==============================================================================
--- cfe/trunk/include/clang/Parse/Action.h (original)
+++ cfe/trunk/include/clang/Parse/Action.h Fri Mar 13 18:29:20 2009
@@ -884,9 +884,8 @@
   virtual void ActOnFinishDelayedCXXMethodDeclaration(Scope *S, DeclTy *Method) {
   }
 
-  virtual DeclTy *ActOnStaticAssertDeclaration(SourceLocation LParenLoc, 
+  virtual DeclTy *ActOnStaticAssertDeclaration(SourceLocation AssertLoc, 
                                                ExprArg AssertExpr,
-                                               SourceLocation CommaLoc,
                                                ExprArg AssertMessageExpr,
                                                SourceLocation RParenLoc) {
     return 0;

Modified: cfe/trunk/lib/Parse/ParseDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDeclCXX.cpp?rev=66983&r1=66982&r2=66983&view=diff

==============================================================================
--- cfe/trunk/lib/Parse/ParseDeclCXX.cpp (original)
+++ cfe/trunk/lib/Parse/ParseDeclCXX.cpp Fri Mar 13 18:29:20 2009
@@ -239,14 +239,9 @@
     return 0;
   }
   
-  if (Tok.isNot(tok::comma)) {
-    Diag(Tok, diag::err_expected_comma);
-    SkipUntil(tok::semi);
+  if (ExpectAndConsume(tok::comma, diag::err_expected_comma, "", tok::semi))
     return 0;
-  }
-  
-  SourceLocation CommaLoc = ConsumeToken();
-  
+
   if (Tok.isNot(tok::string_literal)) {
     Diag(Tok, diag::err_expected_string_literal);
     SkipUntil(tok::semi);
@@ -261,8 +256,8 @@
   
   ExpectAndConsume(tok::semi, diag::err_expected_semi_after_static_assert);
 
-  return Actions.ActOnStaticAssertDeclaration(LParenLoc, move(AssertExpr), 
-                                              CommaLoc, move(AssertMessage), 
+  return Actions.ActOnStaticAssertDeclaration(StaticAssertLoc, move(AssertExpr), 
+                                              move(AssertMessage), 
                                               RParenLoc);
 }