shiboken: Add instantiations to TypeInfo

When streamlining the typeinfo structs in
7f798dfc9fc6e3e9756f06f0fedc821e16f1320a,
the parser was wrongly changed to use TypeInfo::m_arguments
for template instantiations. This field is intented
for function pointer arguments (which the parser does not support).
Add a new TypeInfo::m_instantiations (matching
AbstractMetaType::m_instantiations) for templates, support
it in the type parser and to the toString() method.
This allows to remove the mysterious TypeInfo::instantiationName() method.

Task-number: PYSIDE-672
Change-Id: I705b26d65988ebfb837e8323941076b4fb37d120
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>

4 files changed, 38 insertions, 27 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 340ed846a..5e7afbc09 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -1014,7 +1014,7 @@ AbstractMetaClass* AbstractMetaBuilderPrivate::traverseTypeDef(const FileModelIt
     AbstractMetaClass *metaClass = new AbstractMetaClass;
     metaClass->setTypeDef(true);
     metaClass->setTypeEntry(type);
-    metaClass->setBaseClassNames(QStringList() << typeDef->type().qualifiedName().join(colonColon()));
+    metaClass->setBaseClassNames(QStringList(typeDef->type().toString()));
     *metaClass += AbstractMetaAttributes::Public;
 
     // Set the default include file name
@@ -2358,8 +2358,10 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const TypeInfo &_typ
     QString name = qualifierList.takeLast();
 
     // 4. Special case QFlags (include instantiation in name)
-    if (qualifiedName == QLatin1String("QFlags"))
+    if (qualifiedName == QLatin1String("QFlags")) {
         qualifiedName = typeInfo.toString();
+        typeInfo.clearInstantiations();
+    }
 
     const TypeEntry *type = 0;
     // 5. Try to find the type
@@ -2417,10 +2419,9 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const TypeInfo &_typ
     metaType->setConstant(typeInfo.isConstant());
     metaType->setOriginalTypeDescription(_typei.toString());
 
-    const auto &templateArguments = typeInfo.arguments();
+    const auto &templateArguments = typeInfo.instantiations();
     for (int t = 0, size = templateArguments.size(); t < size; ++t) {
         TypeInfo ti = templateArguments.at(t);
-        ti.setQualifiedName(ti.instantiationName());
         AbstractMetaType *targType = translateType(ti);
         if (!targType) {
             delete metaType;
@@ -2733,7 +2734,7 @@ bool AbstractMetaBuilderPrivate::inheritTemplate(AbstractMetaClass *subclass,
                                                  const AbstractMetaClass *templateClass,
                                                  const TypeInfo &info)
 {
-    QVector<TypeInfo> targs = info.arguments();
+    QVector<TypeInfo> targs = info.instantiations();
     QVector<AbstractMetaType *> templateTypes;
 
     if (subclass->isTypeDef()) {
@@ -2775,7 +2776,7 @@ bool AbstractMetaBuilderPrivate::inheritTemplate(AbstractMetaClass *subclass,
         } else {
             qCWarning(lcShiboken).noquote().nospace()
                 << "Ignoring template parameter " << templateParamName << " from "
-                << info.instantiationName() << ", because I don't know what it is.";
+                << info.toString() << ", because I don't know what it is.";
         }
     }
 
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
index d862692dd..39f438f4e 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
@@ -142,6 +142,7 @@ TypeInfo TypeInfo::combine(const TypeInfo &__lhs, const TypeInfo &__rhs)
         __result.setReferenceType(__rhs.referenceType());
     __result.setIndirections(__result.indirections() + __rhs.indirections());
     __result.setArrayElements(__result.arrayElements() + __rhs.arrayElements());
+    __result.m_instantiations.append(__rhs.m_instantiations);
 
     return __result;
 }
@@ -150,6 +151,7 @@ bool TypeInfo::isVoid() const
 {
     return m_indirections == 0 && m_referenceType == NoReference
         && m_arguments.isEmpty() && m_arrayElements.isEmpty()
+        && m_instantiations.isEmpty()
         && m_qualifiedName.size() == 1
         && m_qualifiedName.constFirst() == QLatin1String("void");
 }
@@ -204,6 +206,18 @@ QString TypeInfo::toString() const
     if (isVolatile())
         tmp += QLatin1String(" volatile");
 
+    if (const int instantiationCount = m_instantiations.size()) {
+        tmp += QLatin1Char('<');
+        for (int i = 0; i < instantiationCount; ++i) {
+            if (i)
+                tmp += QLatin1String(", ");
+            tmp += m_instantiations.at(i).toString();
+        }
+        if (tmp.endsWith(QLatin1Char('>')))
+            tmp += QLatin1Char(' ');
+        tmp += QLatin1Char('>');
+    }
+
     if (indirections())
         tmp += QString(indirections(), QLatin1Char('*'));
 
@@ -238,20 +252,6 @@ QString TypeInfo::toString() const
     return tmp;
 }
 
-QStringList TypeInfo::instantiationName() const
-{
-    QStringList result = m_qualifiedName;
-    if (const int argumentCount = m_arguments.size()) {
-        QString &last = result.last();
-        for (int i = 0; i < argumentCount; ++i) {
-            last += i ? QLatin1String(", ") : QLatin1String("< ");
-            last += m_arguments.at(i).toString();
-        }
-        last += QLatin1String(" >");
-    }
-    return result;
-}
-
 bool TypeInfo::operator==(const TypeInfo &other) const
 {
     if (arrayElements().count() != other.arrayElements().count())
@@ -269,7 +269,8 @@ bool TypeInfo::operator==(const TypeInfo &other) const
 
     return flags == other.flags
            && m_qualifiedName == other.m_qualifiedName
-           && (!m_functionPointer || m_arguments == other.m_arguments);
+           && (!m_functionPointer || m_arguments == other.m_arguments)
+           && m_instantiations == other.m_instantiations;
 }
 
 #ifndef QT_NO_DEBUG_STREAM
@@ -304,6 +305,11 @@ void TypeInfo::formatDebug(QDebug &d) const
         d << ", [rvalref]";
         break;
     }
+    if (!m_instantiations.isEmpty()) {
+        d << ", template<";
+        formatSequence(d, m_instantiations.begin(), m_instantiations.end());
+        d << '>';
+    }
     if (m_functionPointer) {
         d << ", function ptr(";
         formatSequence(d, m_arguments.begin(), m_arguments.end());
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.h b/sources/shiboken2/ApiExtractor/parser/codemodel.h
index ac1fe26c1..fbc1f2b7a 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.h
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.h
@@ -174,6 +174,11 @@ 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 operator==(const TypeInfo &other) const;
 
     bool operator!=(const TypeInfo &other) const
@@ -185,8 +190,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);
 
@@ -200,6 +203,7 @@ private:
     QStringList m_qualifiedName;
     QStringList m_arrayElements;
     QVector<TypeInfo> m_arguments;
+    QVector<TypeInfo> m_instantiations;
 
     union {
         uint flags;
diff --git a/sources/shiboken2/ApiExtractor/typeparser.cpp b/sources/shiboken2/ApiExtractor/typeparser.cpp
index 02c85421b..919da5471 100644
--- a/sources/shiboken2/ApiExtractor/typeparser.cpp
+++ b/sources/shiboken2/ApiExtractor/typeparser.cpp
@@ -212,14 +212,14 @@ TypeInfo TypeParser::parse(const QString &str, QString *errorMessage)
             }
             break;
         case Scanner::LessThanToken:
-            stack.top()->m_arguments << TypeInfo();
-            stack.push(&stack.top()->m_arguments.last());
+            stack.top()->m_instantiations << TypeInfo();
+            stack.push(&stack.top()->m_instantiations.last());
             break;
 
         case Scanner::CommaToken:
             stack.pop();
-            stack.top()->m_arguments << TypeInfo();
-            stack.push(&stack.top()->m_arguments.last());
+            stack.top()->m_instantiations << TypeInfo();
+            stack.push(&stack.top()->m_instantiations.last());
             break;
 
         case Scanner::GreaterThanToken: