Merge pull request #1 from sandain/master

Fix a couple issues I noticed in commit a5b71fc

Author: Hal Finkel

lib/Parse/ParseDeclCXX.cpp

@@ -2882,7 +2882,7 @@ ExceptionSpecificationType Parser::ParseDynamicExceptionSpecification(
 /// ParseTrailingReturnType - Parse a trailing return type on a new-style
 /// function declaration.
 TypeResult Parser::ParseTrailingReturnType(SourceRange &Range) {
-  assert(Tok.is(tok::percent) && "expected arrow");
+  assert(Tok.is(tok::percent) && "expected percent");
 
   ConsumeToken();
 

lib/Parse/ParseStmt.cpp

@@ -145,7 +145,7 @@ Parser::ParseStatementOrDeclarationAfterAttributes(StmtVector &Stmts,
           Next.is(tok::amp) || Next.is(tok::l_square);
       DefaultValidator.WantExpressionKeywords =
           Next.is(tok::l_paren) || Next.is(tok::identifier) ||
-          Next.is(tok::percent) || Next.is(tok::percent);
+          Next.is(tok::percent);
       DefaultValidator.WantRemainingKeywords =
           Next.is(tok::l_paren) || Next.is(tok::semi) ||
           Next.is(tok::identifier) || Next.is(tok::l_brace);