diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2012-08-10 18:10:56 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2012-08-10 18:10:56 +0000 |
| commit | 2eb362b50f34296c39d5ec3e5e1bd6a2c9a5877e (patch) | |
| tree | f4f0e21876c7c2c414ed874cd5b7b15f6c91a9fb /lib/Parse/ParseObjc.cpp | |
| parent | 1093f4928a4263d08b44d96e468a42515d8a28f3 (diff) | |
objective-C++: delayed parsing of member function with
function-try-block occuring in objc's implementation
block. wip.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@161675 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseObjc.cpp')
| -rw-r--r-- | lib/Parse/ParseObjc.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp index 70254b6db6..9b7e85f211 100644 --- a/lib/Parse/ParseObjc.cpp +++ b/lib/Parse/ParseObjc.cpp @@ -1927,11 +1927,19 @@ void Parser::StashAwayMethodOrFunctionBodyTokens(Decl *MDecl) { LexedMethod* LM = new LexedMethod(this, MDecl); CurParsedObjCImpl->LateParsedObjCMethods.push_back(LM); CachedTokens &Toks = LM->Toks; - // Begin by storing the '{' token. + // Begin by storing the '{' or 'try' token. Toks.push_back(Tok); + if (Tok.is(tok::kw_try)) { + ConsumeToken(); + Toks.push_back(Tok); // also store '{' + } ConsumeBrace(); // Consume everything up to (and including) the matching right brace. ConsumeAndStoreUntil(tok::r_brace, Toks, /*StopAtSemi=*/false); + while (Tok.is(tok::kw_catch)) { + ConsumeAndStoreUntil(tok::l_brace, Toks, /*StopAtSemi=*/false); + ConsumeAndStoreUntil(tok::r_brace, Toks, /*StopAtSemi=*/false); + } } /// objc-method-def: objc-method-proto ';'[opt] '{' body '}' @@ -2863,7 +2871,8 @@ void Parser::ParseLexedObjCMethodDefs(LexedMethod &LM, bool parseMethod) { // Consume the previously pushed token. ConsumeAnyToken(); - assert(Tok.is(tok::l_brace) && "Inline objective-c method not starting with '{'"); + assert((Tok.is(tok::l_brace) || Tok.is(tok::kw_try)) && + "Inline objective-c method not starting with '{' or 'try'"); // Enter a scope for the method or c-fucntion body. ParseScope BodyScope(this, parseMethod @@ -2876,8 +2885,10 @@ void Parser::ParseLexedObjCMethodDefs(LexedMethod &LM, bool parseMethod) { Actions.ActOnStartOfObjCMethodDef(getCurScope(), MCDecl); else Actions.ActOnStartOfFunctionDef(getCurScope(), MCDecl); - - MCDecl = ParseFunctionStatementBody(MCDecl, BodyScope); + if (Tok.is(tok::kw_try)) + MCDecl = ParseFunctionTryBlock(MCDecl, BodyScope); + else + MCDecl = ParseFunctionStatementBody(MCDecl, BodyScope); if (Tok.getLocation() != OrigLoc) { // Due to parsing error, we either went over the cached tokens or |