1 files changed, 68 insertions, 0 deletions
diff --git a/sources/shiboken2/ApiExtractor/typesystemparser.cpp b/sources/shiboken2/ApiExtractor/typesystemparser.cpp
index e2450e6b4..0e28e8602 100644
--- a/sources/shiboken2/ApiExtractor/typesystemparser.cpp
+++ b/sources/shiboken2/ApiExtractor/typesystemparser.cpp
@@ -650,6 +650,14 @@ bool TypeSystemParser::parse(QXmlStreamReader &reader)
 {
     m_error.clear();
     m_currentPath.clear();
+    m_smartPointerInstantiations.clear();
+    const bool result = parseXml(reader) && setupSmartPointerInstantiations();
+    m_smartPointerInstantiations.clear();
+    return result;
+}
+
+bool TypeSystemParser::parseXml(QXmlStreamReader &reader)
+{
     const QString fileName = readerFileName(reader);
     if (!fileName.isEmpty())
         m_currentPath = QFileInfo(fileName).absolutePath();
@@ -693,6 +701,62 @@ bool TypeSystemParser::parse(QXmlStreamReader &reader)
     return true;
 }
 
+// Split a type list potentially with template types
+// "A<B,C>,D" -> ("A<B,C>", "D")
+static QStringList splitTypeList(const QString &s)
+{
+    QStringList result;
+    int templateDepth = 0;
+    int lastPos = 0;
+    const int size = s.size();
+    for (int i = 0; i < size; ++i) {
+        switch (s.at(i).toLatin1()) {
+        case '<':
+            ++templateDepth;
+            break;
+        case '>':
+            --templateDepth;
+            break;
+        case ',':
+            if (templateDepth == 0) {
+                result.append(s.mid(lastPos, i - lastPos).trimmed());
+                lastPos = i + 1;
+            }
+            break;
+        }
+    }
+    if (lastPos < size)
+        result.append(s.mid(lastPos, size - lastPos).trimmed());
+    return result;
+}
+
+bool TypeSystemParser::setupSmartPointerInstantiations()
+{
+    for (auto it = m_smartPointerInstantiations.cbegin(),
+         end = m_smartPointerInstantiations.cend(); it != end; ++it) {
+        auto smartPointerEntry = it.key();
+        const auto instantiationNames = splitTypeList(it.value());
+        SmartPointerTypeEntry::Instantiations instantiations;
+        instantiations.reserve(instantiationNames.size());
+        for (const auto &instantiationName : instantiationNames) {
+            const auto types = m_database->findCppTypes(instantiationName);
+            if (types.isEmpty()) {
+                m_error =
+                    msgCannotFindTypeEntryForSmartPointer(instantiationName,
+                                                          smartPointerEntry->name());
+                return false;
+            }
+            if (types.size() > 1) {
+                m_error = msgAmbiguousTypesFound(instantiationName, types);
+                return false;
+            }
+            instantiations.append(types.constFirst());
+        }
+        smartPointerEntry->setInstantiations(instantiations);
+    }
+    return true;
+}
+
 bool TypeSystemParser::endElement(const QStringRef &localName)
 {
     if (m_ignoreDepth) {
@@ -1135,6 +1199,7 @@ SmartPointerTypeEntry *
     QString smartPointerType;
     QString getter;
     QString refCountMethodName;
+    QString instantiations;
     for (int i = attributes->size() - 1; i >= 0; --i) {
         const QStringRef name = attributes->at(i).qualifiedName();
         if (name == QLatin1String("type")) {
@@ -1143,6 +1208,8 @@ SmartPointerTypeEntry *
             getter = attributes->takeAt(i).value().toString();
         } else if (name == QLatin1String("ref-count-method")) {
             refCountMethodName = attributes->takeAt(i).value().toString();
+        } else if (name == QLatin1String("instantiations")) {
+            instantiations = attributes->takeAt(i).value().toString();
         }
     }
 
@@ -1177,6 +1244,7 @@ SmartPointerTypeEntry *
     auto *type = new SmartPointerTypeEntry(name, getter, smartPointerType,
                                            refCountMethodName, since, currentParentTypeEntry());
     applyCommonAttributes(type, attributes);
+    m_smartPointerInstantiations.insert(type, instantiations);
     return type;
 }