1 files changed, 44 insertions, 13 deletions

diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.h b/sources/shiboken2/ApiExtractor/parser/codemodel.h
index ac1fe26c1..0296a8cb2 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.h
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.h
@@ -36,6 +36,7 @@
 #include "enumvalue.h"
 
 #include <QtCore/QHash>
+#include <QtCore/QPair>
 #include <QtCore/QSet>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
@@ -100,6 +101,8 @@ class TypeInfo
 {
     friend class TypeParser;
 public:
+    typedef QVector<Indirection> Indirections;
+
     TypeInfo() : flags(0), m_referenceType(NoReference) {}
 
     QStringList qualifiedName() const
@@ -137,14 +140,16 @@ public:
     ReferenceType referenceType() const { return m_referenceType; }
     void setReferenceType(ReferenceType r) { m_referenceType = r; }
 
-    int indirections() const
-    {
-        return m_indirections;
-    }
+    Indirections indirectionsV() const { return m_indirections; }
+    void setIndirectionsV(const Indirections &i) { m_indirections = i; }
+    void addIndirection(Indirection i) { m_indirections.append(i); }
+
+    // "Legacy", rename?
+    int indirections() const { return m_indirections.size(); }
 
     void setIndirections(int indirections)
     {
-        m_indirections = indirections;
+        m_indirections = Indirections(indirections, Indirection::Pointer);
     }
 
     bool isFunctionPointer() const
@@ -165,6 +170,8 @@ public:
         m_arrayElements = arrayElements;
     }
 
+    void addArrayElement(const QString &a) { m_arrayElements.append(a); }
+
     QVector<TypeInfo> arguments() const { return m_arguments; }
 
     void setArguments(const QVector<TypeInfo> &arguments);
@@ -174,6 +181,15 @@ public:
         m_arguments.append(arg);
     }
 
+    QVector<TypeInfo> instantiations() const { return m_instantiations; }
+    void setInstantiations(const QVector<TypeInfo> &i) { m_instantiations = i; }
+    void addInstantiation(const TypeInfo &i) { m_instantiations.append(i); }
+    void clearInstantiations() { m_instantiations.clear(); }
+
+    bool isStdType() const;
+
+    QPair<int, int> parseTemplateArgumentList(const QString &l, int from = 0);
+
     bool operator==(const TypeInfo &other) const;
 
     bool operator!=(const TypeInfo &other) const
@@ -185,8 +201,6 @@ public:
 
     QString toString() const;
 
-    QStringList instantiationName() const;
-
     static TypeInfo combine(const TypeInfo &__lhs, const TypeInfo &__rhs);
     static TypeInfo resolveType(TypeInfo const &__type, CodeModelItem __scope);
 
@@ -194,12 +208,24 @@ public:
     void formatDebug(QDebug &d) const;
 #endif
 
+    static QString indirectionKeyword(Indirection i);
+
+    static bool stripLeadingConst(QString *s);
+    static bool stripLeadingVolatile(QString *s);
+    static bool stripLeadingQualifier(const QString &qualifier, QString *s);
+
+    void simplifyStdType();
+
 private:
+    friend class TypeInfoTemplateArgumentHandler;
+
     static TypeInfo resolveType(CodeModelItem item, TypeInfo const &__type, CodeModelItem __scope);
 
     QStringList m_qualifiedName;
     QStringList m_arrayElements;
     QVector<TypeInfo> m_arguments;
+    QVector<TypeInfo> m_instantiations;
+    Indirections m_indirections;
 
     union {
         uint flags;
@@ -208,8 +234,7 @@ private:
             uint m_constant: 1;
             uint m_volatile: 1;
             uint m_functionPointer: 1;
-            uint m_indirections: 6;
-            uint m_padding: 23;
+            uint m_padding: 29;
         };
     };
 
@@ -409,8 +434,7 @@ public:
         : _ScopeModelItem(model, name, kind) {}
     ~_NamespaceModelItem();
 
-    NamespaceList namespaces() const { return m_namespaces; }
-    QSet<NamespaceModelItem> uniqueNamespaces() const;
+    const NamespaceList &namespaces() const { return m_namespaces; }
 
     void addNamespace(NamespaceModelItem item);
 
@@ -547,7 +571,7 @@ public:
 
     ArgumentList arguments() const;
 
-    void addArgument(ArgumentModelItem item);
+    void addArgument(const ArgumentModelItem& item);
 
     CodeModel::FunctionType functionType() const;
     void setFunctionType(CodeModel::FunctionType functionType);
@@ -582,7 +606,13 @@ public:
     bool isVariadics() const;
     void setVariadics(bool isVariadics);
 
-    bool isSimilar(FunctionModelItem other) const;
+
+    bool isSimilar(const FunctionModelItem &other) const;
+
+    bool isNoExcept() const;
+
+    ExceptionSpecification exceptionSpecification() const;
+    void setExceptionSpecification(ExceptionSpecification e);
 
 #ifndef QT_NO_DEBUG_STREAM
     void formatDebug(QDebug &d) const override;
@@ -606,6 +636,7 @@ private:
         };
         uint m_flags;
     };
+    ExceptionSpecification m_exceptionSpecification = ExceptionSpecification::Unknown;
 };
 
 class _VariableModelItem: public _MemberModelItem