From: Fariborz Jahanian Date: Fri, 6 Jul 2012 00:42:20 +0000 (+0000) Subject: Added a new memberfor Parser, to be used soon X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a10d9fcb5a207a519be95ff9281c3536f79cf03;p=clang Added a new memberfor Parser, to be used soon for doing delayed parsing of c++ method defined in objc class implementations. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@159792 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h index 66e8662aeb..b9414a4051 100644 --- a/include/clang/Parse/Parser.h +++ b/include/clang/Parse/Parser.h @@ -1045,6 +1045,7 @@ private: ParsingDeclSpec *DS = 0); bool isDeclarationAfterDeclarator(); bool isStartOfFunctionDefinition(const ParsingDeclarator &Declarator); + bool isStartOfDelayParsedFunctionDefinition(const ParsingDeclarator &Declarator); DeclGroupPtrTy ParseDeclarationOrFunctionDefinition( ParsedAttributesWithRange &attrs, ParsingDeclSpec *DS = 0, diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp index 4cc5fdeae0..0703133849 100644 --- a/lib/Parse/Parser.cpp +++ b/lib/Parse/Parser.cpp @@ -797,6 +797,27 @@ bool Parser::isStartOfFunctionDefinition(const ParsingDeclarator &Declarator) { Tok.is(tok::kw_try); // X() try { ... } } +/// \brief Determine whether the current token, if it occurs after a +/// a function declarator, indicates the start of a function definition +/// inside an objective-C class implementation and thus can be delay parsed. +bool Parser::isStartOfDelayParsedFunctionDefinition( + const ParsingDeclarator &Declarator) { + if (!CurParsedObjCImpl || + !Declarator.isFunctionDeclarator()) + return false; + if (Tok.is(tok::l_brace)) // int X() {} + return true; + + // Handle K&R C argument lists: int X(f) int f; {} + if (!getLangOpts().CPlusPlus && + Declarator.getFunctionTypeInfo().isKNRPrototype()) + return isDeclarationSpecifier(); + + return getLangOpts().CPlusPlus && + (Tok.is(tok::colon) || // X() : Base() {} (used for ctors) + Tok.is(tok::kw_try)); // X() try { ... } +} + /// ParseDeclarationOrFunctionDefinition - Parse either a function-definition or /// a declaration. We can't tell which we have until we read up to the /// compound-statement in function-definition. TemplateParams, if