mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-28 03:36:06 +00:00
Code Issues Projects Releases Wiki Activity

Just do a diagIfAmbiguous -> warnIfAmbiguous rename.

Browse Source 
No functionality change.

llvm-svn: 57746
This commit is contained in:
Argyrios Kyrtzidis 2008-10-17 23:23:35 +00:00
parent 1ea1aa2cc1
commit 3a0558af9a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/include/clang/Parse/Parser.h
View File

@ -615,11 +615,11 @@ private:
/// isCXXFunctionDeclarator - Disambiguates between a function declarator or
/// a constructor-style initializer, when parsing declaration statements.
/// Returns true for function declarator and false for constructor-style
/// initializer. If 'diagIfAmbiguous' is true a warning will be emitted to
/// initializer. If 'warnIfAmbiguous' is true a warning will be emitted to
/// indicate that the parens were disambiguated as function declarator.
/// If during the disambiguation process a parsing error is encountered,
/// the function returns true to let the declaration parsing code handle it.
bool isCXXFunctionDeclarator(bool diagIfAmbiguous);
bool isCXXFunctionDeclarator(bool warnIfAmbiguous);
/// isCXXConditionDeclaration - Disambiguates between a declaration or an
/// expression for a condition of a if/switch/while/for statement.

4
clang/lib/Parse/ParseDecl.cpp
View File

@ -1228,12 +1228,12 @@ void Parser::ParseDirectDeclarator(Declarator &D) {
if (Tok.is(tok::l_paren)) {
// When not in file scope, warn for ambiguous function declarators, just
// in case the author intended it as a variable definition.
bool diagIfAmbiguous = D.getContext() != Declarator::FileContext;
bool warnIfAmbiguous = D.getContext() != Declarator::FileContext;
// The paren may be part of a C++ direct initializer, eg. "int x(1);".
// In such a case, check if we actually have a function declarator; if it
// is not, the declarator has been fully parsed.
if (getLang().CPlusPlus && D.mayBeFollowedByCXXDirectInit() &&
!isCXXFunctionDeclarator(diagIfAmbiguous))
!isCXXFunctionDeclarator(warnIfAmbiguous))
break;
ParseFunctionDeclarator(ConsumeParen(), D);
} else if (Tok.is(tok::l_square)) {

6
clang/lib/Parse/ParseTentative.cpp
View File

@ -453,7 +453,7 @@ Parser::TPResult Parser::TryParseDeclarator(bool mayBeAbstract,
// initializer that follows the declarator. Note that ctor-style
// initializers are not possible in contexts where abstract declarators
// are allowed.
if (!mayBeAbstract && !isCXXFunctionDeclarator(false/*diagIfAmbiguous*/))
if (!mayBeAbstract && !isCXXFunctionDeclarator(false/*warnIfAmbiguous*/))
break;
// direct-declarator '(' parameter-declaration-clause ')'
@ -722,7 +722,7 @@ Parser::TPResult Parser::TryParseDeclarationSpecifier() {
/// '(' parameter-declaration-clause ')' cv-qualifier-seq[opt]
/// exception-specification[opt]
///
bool Parser::isCXXFunctionDeclarator(bool diagIfAmbiguous) {
bool Parser::isCXXFunctionDeclarator(bool warnIfAmbiguous) {
// C++ 8.2p1:
// The ambiguity arising from the similarity between a function-style cast and
@ -750,7 +750,7 @@ bool Parser::isCXXFunctionDeclarator(bool diagIfAmbiguous) {
if (TPR == TPResult::Ambiguous()) {
// Function declarator has precedence over constructor-style initializer.
// Emit a warning just in case the author intended a variable definition.
if (diagIfAmbiguous)
if (warnIfAmbiguous)
Diag(Tok.getLocation(), diag::warn_parens_disambiguated_as_function_decl,
SourceRange(Tok.getLocation(), TPLoc));
return true;