1 files changed, 70 insertions, 98 deletions

diff --git a/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp b/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp
index e3fdeac84..f8c5c31d8 100644
--- a/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp
+++ b/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp
@@ -1,37 +1,15 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt for Python.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org>
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 
 #include "typeinfo.h"
 #include "codemodel.h"
 
 #include <clangparser/clangutils.h>
+#include <debughelpers_p.h>
+
+#include "qtcompat.h"
 
 #include <QtCore/QDebug>
 #include <QtCore/QStack>
@@ -39,6 +17,8 @@
 
 #include <iostream>
 
+using namespace Qt::StringLiterals;
+
 class TypeInfoData : public QSharedData
 {
 
@@ -67,10 +47,10 @@ public:
         };
     };
 
-    ReferenceType m_referenceType;
+    ReferenceType m_referenceType = NoReference;
 };
 
-TypeInfoData::TypeInfoData() : flags(0), m_referenceType(NoReference)
+TypeInfoData::TypeInfoData() : flags(0)
 {
 }
 
@@ -81,9 +61,8 @@ TypeInfo::TypeInfo() : d(new TypeInfoData)
 TypeInfo::~TypeInfo() = default;
 TypeInfo::TypeInfo(const TypeInfo &) = default;
 TypeInfo& TypeInfo::operator=(const TypeInfo &) = default;
-TypeInfo::TypeInfo(TypeInfo &&) = default;
-TypeInfo& TypeInfo::operator=(TypeInfo &&) = default;
-
+TypeInfo::TypeInfo(TypeInfo &&) noexcept = default;
+TypeInfo &TypeInfo::operator=(TypeInfo &&) noexcept = default;
 
 static inline TypeInfo createType(const QString &name)
 {
@@ -94,13 +73,13 @@ static inline TypeInfo createType(const QString &name)
 
 TypeInfo TypeInfo::voidType()
 {
-    static const TypeInfo result = createType(QLatin1String("void"));
+    static const TypeInfo result = createType(u"void"_s);
     return result;
 }
 
 TypeInfo TypeInfo::varArgsType()
 {
-    static const TypeInfo result = createType(QLatin1String("..."));
+    static const TypeInfo result = createType(u"..."_s);
     return result;
 }
 
@@ -119,7 +98,7 @@ TypeInfo TypeInfo::combine(const TypeInfo &__lhs, const TypeInfo &__rhs)
 
     __result.setArrayElements(__result.arrayElements() + __rhs.arrayElements());
 
-    const auto instantiations = __rhs.instantiations();
+    const auto &instantiations = __rhs.instantiations();
     for (const auto &i : instantiations)
         __result.addInstantiation(i);
 
@@ -148,7 +127,7 @@ bool TypeInfoData::isVoid() const
         && m_arguments.isEmpty() && m_arrayElements.isEmpty()
         && m_instantiations.isEmpty()
         && m_qualifiedName.size() == 1
-        && m_qualifiedName.constFirst() == QLatin1String("void");
+        && m_qualifiedName.constFirst() == u"void";
 }
 
 bool TypeInfo::isVoid() const
@@ -287,6 +266,12 @@ void TypeInfo::clearInstantiations()
         d->m_instantiations.clear();
 }
 
