C++: Do type and name equality checking in a safe manner.

Change the TypeMatcher to also match names, and use two "block" lists
in SafeMatcher to prevent infinite recursion.

Task-number: QTCREATORBUG-11240
Change-Id: I0367ae795ee6be579b83aeb8d46723c877e4aa75
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Erik Verbruggen
2014-03-24 16:06:39 +01:00
committed by Erik Verbruggen
parent 186570a259
commit b0618281ec
27 changed files with 768 additions and 328 deletions

View File

@@ -0,0 +1,64 @@
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** 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.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef CPLUSPLUS_SAFETYPEMATCHER_H
#define CPLUSPLUS_SAFETYPEMATCHER_H
#include "Matcher.h"
#include <vector>
namespace CPlusPlus {
class SafeMatcher: public Matcher
{
public:
SafeMatcher();
~SafeMatcher() override;
bool match(const PointerToMemberType *type, const PointerToMemberType *otherType) override;
bool match(const PointerType *type, const PointerType *otherType) override;
bool match(const ReferenceType *type, const ReferenceType *otherType) override;
bool match(const ArrayType *type, const ArrayType *otherType) override;
bool match(const NamedType *type, const NamedType *otherType) override;
bool match(const TemplateNameId *name, const TemplateNameId *otherName) override;
bool match(const DestructorNameId *name, const DestructorNameId *otherName) override;
bool match(const ConversionNameId *name, const ConversionNameId *otherName) override;
bool match(const QualifiedNameId *name, const QualifiedNameId *otherName) override;
bool match(const SelectorNameId *name, const SelectorNameId *otherName) override;
private:
std::vector<const Type *> _blockedTypes;
std::vector<const Name *> _blockedNames;
};
} // CPlusPlus namespace
#endif // CPLUSPLUS_SAFETYPEMATCHER_H