diff options
| -rw-r--r-- | src/libs/cplusplus/CheckUndefinedSymbols.cpp | 372 | ||||
| -rw-r--r-- | src/libs/cplusplus/CheckUndefinedSymbols.h | 91 | ||||
| -rw-r--r-- | src/libs/cplusplus/cplusplus-lib.pri | 2 | ||||
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 351 |
4 files changed, 467 insertions, 349 deletions
diff --git a/src/libs/cplusplus/CheckUndefinedSymbols.cpp b/src/libs/cplusplus/CheckUndefinedSymbols.cpp new file mode 100644 index 0000000000..bf2c201bb6 --- /dev/null +++ b/src/libs/cplusplus/CheckUndefinedSymbols.cpp @@ -0,0 +1,372 @@ +/************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** Commercial Usage +** +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** +**************************************************************************/ + +#include "CheckUndefinedSymbols.h" +#include "Overview.h" + +#include <Names.h> +#include <Literals.h> +#include <Symbols.h> +#include <TranslationUnit.h> +#include <Scope.h> +#include <AST.h> + +using namespace CPlusPlus; + + +CheckUndefinedSymbols::CheckUndefinedSymbols(Document::Ptr doc) + : ASTVisitor(doc->control()), _doc(doc) +{ } + +CheckUndefinedSymbols::~CheckUndefinedSymbols() +{ } + +void CheckUndefinedSymbols::setGlobalNamespaceBinding(NamespaceBindingPtr globalNamespaceBinding) +{ + _globalNamespaceBinding = globalNamespaceBinding; + _types.clear(); + + if (_globalNamespaceBinding) { + QSet<NamespaceBinding *> processed; + buildTypeMap(_globalNamespaceBinding.data(), &processed); + } +} + +void CheckUndefinedSymbols::operator()(AST *ast) +{ accept(ast); } + +void CheckUndefinedSymbols::addType(Name *name) +{ + if (! name) + return; + + if (Identifier *id = name->identifier()) + _types.insert(QByteArray(id->chars(), id->size())); +} + +void CheckUndefinedSymbols::buildTypeMap(Class *klass) +{ + addType(klass->name()); + + for (unsigned i = 0; i < klass->memberCount(); ++i) { + Symbol *member = klass->memberAt(i); + + if (Class *klass = member->asClass()) { + buildTypeMap(klass); + } else if (Enum *e = member->asEnum()) { + addType(e->name()); + } else if (ForwardClassDeclaration *fwd = member->asForwardClassDeclaration()) { + addType(fwd->name()); + } else if (Declaration *decl = member->asDeclaration()) { + if (decl->isTypedef()) + addType(decl->name()); + } + } +} + +void CheckUndefinedSymbols::buildTypeMap(NamespaceBinding *binding, QSet<NamespaceBinding *> *processed) +{ + if (! processed->contains(binding)) { + processed->insert(binding); + + if (Identifier *id = binding->identifier()) { + _namespaceNames.insert(QByteArray(id->chars(), id->size())); + } + + foreach (Namespace *ns, binding->symbols) { + for (unsigned i = 0; i < ns->memberCount(); ++i) { + Symbol *member = ns->memberAt(i); + + if (Class *klass = member->asClass()) { + buildTypeMap(klass); + } else if (Enum *e = member->asEnum()) { + addType(e->name()); + } else if (ForwardClassDeclaration *fwd = member->asForwardClassDeclaration()) { + addType(fwd->name()); + } else if (Declaration *decl = member->asDeclaration()) { + if (decl->isTypedef()) + addType(decl->name()); + } + } + } + + foreach (NamespaceBinding *childBinding, binding->children) { + buildTypeMap(childBinding, processed); + } + } +} + +FunctionDeclaratorAST *CheckUndefinedSymbols::currentFunctionDeclarator() const +{ + if (functionDeclarationStack.isEmpty()) + return 0; + + return functionDeclarationStack.last(); +} + +bool CheckUndefinedSymbols::visit(FunctionDeclaratorAST *ast) +{ + functionDeclarationStack.append(ast); + + return true; +} + +void CheckUndefinedSymbols::endVisit(FunctionDeclaratorAST *) +{ + functionDeclarationStack.removeLast(); +} + +bool CheckUndefinedSymbols::visit(TypeofSpecifierAST *ast) +{ + accept(ast->next); + return false; +} + +bool CheckUndefinedSymbols::visit(TypenameTypeParameterAST *ast) +{ + if (NameAST *nameAst = ast->name) + addType(nameAst->name); + + return true; +} + +bool CheckUndefinedSymbols::visit(TemplateTypeParameterAST *ast) +{ + if (ast->name) + addType(ast->name->name); + + return true; +} + +bool CheckUndefinedSymbols::visit(NamedTypeSpecifierAST *ast) +{ + if (ast->name) { + if (! ast->name->name) { + unsigned line, col; + getTokenStartPosition(ast->firstToken(), &line, &col); + // qWarning() << _doc->fileName() << line << col; + } else if (Identifier *id = ast->name->name->identifier()) { + if (! _types.contains(QByteArray::fromRawData(id->chars(), id->size()))) { + if (FunctionDeclaratorAST *functionDeclarator = currentFunctionDeclarator()) { + if (functionDeclarator->as_cpp_initializer) + return true; + } + + Overview oo; + translationUnit()->warning(ast->firstToken(), "`%s' is not a type name", + qPrintable(oo(ast->name->name))); + } + } + } + return true; +} + +bool CheckUndefinedSymbols::visit(ClassSpecifierAST *ast) +{ + if (ast->base_clause) { + unsigned line, col; + getTokenStartPosition(ast->firstToken(), &line, &col); + } + + bool hasQ_OBJECT_CHECK = false; + + if (ast->symbol) { + Class *klass = ast->symbol->asClass(); + + for (unsigned i = 0; i < klass->memberCount(); ++i) { + Symbol *symbol = klass->memberAt(i); + + if (symbol->name() && symbol->name()->isNameId()) { + NameId *nameId = symbol->name()->asNameId(); + + if (! qstrcmp(nameId->identifier()->chars(), "qt_check_for_QOBJECT_macro")) { + hasQ_OBJECT_CHECK = true; + break; + } + } + } + } + + _qobjectStack.append(hasQ_OBJECT_CHECK); + + return true; +} + +void CheckUndefinedSymbols::endVisit(ClassSpecifierAST *) +{ _qobjectStack.removeLast(); } + +bool CheckUndefinedSymbols::qobjectCheck() const +{ + if (_qobjectStack.isEmpty()) + return false; + + return _qobjectStack.last(); +} + +bool CheckUndefinedSymbols::visit(FunctionDefinitionAST *ast) +{ + if (ast->symbol) { + Function *fun = ast->symbol->asFunction(); + if ((fun->isSignal() || fun->isSlot()) && ! qobjectCheck()) { + translationUnit()->warning(ast->firstToken(), + "you forgot the Q_OBJECT macro"); + } + } + return true; +} + +bool CheckUndefinedSymbols::visit(SimpleDeclarationAST *ast) +{ + const bool check = qobjectCheck(); + for (List<Declaration *> *it = ast->symbols; it; it = it->next) { + Declaration *decl = it->value; + + if (Function *fun = decl->type()->asFunctionType()) { + if ((fun->isSignal() || fun->isSlot()) && ! check) { + translationUnit()->warning(ast->firstToken(), + "you forgot the Q_OBJECT macro"); + } + } + } + return true; +} + +bool CheckUndefinedSymbols::visit(BaseSpecifierAST *base) +{ + if (NameAST *nameAST = base->name) { + bool resolvedBaseClassName = false; + + if (Name *name = nameAST->name) { + Identifier *id = name->identifier(); + const QByteArray spell = QByteArray::fromRawData(id->chars(), id->size()); + if (_types.contains(spell)) + resolvedBaseClassName = true; + } + + if (! resolvedBaseClassName) { + const char *token = "after `:'"; + + if (base->comma_token) + token = "after `,'"; + + translationUnit()->warning(nameAST->firstToken(), + "expected class-name %s token", token); + } + } + + return true; +} + +bool CheckUndefinedSymbols::visit(UsingDirectiveAST *ast) +{ + if (ast->symbol && ast->symbol->name() && _globalNamespaceBinding) { + const Location loc = Location(ast->symbol); + + NamespaceBinding *binding = _globalNamespaceBinding.data(); + + if (Scope *enclosingNamespaceScope = ast->symbol->enclosingNamespaceScope()) + binding = NamespaceBinding::find(enclosingNamespaceScope->owner()->asNamespace(), binding); + + if (! binding || ! binding->resolveNamespace(loc, ast->symbol->name())) { + translationUnit()->warning(ast->name->firstToken(), + "expected a namespace"); + } + } + + return true; +} + +bool CheckUndefinedSymbols::visit(QualifiedNameAST *ast) +{ + if (ast->name) { + QualifiedNameId *q = ast->name->asQualifiedNameId(); + for (unsigned i = 0; i < q->nameCount() - 1; ++i) { + Name *name = q->nameAt(i); + if (Identifier *id = name->identifier()) { + const QByteArray spell = QByteArray::fromRawData(id->chars(), id->size()); + if (! (_namespaceNames.contains(spell) || _types.contains(spell))) { + translationUnit()->warning(ast->firstToken(), + "`%s' is not a namespace or class name", + spell.constData()); + } + } + } + } + + return true; +} + +bool CheckUndefinedSymbols::visit(CastExpressionAST *ast) +{ + if (ast->lparen_token && ast->type_id && ast->rparen_token && ast->expression) { + if (TypeIdAST *cast_type_id = ast->type_id->asTypeId()) { + SpecifierAST *type_specifier = cast_type_id->type_specifier; + if (! cast_type_id->declarator && type_specifier && ! type_specifier->next && + type_specifier->asNamedTypeSpecifier() && ast->expression && + ast->expression->asUnaryExpression()) { + // this ast node is ambigious, e.g. + // (a) + b + // it can be parsed as + // ((a) + b) + // or + // (a) (+b) + accept(ast->expression); + return false; + } + } + } + + return true; +} + +bool CheckUndefinedSymbols::visit(SizeofExpressionAST *ast) +{ + if (ast->lparen_token && ast->expression && ast->rparen_token) { + if (TypeIdAST *type_id = ast->expression->asTypeId()) { + SpecifierAST *type_specifier = type_id->type_specifier; + if (! type_id->declarator && type_specifier && ! type_specifier->next && + type_specifier->asNamedTypeSpecifier()) { + // this sizeof expression is ambiguos, e.g. + // sizeof (a) + // `a' can be a typeid or a nested-expression. + return false; + } else if (type_id->declarator + && type_id->declarator->postfix_declarators + && ! type_id->declarator->postfix_declarators->next + && type_id->declarator->postfix_declarators->asArrayDeclarator() != 0) { + // this sizeof expression is ambiguos, e.g. + // sizeof(a[10]) + // `a' can be a typeid or an expression. + return false; + } + } + } + + return true; +} diff --git a/src/libs/cplusplus/CheckUndefinedSymbols.h b/src/libs/cplusplus/CheckUndefinedSymbols.h new file mode 100644 index 0000000000..79e64a1262 --- /dev/null +++ b/src/libs/cplusplus/CheckUndefinedSymbols.h @@ -0,0 +1,91 @@ +/************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** Commercial Usage +** +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** +**************************************************************************/ + +#ifndef CHECKUNDEFINEDSYMBOLS_H +#define CHECKUNDEFINEDSYMBOLS_H + +#include "CppDocument.h" +#include "CppBindings.h" + +#include <ASTVisitor.h> +#include <QtCore/QSet> +#include <QtCore/QByteArray> + +namespace CPlusPlus { + +class CPLUSPLUS_EXPORT CheckUndefinedSymbols: protected ASTVisitor +{ +public: + CheckUndefinedSymbols(Document::Ptr doc); + virtual ~CheckUndefinedSymbols(); + + void setGlobalNamespaceBinding(NamespaceBindingPtr globalNamespaceBinding); + + void operator()(AST *ast); + +protected: + using ASTVisitor::visit; + + void addType(Name *name); + void buildTypeMap(Class *klass); + void buildTypeMap(NamespaceBinding *binding, QSet<NamespaceBinding *> *processed); + FunctionDeclaratorAST *currentFunctionDeclarator() const; + bool qobjectCheck() const; + + virtual bool visit(FunctionDeclaratorAST *ast); + virtual void endVisit(FunctionDeclaratorAST *ast); + + virtual bool visit(TypeofSpecifierAST *ast); + virtual bool visit(TypenameTypeParameterAST *ast); + virtual bool visit(TemplateTypeParameterAST *ast); + virtual bool visit(NamedTypeSpecifierAST *ast); + + virtual bool visit(ClassSpecifierAST *ast); + virtual void endVisit(ClassSpecifierAST *); + + virtual bool visit(FunctionDefinitionAST *ast); + virtual bool visit(SimpleDeclarationAST *ast); + virtual bool visit(BaseSpecifierAST *base); + virtual bool visit(UsingDirectiveAST *ast); + virtual bool visit(QualifiedNameAST *ast); + virtual bool visit(CastExpressionAST *ast); + virtual bool visit(SizeofExpressionAST *ast); + +private: + Document::Ptr _doc; + NamespaceBindingPtr _globalNamespaceBinding; + QList<bool> _qobjectStack; + QList<FunctionDeclaratorAST *> functionDeclarationStack; + QSet<QByteArray> _types; + QSet<QByteArray> _namespaceNames; +}; + +} // end of namespace CPlusPlus + +#endif // CHECKUNDEFINEDSYMBOLS_H diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri index f8b11fed82..1df5e99695 100644 --- a/src/libs/cplusplus/cplusplus-lib.pri +++ b/src/libs/cplusplus/cplusplus-lib.pri @@ -28,6 +28,7 @@ HEADERS += \ $$PWD/LookupContext.h \ $$PWD/CppBindings.h \ $$PWD/ASTParent.h \ + $$PWD/CheckUndefinedSymbols.h \ $$PWD/PreprocessorClient.h \ $$PWD/PreprocessorEnvironment.h \ $$PWD/Macro.h \ @@ -49,6 +50,7 @@ SOURCES += \ $$PWD/LookupContext.cpp \ $$PWD/CppBindings.cpp \ $$PWD/ASTParent.cpp \ + $$PWD/CheckUndefinedSymbols.cpp \ $$PWD/PreprocessorClient.cpp \ $$PWD/PreprocessorEnvironment.cpp \ $$PWD/FastPreprocessor.cpp \ diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index be6aa86093..c940ba90c7 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -30,6 +30,7 @@ #include <cplusplus/pp.h> #include <cplusplus/CppBindings.h> #include <cplusplus/Overview.h> +#include <cplusplus/CheckUndefinedSymbols.h> #include "cppmodelmanager.h" #include "cpptoolsconstants.h" @@ -253,351 +254,6 @@ void CppPreprocessor::setTodo(const QStringList &files) namespace { -class Process; - -class CheckUndefinedSymbols: protected ASTVisitor -{ - QSet<QByteArray> _types; - QSet<QByteArray> _namespaceNames; - -public: - CheckUndefinedSymbols(Document::Ptr doc) - : ASTVisitor(doc->control()), _process(0), _doc(doc) - { } - - void setGlobalNamespaceBinding(NamespaceBindingPtr globalNamespaceBinding) - { - _globalNamespaceBinding = globalNamespaceBinding; - _types.clear(); - - if (_globalNamespaceBinding) { - QSet<NamespaceBinding *> processed; - buildTypeMap(_globalNamespaceBinding.data(), &processed); - } - } - - void operator()(AST *ast, Process *process) - { _process = process; accept(ast); } - -protected: - using ASTVisitor::visit; - - void addType(Name *name) - { - if (! name) - return; - - if (Identifier *id = name->identifier()) - _types.insert(QByteArray(id->chars(), id->size())); - } - - void buildTypeMap(Class *klass) - { - addType(klass->name()); - - for (unsigned i = 0; i < klass->memberCount(); ++i) { - Symbol *member = klass->memberAt(i); - - if (Class *klass = member->asClass()) { - buildTypeMap(klass); - } else if (Enum *e = member->asEnum()) { - addType(e->name()); - } else if (ForwardClassDeclaration *fwd = member->asForwardClassDeclaration()) { - addType(fwd->name()); - } else if (Declaration *decl = member->asDeclaration()) { - if (decl->isTypedef()) - addType(decl->name()); - } - } - } - - void buildTypeMap(NamespaceBinding *binding, QSet<NamespaceBinding *> *processed) - { - if (! processed->contains(binding)) { - processed->insert(binding); - - if (Identifier *id = binding->identifier()) { - _namespaceNames.insert(QByteArray(id->chars(), id->size())); - } - - foreach (Namespace *ns, binding->symbols) { - for (unsigned i = 0; i < ns->memberCount(); ++i) { - Symbol *member = ns->memberAt(i); - - if (Class *klass = member->asClass()) { - buildTypeMap(klass); - } else if (Enum *e = member->asEnum()) { - addType(e->name()); - } else if (ForwardClassDeclaration *fwd = member->asForwardClassDeclaration()) { - addType(fwd->name()); - } else if (Declaration *decl = member->asDeclaration()) { - if (decl->isTypedef()) - addType(decl->name()); - } - } - } - - foreach (NamespaceBinding *childBinding, binding->children) { - buildTypeMap(childBinding, processed); - } - } - } - - QList<FunctionDeclaratorAST *> functionDeclarationStack; - - FunctionDeclaratorAST *currentFunctionDeclarator() const - { - if (functionDeclarationStack.isEmpty()) - return 0; - - return functionDeclarationStack.last(); - } - - virtual bool visit(FunctionDeclaratorAST *ast) - { - functionDeclarationStack.append(ast); - - return true; - } - - virtual void endVisit(FunctionDeclaratorAST *) - { - functionDeclarationStack.removeLast(); - } - - virtual bool visit(TypeofSpecifierAST *ast) - { - accept(ast->next); - return false; - } - - virtual bool visit(TypenameTypeParameterAST *ast) - { - if (NameAST *nameAst = ast->name) - addType(nameAst->name); - - return true; - } - - virtual bool visit(TemplateTypeParameterAST *ast) - { - if (ast->name) - addType(ast->name->name); - - return true; - } - - virtual bool visit(NamedTypeSpecifierAST *ast) - { - if (ast->name) { - if (! ast->name->name) { - unsigned line, col; - getTokenStartPosition(ast->firstToken(), &line, &col); - // qWarning() << _doc->fileName() << line << col; - } else if (Identifier *id = ast->name->name->identifier()) { - if (! _types.contains(QByteArray::fromRawData(id->chars(), id->size()))) { - if (FunctionDeclaratorAST *functionDeclarator = currentFunctionDeclarator()) { - if (functionDeclarator->as_cpp_initializer) - return true; - } - - Overview oo; - translationUnit()->warning(ast->firstToken(), "`%s' is not a type name", - qPrintable(oo(ast->name->name))); - } - } - } - return true; - } - - virtual bool visit(ClassSpecifierAST *ast) - { - if (ast->base_clause) { - unsigned line, col; - getTokenStartPosition(ast->firstToken(), &line, &col); - _context = lookupContext(line, col); - } - - bool hasQ_OBJECT_CHECK = false; - - if (ast->symbol) { - Class *klass = ast->symbol->asClass(); - - for (unsigned i = 0; i < klass->memberCount(); ++i) { - Symbol *symbol = klass->memberAt(i); - - if (symbol->name() && symbol->name()->isNameId()) { - NameId *nameId = symbol->name()->asNameId(); - - if (! qstrcmp(nameId->identifier()->chars(), "qt_check_for_QOBJECT_macro")) { - hasQ_OBJECT_CHECK = true; - break; - } - } - } - } - - _qobjectStack.append(hasQ_OBJECT_CHECK); - - return true; - } - - virtual void endVisit(ClassSpecifierAST *) - { _qobjectStack.removeLast(); } - - bool qobjectCheck() const - { - if (_qobjectStack.isEmpty()) - return false; - - return _qobjectStack.last(); - } - - virtual bool visit(FunctionDefinitionAST *ast) - { - if (ast->symbol) { - Function *fun = ast->symbol->asFunction(); - if ((fun->isSignal() || fun->isSlot()) && ! qobjectCheck()) { - translationUnit()->warning(ast->firstToken(), - "you forgot the Q_OBJECT macro"); - } - } - return true; - } - - virtual bool visit(SimpleDeclarationAST *ast) - { - const bool check = qobjectCheck(); - for (List<Declaration *> *it = ast->symbols; it; it = it->next) { - Declaration *decl = it->value; - - if (Function *fun = decl->type()->asFunctionType()) { - if ((fun->isSignal() || fun->isSlot()) && ! check) { - translationUnit()->warning(ast->firstToken(), - "you forgot the Q_OBJECT macro"); - } - } - } - return true; - } - - virtual bool visit(BaseSpecifierAST *base) - { - if (base->name) { - const QList<Symbol *> symbols = _context.resolveClass(base->name->name); - - if (symbols.isEmpty()) { - const char *token = "after `:'"; - - if (base->comma_token) - token = "after `,'"; - - translationUnit()->warning(base->name->firstToken(), - "expected class-name %s token", token); - } - } - - return true; - } - - virtual bool visit(UsingDirectiveAST *ast) - { - if (ast->symbol && ast->symbol->name() && _globalNamespaceBinding) { - const Location loc = Location(ast->symbol); - - NamespaceBinding *binding = _globalNamespaceBinding.data(); - - if (Scope *enclosingNamespaceScope = ast->symbol->enclosingNamespaceScope()) - binding = NamespaceBinding::find(enclosingNamespaceScope->owner()->asNamespace(), binding); - - if (! binding || ! binding->resolveNamespace(loc, ast->symbol->name())) { - translationUnit()->warning(ast->name->firstToken(), - "expected a namespace"); - } - } - - return true; - } - - virtual bool visit(QualifiedNameAST *ast) - { - if (ast->name) { - QualifiedNameId *q = ast->name->asQualifiedNameId(); - for (unsigned i = 0; i < q->nameCount() - 1; ++i) { - Name *name = q->nameAt(i); - if (Identifier *id = name->identifier()) { - const QByteArray spell = QByteArray::fromRawData(id->chars(), id->size()); - if (! (_namespaceNames.contains(spell) || _types.contains(spell))) { - translationUnit()->warning(ast->firstToken(), - "`%s' is not a namespace or class name", - spell.constData()); - } - } - } - } - - return true; - } - - virtual bool visit(CastExpressionAST *ast) - { - if (ast->lparen_token && ast->type_id && ast->rparen_token && ast->expression) { - if (TypeIdAST *cast_type_id = ast->type_id->asTypeId()) { - SpecifierAST *type_specifier = cast_type_id->type_specifier; - if (! cast_type_id->declarator && type_specifier && ! type_specifier->next && - type_specifier->asNamedTypeSpecifier() && ast->expression && - ast->expression->asUnaryExpression()) { - // this ast node is ambigious, e.g. - // (a) + b - // it can be parsed as - // ((a) + b) - // or - // (a) (+b) - accept(ast->expression); - return false; - } - } - } - - return true; - } - - virtual bool visit(SizeofExpressionAST *ast) - { - if (ast->lparen_token && ast->expression && ast->rparen_token) { - if (TypeIdAST *type_id = ast->expression->asTypeId()) { - SpecifierAST *type_specifier = type_id->type_specifier; - if (! type_id->declarator && type_specifier && ! type_specifier->next && - type_specifier->asNamedTypeSpecifier()) { - // this sizeof expression is ambiguos, e.g. - // sizeof (a) - // `a' can be a typeid or a nested-expression. - return false; - } else if (type_id->declarator - && type_id->declarator->postfix_declarators - && ! type_id->declarator->postfix_declarators->next - && type_id->declarator->postfix_declarators->asArrayDeclarator() != 0) { - // this sizeof expression is ambiguos, e.g. - // sizeof(a[10]) - // `a' can be a typeid or an expression. - return false; - } - } - } - - return true; - } - - LookupContext lookupContext(unsigned line, unsigned column) const; - -private: - Process *_process; - Document::Ptr _doc; - LookupContext _context; - NamespaceBindingPtr _globalNamespaceBinding; - QList<bool> _qobjectStack; -}; - class Process: public std::unary_function<Document::Ptr, void> { QPointer<CppModelManager> _modelManager; @@ -643,7 +299,7 @@ public: CheckUndefinedSymbols checkUndefinedSymbols(doc); checkUndefinedSymbols.setGlobalNamespaceBinding(ns); - checkUndefinedSymbols(doc->translationUnit()->ast(), this); + checkUndefinedSymbols(doc->translationUnit()->ast()); // ### FIXME } doc->releaseTranslationUnit(); @@ -653,9 +309,6 @@ public: } }; -LookupContext CheckUndefinedSymbols::lookupContext(unsigned line, unsigned column) const -{ return _process->lookupContext(line, column); } - } // end of anonymous namespace void CppPreprocessor::run(const QString &fileName) |