shiboken: Improve handling of non-type template integer parameters

When trying to specify the base class
template<int R, int C> QGenericMatrix of the QMatrixRxN classes,
clashes of the SBK..IDX enumeration values occurred since
the integers were not part of the type name.

Fix that by dynamically adding dummy entries of
EnumValueTypeEntry for the integer values encountered on the fly.

Task-number: PYSIDE-725
Change-Id: Ie6b4489b5293e04b7c2c76861341c99b136cd558
Reviewed-by: Christian Tismer <tismer@stackless.com>

2 files changed, 32 insertions, 16 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index c8ff41d91..979ac010e 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -2755,20 +2755,35 @@ bool AbstractMetaBuilderPrivate::inheritTemplate(AbstractMetaClass *subclass,
 
     for (const TypeInfo &i : qAsConst(targs)) {
         QString typeName = i.qualifiedName().join(colonColon());
-        QStringList possibleNames;
-        possibleNames << subclass->qualifiedCppName() + colonColon() + typeName;
-        possibleNames << templateClass->qualifiedCppName() + colonColon() + typeName;
-        if (subclass->enclosingClass())
-            possibleNames << subclass->enclosingClass()->qualifiedCppName() + colonColon() + typeName;
-        possibleNames << typeName;
-
-        TypeDatabase* typeDb = TypeDatabase::instance();
-        TypeEntry* t = 0;
-        QString templateParamName;
-        for (const QString &possibleName : qAsConst(possibleNames)) {
-            t = typeDb->findType(possibleName);
-            if (t)
-                break;
+        TypeDatabase *typeDb = TypeDatabase::instance();
+        TypeEntry *t = nullptr;
+        // Check for a non-type template integer parameter, that is, for a base
+        // "template <int R, int C> Matrix<R, C>" and subclass
+        // "typedef Matrix<2,3> Matrix2x3;". If so, create dummy entries of
+        // EnumValueTypeEntry for the integer values encountered on the fly.
+        const bool isNumber = std::all_of(typeName.cbegin(), typeName.cend(),
+                                          [](QChar c) { return c.isDigit(); });
+        if (isNumber) {
+            t = typeDb->findType(typeName);
+            if (!t) {
+                t = new EnumValueTypeEntry(typeName, typeName, nullptr,
+                                           QVersionNumber(0, 0));
+                t->setCodeGeneration(0);
+                typeDb->addType(t);
+            }
+        } else {
+            QStringList possibleNames;
+            possibleNames << subclass->qualifiedCppName() + colonColon() + typeName;
+            possibleNames << templateClass->qualifiedCppName() + colonColon() + typeName;
+            if (subclass->enclosingClass())
+                possibleNames << subclass->enclosingClass()->qualifiedCppName() + colonColon() + typeName;
+            possibleNames << typeName;
+
+            for (const QString &possibleName : qAsConst(possibleNames)) {
+                t = typeDb->findType(possibleName);
+                if (t)
+                    break;
+            }
         }
 
         if (t) {
@@ -2781,7 +2796,7 @@ bool AbstractMetaBuilderPrivate::inheritTemplate(AbstractMetaClass *subclass,
             templateTypes << temporaryType;
         } else {
             qCWarning(lcShiboken).noquote().nospace()
-                << "Ignoring template parameter " << templateParamName << " from "
+                << "Ignoring template parameter " << typeName << " from "
                 << info.toString() << ". The corresponding type was not found in the typesystem.";
         }
     }
diff --git a/sources/shiboken2/ApiExtractor/typesystem.h b/sources/shiboken2/ApiExtractor/typesystem.h
index d892cb3a5..a1e3aea91 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.h
+++ b/sources/shiboken2/ApiExtractor/typesystem.h
@@ -1134,7 +1134,8 @@ private:
 };
 
 // EnumValueTypeEntry is used for resolving integer type templates
-// like array<EnumValue>.
+// like array<EnumValue>. Note: Dummy entries for integer values will
+// be created for non-type template parameters, where m_enclosingEnum==nullptr.
 class EnumValueTypeEntry : public TypeEntry
 {
 public: