diff options
author | Chris Lattner <sabre@nondot.org> | 2009-12-06 18:34:27 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2009-12-06 18:34:27 +0000 |
commit | 8c56c49fe0d8a5a4725cc7321bd47b21aa964588 (patch) | |
tree | 74a9c79962ebb5ee475f037b583744a3c20eb5b3 /clang/lib/Parse/Parser.cpp | |
parent | 3efc6e6f469f0f037d0ecff90fe64aaf156d2a78 (diff) | |
download | bcm5719-llvm-8c56c49fe0d8a5a4725cc7321bd47b21aa964588.tar.gz bcm5719-llvm-8c56c49fe0d8a5a4725cc7321bd47b21aa964588.zip |
simplify logic.
llvm-svn: 90712
Diffstat (limited to 'clang/lib/Parse/Parser.cpp')
-rw-r--r-- | clang/lib/Parse/Parser.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp index 8e6e0feb129..ca425e8b052 100644 --- a/clang/lib/Parse/Parser.cpp +++ b/clang/lib/Parse/Parser.cpp @@ -507,12 +507,13 @@ bool Parser::isDeclarationAfterDeclarator() { /// \brief Determine whether the current token, if it occurs after a /// declarator, indicates the start of a function definition. bool Parser::isStartOfFunctionDefinition() { - return Tok.is(tok::l_brace) || // int X() {} - (!getLang().CPlusPlus && - isDeclarationSpecifier()) || // int X(f) int f; {} - (getLang().CPlusPlus && - (Tok.is(tok::colon) || // X() : Base() {} (used for ctors) - Tok.is(tok::kw_try))); // X() try { ... } + if (Tok.is(tok::l_brace)) // int X() {} + return true; + + if (!getLang().CPlusPlus) + return isDeclarationSpecifier(); // int X(f) int f; {} + return Tok.is(tok::colon) || // X() : Base() {} (used for ctors) + Tok.is(tok::kw_try); // X() try { ... } } /// ParseDeclarationOrFunctionDefinition - Parse either a function-definition or |