Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline

src/libs/cplusplus/CppDocument.cpp

@@ -740,11 +740,12 @@ Symbol *Snapshot::findMatchingDefinition(Symbol *declaration) const
                 continue; // nothing to do
 
             foreach (Function *fun, result) {
-                const QList<Symbol *> declarations = context.lookup(fun->name(), fun->scope());
+                const QList<LookupItem> declarations = context.lookup(fun->name(), fun->scope());
                 if (declarations.isEmpty())
                     continue;
 
-                else if (enclosingType == context.lookupType(declarations.first()))
+                const LookupItem best = declarations.first();
+                if (enclosingType == context.lookupType(best.declaration()))
                     viableFunctions.append(fun);
             }
 

src/libs/cplusplus/CppRewriter.cpp

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 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://qt.nokia.com/contact.
+**
+**************************************************************************/
+#include "CppRewriter.h"
+#include <TypeVisitor.h>
+#include <NameVisitor.h>
+#include <CoreTypes.h>
+#include <Symbols.h>
+#include <Literals.h>
+#include <Names.h>
+#include <Scope.h>
+
+#include <QtCore/QVarLengthArray>
+#include <QtCore/QDebug>
+
+using namespace CPlusPlus;
+
+class CPlusPlus::Rewrite
+{
+public:
+    Rewrite(Control *control, const SubstitutionEnvironment &env)
+        : control(control), env(env), rewriteType(this), rewriteName(this) {}
+
+    class RewriteType: public TypeVisitor
+    {
+        Rewrite *rewrite;
+        QList<FullySpecifiedType> temps;
+
+        Control *control() const
+        { return rewrite->control; }
+
+        void accept(const FullySpecifiedType &ty)
+        {
+            TypeVisitor::accept(ty.type());
+            unsigned flags = ty.flags();
+            flags |= temps.back().flags();
+            temps.back().setFlags(flags);
+        }
+
+    public:
+        RewriteType(Rewrite *r): rewrite(r) {}
+
+        FullySpecifiedType operator()(const FullySpecifiedType &ty)
+        {
+            accept(ty);
+            return temps.takeLast();
+        }
+
+        virtual void visit(UndefinedType *)
+        {
+            temps.append(FullySpecifiedType());
+        }
+
+        virtual void visit(VoidType *)
+        {
+            temps.append(control()->voidType());
+        }
+
+        virtual void visit(IntegerType *type)
+        {
+            temps.append(control()->integerType(type->kind()));
+        }
+
+        virtual void visit(FloatType *type)
+        {
+            temps.append(control()->floatType(type->kind()));
+        }
+
+        virtual void visit(PointerToMemberType *type)
+        {
+            const Name *memberName = rewrite->rewriteName(type->memberName());
+            const FullySpecifiedType elementType = rewrite->rewriteType(type->elementType());
+            temps.append(control()->pointerToMemberType(memberName, elementType));
+        }
+
+        virtual void visit(PointerType *type)
+        {
+            const FullySpecifiedType elementType = rewrite->rewriteType(type->elementType());
+            temps.append(control()->pointerType(elementType));
+        }
+
+        virtual void visit(ReferenceType *type)
+        {
+            const FullySpecifiedType elementType = rewrite->rewriteType(type->elementType());
+            temps.append(control()->referenceType(elementType));
+        }
+
+        virtual void visit(ArrayType *type)
+        {
+            const FullySpecifiedType elementType = rewrite->rewriteType(type->elementType());
+            temps.append(control()->arrayType(elementType, type->size()));
+        }
+
+        virtual void visit(NamedType *type)
+        {
+            FullySpecifiedType ty = rewrite->env.apply(type->name(), rewrite);
+            if (! ty->isUndefinedType())
+                temps.append(rewrite->rewriteType(ty));
+            else {
+                const Name *name = rewrite->rewriteName(type->name());
+                temps.append(control()->namedType(name));
+            }
+        }
+
+        virtual void visit(Function *type)
+        {
+            Function *funTy = control()->newFunction(0, 0);
+            funTy->copy(type);
+
+            funTy->setName(rewrite->rewriteName(type->name()));
+
+            funTy->setReturnType(rewrite->rewriteType(type->returnType()));
+
+            for (unsigned i = 0; i < type->argumentCount(); ++i) {
+                Symbol *arg = type->argumentAt(i);
+
+                Argument *newArg = control()->newArgument(0, 0);
+                newArg->copy(arg);
+                newArg->setName(rewrite->rewriteName(arg->name()));
+                newArg->setType(rewrite->rewriteType(arg->type()));
+
+                funTy->arguments()->enterSymbol(newArg);
+            }
+
+            temps.append(funTy);
+        }
+
+        virtual void visit(Namespace *type)
+        {
+            qWarning() << Q_FUNC_INFO;
+            temps.append(type);
+        }
+
+        virtual void visit(Class *type)
+        {
+            qWarning() << Q_FUNC_INFO;
+            temps.append(type);
+        }
+
+        virtual void visit(Enum *type)
+        {
+            qWarning() << Q_FUNC_INFO;
+            temps.append(type);
+        }
+
+        virtual void visit(ForwardClassDeclaration *type)
+        {
+            qWarning() << Q_FUNC_INFO;
+            temps.append(type);
+        }
+
+        virtual void visit(ObjCClass *type)
+        {
+            qWarning() << Q_FUNC_INFO;
+            temps.append(type);
+        }
+
+        virtual void visit(ObjCProtocol *type)
+        {
+            qWarning() << Q_FUNC_INFO;
+            temps.append(type);
+        }
+
+        virtual void visit(ObjCMethod *type)
+        {
+            qWarning() << Q_FUNC_INFO;
+            temps.append(type);
+        }
+
+        virtual void visit(ObjCForwardClassDeclaration *type)
+        {
+            qWarning() << Q_FUNC_INFO;
+            temps.append(type);
+        }
+
+        virtual void visit(ObjCForwardProtocolDeclaration *type)
+        {
+            qWarning() << Q_FUNC_INFO;
+            temps.append(type);
+        }
+
+    };
+
+    class RewriteName: public NameVisitor
+    {
+        Rewrite *rewrite;
+        QList<const Name *> temps;
+
+        Control *control() const
+        { return rewrite->control; }
+
+        const Identifier *identifier(const Identifier *other) const
+        {
+            if (! other)
+                return 0;
+
+            return control()->findOrInsertIdentifier(other->chars(), other->size());
+        }
+
+    public:
+        RewriteName(Rewrite *r): rewrite(r) {}
+
+        const Name *operator()(const Name *name)
+        {
+            if (! name)
+                return 0;
+
+            accept(name);
+            return temps.takeLast();
+        }
+
+        virtual void visit(const QualifiedNameId *name)
+        {
+            const Name *base = rewrite->rewriteName(name->base());
+            const Name *n = rewrite->rewriteName(name->name());
+            temps.append(control()->qualifiedNameId(base, n));
+        }
+
+        virtual void visit(const NameId *name)
+        {
+            temps.append(control()->nameId(identifier(name->identifier())));
+        }
+
+        virtual void visit(const TemplateNameId *name)
+        {
+            QVarLengthArray<FullySpecifiedType, 8> args(name->templateArgumentCount());
+            for (unsigned i = 0; i < name->templateArgumentCount(); ++i)
+                args[i] = rewrite->rewriteType(name->templateArgumentAt(i));
+            temps.append(control()->templateNameId(identifier(name->identifier()), args.data(), args.size()));
+        }
+
+        virtual void visit(const DestructorNameId *name)
+        {
+            temps.append(control()->destructorNameId(identifier(name->identifier())));
+        }
+
+        virtual void visit(const OperatorNameId *name)
+        {
+            temps.append(control()->operatorNameId(name->kind()));
+        }
+
+        virtual void visit(const ConversionNameId *name)
+        {
+            FullySpecifiedType ty = rewrite->rewriteType(name->type());
+            temps.append(control()->conversionNameId(ty));
+        }
+
+        virtual void visit(const SelectorNameId *name)
+        {
+            QVarLengthArray<const Name *, 8> names(name->nameCount());
+            for (unsigned i = 0; i < name->nameCount(); ++i)
+                names[i] = rewrite->rewriteName(name->nameAt(i));
+            temps.append(control()->selectorNameId(names.constData(), names.size(), name->hasArguments()));
+        }
+    };
+
+public: // attributes
+    Control *control;
+    SubstitutionEnvironment env;
+    RewriteType rewriteType;
+    RewriteName rewriteName;
+};
+
+ContextSubstitution::ContextSubstitution(const LookupContext &context, Scope *scope)
+    : _context(context), _scope(scope)
+{
+}
+
+ContextSubstitution::~ContextSubstitution()
+{
+}
+
+FullySpecifiedType ContextSubstitution::apply(const Name *name, Rewrite *rewrite) const
+{
+    const QList<LookupItem> candidates = _context.lookup(name, _scope);
+
+    foreach (const LookupItem &r, candidates) {
+        Symbol *s = r.declaration();
+        if (s->isDeclaration() && s->isTypedef()) {
+            qDebug() << "resolved typedef:" << s->fileName() << s->line() << s->column();
+
+            qDebug() << "scope is:" << r.scope()->owner()->fileName()
+                     << r.scope()->owner()->line()
+                     << r.scope()->owner()->column();
+
+            ContextSubstitution subst(_context, s->scope());
+            rewrite->env.enter(&subst);
+            FullySpecifiedType ty = rewrite->rewriteType(s->type());
+            rewrite->env.leave();
+
+            return ty;
+        }
+    }
+    return FullySpecifiedType();
+}
+
+
+SubstitutionMap::SubstitutionMap()
+{
+
+}
+
+SubstitutionMap::~SubstitutionMap()
+{
+
+}
+
+void SubstitutionMap::bind(const Name *name, const FullySpecifiedType &ty)
+{
+    _map.append(qMakePair(name, ty));
+}
+
+FullySpecifiedType SubstitutionMap::apply(const Name *name, Rewrite *) const
+{
+    for (int n = _map.size() - 1; n != -1; --n) {
+        const QPair<const Name *, FullySpecifiedType> &p = _map.at(n);
+
+        if (name->isEqualTo(p.first))
+            return p.second;
+    }
+
+    return FullySpecifiedType();
+}
+
+FullySpecifiedType CPlusPlus::rewriteType(const FullySpecifiedType &type,
+                                          const SubstitutionEnvironment &env,
+                                          Control *control)
+{
+    Rewrite rewrite(control, env);
+    return rewrite.rewriteType(type);
+}
+
+const Name *CPlusPlus::rewriteName(const Name *name,
+                                   const SubstitutionEnvironment &env,
+                                   Control *control)
+{
+    Rewrite rewrite(control, env);
+    return rewrite.rewriteName(name);
+}

src/libs/cplusplus/CppRewriter.h

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 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://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#ifndef CPLUSPLUS_REWRITER_H
+#define CPLUSPLUS_REWRITER_H
+
+#include "CppDocument.h"
+#include "LookupContext.h"
+
+namespace CPlusPlus {
+
+class Rewrite;
+
+class CPLUSPLUS_EXPORT Substitution
+{
+    Q_DISABLE_COPY(Substitution)
+
+public:
+    Substitution() {}
+    virtual ~Substitution() {}
+
+    virtual FullySpecifiedType apply(const Name *name, Rewrite *rewrite) const = 0;
+};
+
+class CPLUSPLUS_EXPORT SubstitutionEnvironment
+{
+    QList<Substitution *> substs;
+
+public:
+    FullySpecifiedType apply(const Name *name, Rewrite *rewrite) const
+    {
+        if (name) {
+            for (int index = substs.size() - 1; index != -1; --index) {
+                const Substitution *subst = substs.at(index);
+
+                FullySpecifiedType ty = subst->apply(name, rewrite);
+                if (! ty->isUndefinedType())
+                    return ty;
+            }
+        }
+
+        return FullySpecifiedType();
+    }
+
+    void enter(Substitution *subst)
+    {
+        substs.append(subst);
+    }
+
+    void leave()
+    {
+        substs.removeLast();
+    }
+};
+
+class CPLUSPLUS_EXPORT ContextSubstitution: public Substitution
+{
+public:
+    ContextSubstitution(const LookupContext &context, Scope *scope);
+    virtual ~ContextSubstitution();
+
+    virtual FullySpecifiedType apply(const Name *name, Rewrite *rewrite) const;
+
+private:
+    LookupContext _context;
+    Scope *_scope;
+};
+
+
+class CPLUSPLUS_EXPORT SubstitutionMap: public Substitution
+{
+public:
+    SubstitutionMap();
+    virtual ~SubstitutionMap();
+
+    void bind(const Name *name, const FullySpecifiedType &ty);
+    virtual FullySpecifiedType apply(const Name *name, Rewrite *rewrite) const;
+
+private:
+    QList<QPair<const Name *, FullySpecifiedType> > _map;
+};
+
+CPLUSPLUS_EXPORT FullySpecifiedType rewriteType(const FullySpecifiedType &type,
+                                                const SubstitutionEnvironment &env,
+                                                Control *control);
+
+CPLUSPLUS_EXPORT const Name *rewriteName(const Name *name,
+                                         const SubstitutionEnvironment &env,
+                                         Control *control);
+
+} // end of namespace CPlusPlus
+
+#endif

