averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5909 from rintaro/parse-reject-throws-identifier

Browse Source
This commit is contained in:
swift-ci
2016-11-23 19:08:03 -08:00
committed by GitHub
parent 241abfaaee a1760161c5
commit 1e4bf0f2d3
7 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/swift/Parse/Parser.h
View File

@@ -19,12 +19,13 @@
#include "swift/AST/AST.h"
#include "swift/AST/DiagnosticsParse.h"
#include "swift/Basic/Fallthrough.h"
#include "swift/Basic/OptionSet.h"
#include "swift/Parse/Lexer.h"
#include "swift/Parse/LocalContext.h"
#include "swift/Parse/PersistentParserState.h"
#include "swift/Parse/Token.h"
#include "swift/Parse/ParserResult.h"
#include "swift/Basic/OptionSet.h"
#include "swift/Config.h"
#include "llvm/ADT/SetVector.h"
@@ -398,7 +399,8 @@ public:
}
SourceLoc consumeIdentifier(Identifier *Result = nullptr) {
assert(Tok.isAny(tok::identifier, tok::kw_self, tok::kw_Self, tok::kw_throws));
assert(Tok.isAny(tok::identifier, tok::kw_self, tok::kw_Self,
/* for Swift3 */tok::kw_throws, tok::kw_rethrows));
if (Result)
*Result = Context.getIdentifier(Tok.getText());
return consumeToken();