+bool TypeInfo::isPlain() const
+{
+    return d->m_constant == 0 && d->m_volatile == 0 && d->m_referenceType == NoReference
+        &&  d->m_indirections.isEmpty() && d->m_arrayElements.isEmpty();
+}
+
 TypeInfo TypeInfo::resolveType(TypeInfo const &__type, const ScopeModelItem &__scope)
 {
     CodeModel *__model = __scope->model();
@@ -307,34 +292,34 @@ TypeInfo TypeInfo::resolveType(CodeModelItem __item, TypeInfo const &__type, con
         otherType.setQualifiedName(__item->qualifiedName());
     }
 
-    if (TypeDefModelItem __typedef = qSharedPointerDynamicCast<_TypeDefModelItem>(__item)) {
+    if (TypeDefModelItem __typedef = std::dynamic_pointer_cast<_TypeDefModelItem>(__item)) {
         const TypeInfo combined = TypeInfo::combine(__typedef->type(), otherType);
         const CodeModelItem nextItem = __scope->model()->findItem(combined.qualifiedName(), __scope);
         if (!nextItem)
             return combined;
         // PYSIDE-362, prevent recursion on opaque structs like
         // typedef struct xcb_connection_t xcb_connection_t;
-        if (nextItem.data() ==__item.data()) {
+        if (nextItem.get() ==__item.get()) {
             std::cerr << "** WARNING Bailing out recursion of " << __FUNCTION__
-                << "() on " << qPrintable(__type.qualifiedName().join(QLatin1String("::")))
+                << "() on " << qPrintable(__type.qualifiedName().join(u"::"_s))
                 << std::endl;
             return otherType;
         }
         return resolveType(nextItem, combined, __scope);
     }
 
-    if (TemplateTypeAliasModelItem templateTypeAlias = qSharedPointerDynamicCast<_TemplateTypeAliasModelItem>(__item)) {
+    if (TemplateTypeAliasModelItem templateTypeAlias = std::dynamic_pointer_cast<_TemplateTypeAliasModelItem>(__item)) {
 
         TypeInfo combined = TypeInfo::combine(templateTypeAlias->type(), otherType);
         // For the alias "template<typename T> using QList = QVector<T>" with
         // other="QList<int>", replace the instantiations to obtain "QVector<int>".
         auto aliasInstantiations = templateTypeAlias->type().instantiations();
         const auto &concreteInstantiations = otherType.instantiations();
-        const int count = qMin(aliasInstantiations.size(), concreteInstantiations.size());
-        for (int i = 0; i < count; ++i)
-            aliasInstantiations[i] = concreteInstantiations[i];
+        const auto count = qMin(aliasInstantiations.size(), concreteInstantiations.size());
+        for (qsizetype i = 0; i < count; ++i)
+            aliasInstantiations[i] = concreteInstantiations.at(i);
         combined.setInstantiations(aliasInstantiations);
-        const CodeModelItem nextItem = __scope->model()->findItem(combined.qualifiedName(), __scope);
+        const CodeModelItem nextItem = CodeModel::findItem(combined.qualifiedName(), __scope);
         if (!nextItem)
             return combined;
         return resolveType(nextItem, combined, __scope);
@@ -362,6 +347,10 @@ public:
         while (level < m_parseStack.size())
             m_parseStack.pop();
         TypeInfo instantiation;
+        if (name.startsWith(u"const ")) {
+            instantiation.setConstant(true);
+            name = name.mid(6);
+        }
         instantiation.setQualifiedName(qualifiedName(name));
         top()->addInstantiation(instantiation);
    }
@@ -382,7 +371,8 @@ private:
     QStack<TypeInfo *> m_parseStack;
 };
 
-QPair<int, int> TypeInfo::parseTemplateArgumentList(const QString &l, int from)
+std::pair<qsizetype, qsizetype>
+    TypeInfo::parseTemplateArgumentList(const QString &l, qsizetype from)
 {
     return clang::parseTemplateArgumentList(l, clang::TemplateArgumentHandler(TypeInfoTemplateArgumentHandler(this)), from);
 }
@@ -391,23 +381,23 @@ QString TypeInfo::toString() const
 {
     QString tmp;
     if (isConstant())
-        tmp += QLatin1String("const ");
+        tmp += u"const "_s;
 
     if (isVolatile())
-        tmp += QLatin1String("volatile ");
+        tmp += u"volatile "_s;
 
-    tmp += d->m_qualifiedName.join(QLatin1String("::"));
+    tmp += d->m_qualifiedName.join(u"::"_s);
 
-    if (const int instantiationCount = d->m_instantiations.size()) {
-        tmp += QLatin1Char('<');
-        for (int i = 0; i < instantiationCount; ++i) {
+    if (const auto instantiationCount = d->m_instantiations.size()) {
+        tmp += u'<';
+        for (qsizetype i = 0; i < instantiationCount; ++i) {
             if (i)
-                tmp += QLatin1String(", ");
+                tmp += u", "_s;
             tmp += d->m_instantiations.at(i).toString();
         }
-        if (tmp.endsWith(QLatin1Char('>')))
-            tmp += QLatin1Char(' ');
-        tmp += QLatin1Char('>');
+        if (tmp.endsWith(u'>'))
+            tmp += u' ';
+        tmp += u'>';
     }
 
     for (Indirection i : d->m_indirections)
@@ -417,40 +407,37 @@ QString TypeInfo::toString() const
     case NoReference:
         break;
     case LValueReference:
-        tmp += QLatin1Char('&');
+        tmp += u'&';
         break;
     case RValueReference:
-        tmp += QLatin1String("&&");
+        tmp += u"&&"_s;
         break;
     }
 
     if (isFunctionPointer()) {
-        tmp += QLatin1String(" (*)(");
-        for (int i = 0; i < d->m_arguments.count(); ++i) {
+        tmp += u" (*)("_s;
+        for (qsizetype i = 0; i < d->m_arguments.size(); ++i) {
             if (i != 0)
-                tmp += QLatin1String(", ");
+                tmp += u", "_s;
 
             tmp += d->m_arguments.at(i).toString();
         }
-        tmp += QLatin1Char(')');
+        tmp += u')';
     }
 
-    for (const QString &elt : d->m_arrayElements) {
-        tmp += QLatin1Char('[');
-        tmp += elt;
-        tmp += QLatin1Char(']');
-    }
+    for (const QString &elt : d->m_arrayElements)
+        tmp += u'[' + elt + u']';
 
     return tmp;
 }
 
 bool TypeInfoData::equals(const TypeInfoData &other) const
 {
-    if (m_arrayElements.count() != other.m_arrayElements.count())
+    if (m_arrayElements.size() != other.m_arrayElements.size())
         return false;
 
 #if defined (RXX_CHECK_ARRAY_ELEMENTS) // ### it'll break
-    for (int i = 0; i < arrayElements().count(); ++i) {
+    for (qsizetype i = 0; i < arrayElements().size(); ++i) {
         QString elt1 = arrayElements().at(i).trimmed();
         QString elt2 = other.arrayElements().at(i).trimmed();
 
@@ -465,34 +452,31 @@ bool TypeInfoData::equals(const TypeInfoData &other) const
            && m_instantiations == other.m_instantiations;
 }
 
-bool TypeInfo::equals(const TypeInfo &other) const
+
+bool comparesEqual(const TypeInfo &lhs, const TypeInfo &rhs) noexcept
 {
-    return d.data() == other.d.data() || d->equals(*other.d);
+   return lhs.d.data() == rhs.d.data() || lhs.d->equals(*rhs.d);
 }
 
 QString TypeInfo::indirectionKeyword(Indirection i)
 {
-    return i == Indirection::Pointer
-        ? QStringLiteral("*") : QStringLiteral("*const");
+    return i == Indirection::Pointer ? "*"_L1 : "*const"_L1;
 }
 
-static inline QString constQualifier() { return QStringLiteral("const"); }
-static inline QString volatileQualifier() { return QStringLiteral("volatile"); }
-
 bool TypeInfo::stripLeadingConst(QString *s)
 {
-    return stripLeadingQualifier(constQualifier(), s);
+    return stripLeadingQualifier("const"_L1, s);
 }
 
 bool TypeInfo::stripLeadingVolatile(QString *s)
 {
-    return stripLeadingQualifier(volatileQualifier(), s);
+    return stripLeadingQualifier("volatile"_L1, s);
 }
 
-bool TypeInfo::stripLeadingQualifier(const QString &qualifier, QString *s)
+bool TypeInfo::stripLeadingQualifier(QLatin1StringView qualifier, QString *s)
 {
     // "const int x"
-    const int qualifierSize = qualifier.size();
+    const auto qualifierSize = qualifier.size();
     if (s->size() < qualifierSize + 1 || !s->startsWith(qualifier)
         || !s->at(qualifierSize).isSpace()) {
         return false;
@@ -508,10 +492,8 @@ void TypeInfo::stripQualifiers(QString *s)
 {
     stripLeadingConst(s);
     stripLeadingVolatile(s);
-    while (s->endsWith(QLatin1Char('&')) || s->endsWith(QLatin1Char('*'))
-        || s->endsWith(QLatin1Char(' '))) {
+    while (s->endsWith(u'&') || s->endsWith(u'*') || s->endsWith(u' '))
         s->chop(1);
-    }
 }
 
 // Helper functionality to simplify a raw standard type as returned by
@@ -522,7 +504,7 @@ void TypeInfo::stripQualifiers(QString *s)
 bool TypeInfoData::isStdType() const
 {
     return m_qualifiedName.size() > 1
-        && m_qualifiedName.constFirst() == QLatin1String("std");
+        && m_qualifiedName.constFirst() == u"std";
 }
 
 bool TypeInfo::isStdType() const
@@ -532,15 +514,15 @@ bool TypeInfo::isStdType() const
 
 static inline bool discardStdType(const QString &name)
 {
-    return name == QLatin1String("allocator") || name == QLatin1String("less");
+    return name == u"allocator" || name == u"less";
 }
 
 void TypeInfoData::simplifyStdType()
 {
     Q_ASSERT(isStdType());
-    if (m_qualifiedName.at(1).startsWith(QLatin1String("__")))
+    if (m_qualifiedName.at(1).startsWith(u"__"))
         m_qualifiedName.removeAt(1);
-    for (int t = m_instantiations.size() - 1; t >= 0; --t) {
+    for (auto t = m_instantiations.size() - 1; t >= 0; --t) {
         if (m_instantiations.at(t).isStdType()) {
             if (discardStdType(m_instantiations.at(t).qualifiedName().constLast()))
                 m_instantiations.removeAt(t);
@@ -560,7 +542,7 @@ void TypeInfo::formatTypeSystemSignature(QTextStream &str) const
 {
     if (d->m_constant)
         str << "const ";
-    str << d->m_qualifiedName.join(QLatin1String("::"));
+    str << d->m_qualifiedName.join(u"::"_s);
     switch (d->m_referenceType) {
     case NoReference:
         break;
@@ -584,16 +566,6 @@ void TypeInfo::formatTypeSystemSignature(QTextStream &str) const
 }
 
 #ifndef QT_NO_DEBUG_STREAM
-template <class It>
-void formatSequence(QDebug &d, It i1, It i2, const char *separator=", ")
-{
-    for (It i = i1; i != i2; ++i) {
-        if (i != i1)
-            d << separator;
-        d << *i;
-    }
-}
-
 void TypeInfo::formatDebug(QDebug &debug) const
 {
     debug << '"';