src/libs/cplusplus/DeprecatedGenTemplateInstance.h

@@ -46,7 +46,7 @@ public:
     typedef QList< QPair<const Identifier *, FullySpecifiedType> > Substitution;
 
 public:
-    static FullySpecifiedType instantiate(const Name *className, Symbol *candidate, QSharedPointer<Control> control);
+    Q_DECL_DEPRECATED static FullySpecifiedType instantiate(const Name *className, Symbol *candidate, QSharedPointer<Control> control);
 
 private:
     DeprecatedGenTemplateInstance(QSharedPointer<Control> control, const Substitution &substitution);

src/libs/cplusplus/FindUsages.cpp

@@ -124,7 +124,7 @@ Scope *FindUsages::scopeAt(unsigned tokenIndex) const
     return _doc->scopeAt(line, column);
 }
 
-void FindUsages::reportResult(unsigned tokenIndex, const QList<Symbol *> &candidates)
+void FindUsages::reportResult(unsigned tokenIndex, const QList<LookupItem> &candidates)
 {
     if (_processed.contains(tokenIndex))
         return;
@@ -160,11 +160,12 @@ void FindUsages::reportResult(unsigned tokenIndex)
     _references.append(tokenIndex);
 }
 
-bool FindUsages::checkCandidates(const QList<Symbol *> &candidates) const
+bool FindUsages::checkCandidates(const QList<LookupItem> &candidates) const
 {
     if (ClassOrNamespace *c = _context.lookupType(_declSymbol)) {
         for (int i = candidates.size() - 1; i != -1; --i) {
-            Symbol *s = candidates.at(i);
+            const LookupItem &r = candidates.at(i);
+            Symbol *s = r.declaration();
             if (_context.lookupType(s) == c)
                 return true;
         }
@@ -186,7 +187,7 @@ bool FindUsages::visit(MemInitializerAST *ast)
 
         SimpleNameAST *simple = ast->name->asSimpleName();
         if (identifier(simple->identifier_token) == _id) {
-            const QList<Symbol *> candidates = _context.lookup(simple->name, scopeAt(simple->identifier_token));
+            const QList<LookupItem> candidates = _context.lookup(simple->name, scopeAt(simple->identifier_token));
             reportResult(simple->identifier_token, candidates);
         }
     }
@@ -223,14 +224,7 @@ void FindUsages::checkExpression(unsigned startToken, unsigned endToken)
     const QList<LookupItem> results = typeofExpression(expression, scope,
                                                        TypeOfExpression::Preprocess);
 
-    QList<Symbol *> candidates;
-
-    foreach (const LookupItem &r, results) {
-        Symbol *lastVisibleSymbol = r.declaration();
-        candidates.append(lastVisibleSymbol);
-    }
-
-    reportResult(endToken, candidates);
+    reportResult(endToken, results);
 }
 
 bool FindUsages::visit(QualifiedNameAST *ast)
@@ -297,7 +291,7 @@ bool FindUsages::visit(EnumeratorAST *ast)
 {
     const Identifier *id = identifier(ast->identifier_token);
     if (id == _id) {
-        const QList<Symbol *> candidates = _context.lookup(control()->nameId(id), scopeAt(ast->identifier_token));
+        const QList<LookupItem> candidates = _context.lookup(control()->nameId(id), scopeAt(ast->identifier_token));
         reportResult(ast->identifier_token, candidates);
     }
 
@@ -310,7 +304,7 @@ bool FindUsages::visit(SimpleNameAST *ast)
 {
     const Identifier *id = identifier(ast->identifier_token);
     if (id == _id) {
-        const QList<Symbol *> candidates = _context.lookup(ast->name, scopeAt(ast->identifier_token));
+        const QList<LookupItem> candidates = _context.lookup(ast->name, scopeAt(ast->identifier_token));
         reportResult(ast->identifier_token, candidates);
     }
 
@@ -321,7 +315,7 @@ bool FindUsages::visit(DestructorNameAST *ast)
 {
     const Identifier *id = identifier(ast->identifier_token);
     if (id == _id) {
-        const QList<Symbol *> candidates = _context.lookup(ast->name, scopeAt(ast->identifier_token));
+        const QList<LookupItem> candidates = _context.lookup(ast->name, scopeAt(ast->identifier_token));
         reportResult(ast->identifier_token, candidates);
     }
 
@@ -331,7 +325,7 @@ bool FindUsages::visit(DestructorNameAST *ast)
 bool FindUsages::visit(TemplateIdAST *ast)
 {
     if (_id == identifier(ast->identifier_token)) {
-        const QList<Symbol *> candidates = _context.lookup(ast->name, scopeAt(ast->identifier_token));
+        const QList<LookupItem> candidates = _context.lookup(ast->name, scopeAt(ast->identifier_token));
         reportResult(ast->identifier_token, candidates);
     }
 
@@ -406,7 +400,7 @@ bool FindUsages::visit(ObjCSelectorAST *ast)
     if (ast->name) {
         const Identifier *id = ast->name->identifier();
         if (id == _id) {
-            const QList<Symbol *> candidates = _context.lookup(ast->name, scopeAt(ast->firstToken()));
+            const QList<LookupItem> candidates = _context.lookup(ast->name, scopeAt(ast->firstToken()));
             reportResult(ast->firstToken(), candidates);
         }
     }
@@ -440,7 +434,7 @@ bool FindUsages::visit(TypenameTypeParameterAST *ast)
         const Identifier *id = name->name->identifier();