shiboken6: Match function modifications by unresolved signature as well

Store the unresolved signature from the code model as an additional
field in AbstractMetaFunction. Add a function modificationSignatures()
to return a list of signatures to be matched against the
modifications.

[ChangeLog][shiboken6] The signatures for function modifications now
also allow for specifying unresolved types.

Change-Id: I258c4ff2ddf87542098568ee01ca4f444afd05ce
Reviewed-by: Christian Tismer <tismer@stackless.com>

10 files changed, 62 insertions, 18 deletions

diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
index 7f4941f3b..0e05f2a7c 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
@@ -42,6 +42,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
+#include <QtCore/QMetaObject>
 #include <QtCore/QQueue>
 #include <QtCore/QRegularExpression>
 #include <QtCore/QTemporaryFile>
@@ -175,13 +176,14 @@ void AbstractMetaBuilderPrivate::checkFunctionModifications()
             QStringList possibleSignatures;
             for (const auto &function : clazz->functions()) {
                 if (function->implementingClass() == clazz
-                    && modification.matches(function->minimalSignature())) {
+                    && modification.matches(function->modificationSignatures())) {
                     found = true;
                     break;
                 }
 
                 if (function->originalName() == name) {
-                    possibleSignatures.append(function->minimalSignature() + u" in "_s
+                    const QString signatures = function->modificationSignatures().join(u'/');
+                    possibleSignatures.append(signatures + u" in "_s
                                               + function->implementingClass()->name());
                 }
             }
@@ -1955,6 +1957,10 @@ AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(const Functio
     }
 
     auto *metaFunction = new AbstractMetaFunction(functionName);
+    const QByteArray cSignature = signature.toUtf8();
+    const QString unresolvedSignature =
+        QString::fromUtf8(QMetaObject::normalizedSignature(cSignature.constData()));
+    metaFunction->setUnresolvedSignature(unresolvedSignature);
     if (functionItem->isHiddenFriend())
         metaFunction->setFlags(AbstractMetaFunction::Flag::HiddenFriend);
     metaFunction->setSourceLocation(functionItem->sourceLocation());
diff --git a/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp b/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp
index 09d08743b..888c6339a 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp
@@ -69,6 +69,7 @@ public:
     mutable QString m_cachedMinimalSignature;
     mutable QString m_cachedSignature;
     mutable QString m_cachedModifiedName;
+    QString m_unresolvedSignature;
 
     FunctionTypeEntry* m_typeEntry = nullptr;
     AbstractMetaFunction::FunctionType m_functionType = AbstractMetaFunction::NormalFunction;
@@ -522,6 +523,16 @@ QString AbstractMetaFunction::classQualifiedSignature() const
     return result;
 }
 
+QString AbstractMetaFunction::unresolvedSignature() const
+{
+    return d->m_unresolvedSignature;
+}
+
+void AbstractMetaFunction::setUnresolvedSignature(const QString &s)
+{
+    d->m_unresolvedSignature = s;
+}
+
 bool AbstractMetaFunction::isConstant() const
 {
     return d->m_constant;
@@ -953,6 +964,14 @@ QString AbstractMetaFunction::minimalSignature() const
     return d->m_cachedMinimalSignature;
 }
 
+QStringList AbstractMetaFunction::modificationSignatures() const
+{
+    QStringList result{minimalSignature()};
+    if (d->m_unresolvedSignature != result.constFirst())
+        result.append(d->m_unresolvedSignature);
+    return result;
+}
+
 QString AbstractMetaFunction::signatureComment() const
 {
     return d->formatMinimalSignature(this, true);
@@ -978,10 +997,10 @@ QString AbstractMetaFunction::debugSignature() const
 FunctionModificationList AbstractMetaFunction::findClassModifications(const AbstractMetaFunction *f,
                                                                       const AbstractMetaClass *implementor)
 {
-    const QString signature = f->minimalSignature();
+    const auto signatures = f->modificationSignatures();
     FunctionModificationList mods;
     while (implementor) {
-        mods += implementor->typeEntry()->functionModifications(signature);
+        mods += implementor->typeEntry()->functionModifications(signatures);
         if ((implementor == implementor->baseClass()) ||
             (implementor == f->implementingClass() && !mods.isEmpty())) {
                 break;
@@ -993,7 +1012,8 @@ FunctionModificationList AbstractMetaFunction::findClassModifications(const Abst
 
 FunctionModificationList AbstractMetaFunction::findGlobalModifications(const AbstractMetaFunction *f)
 {
-    return TypeDatabase::instance()->functionModifications(f->minimalSignature());
+    auto *td = TypeDatabase::instance();
+    return td->globalFunctionModifications(f->modificationSignatures());
 }
 
 const FunctionModificationList &
@@ -1564,7 +1584,10 @@ void AbstractMetaFunction::formatDebugVerbose(QDebug &debug) const
             debug << ", ";
         debug <<  d->m_arguments.at(i);
     }
-    debug << "), signature=\"" << minimalSignature() << '"';
+    const QString signature = minimalSignature();
+    debug << "), signature=\"" << signature << '"';
+    if (signature != d->m_unresolvedSignature)
+        debug << ", unresolvedSignature=\"" << d->m_unresolvedSignature << '"';
     if (d->m_constant)
         debug << " [const]";
     if (d->m_reverse)
diff --git a/sources/shiboken6/ApiExtractor/abstractmetafunction.h b/sources/shiboken6/ApiExtractor/abstractmetafunction.h
index 4b0033a73..0fa15c2bf 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetafunction.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetafunction.h
@@ -231,6 +231,8 @@ public:
     QString modifiedName() const;
 
     QString minimalSignature() const;
+    /// List of signatures matched for modifications
+    QStringList modificationSignatures() const;
     // Signature with replaced argument types and return type for overload
     // decisor comment.
     QString signatureComment() const;
@@ -292,6 +294,10 @@ public:
     /// Return a signature qualified by class name, for error reporting.
     QString classQualifiedSignature() const;
 
+    /// Signature with unresolved typedefs as seen by the code parser
+    QString unresolvedSignature() const;
+    void setUnresolvedSignature(const QString &);
+
     bool isConstant() const;
     void setConstant(bool constant);
 
diff --git a/sources/shiboken6/ApiExtractor/complextypeentry.h b/sources/shiboken6/ApiExtractor/complextypeentry.h
index b87adedc0..d21ec3ab8 100644
--- a/sources/shiboken6/ApiExtractor/complextypeentry.h
+++ b/sources/shiboken6/ApiExtractor/complextypeentry.h
@@ -69,7 +69,7 @@ public:
     FunctionModificationList functionModifications() const;
     void setFunctionModifications(const FunctionModificationList &functionModifications);
     void addFunctionModification(const FunctionModification &functionModification);
-    FunctionModificationList functionModifications(const QString &signature) const;
+    FunctionModificationList functionModifications(const QStringList &signatures) const;
 
     const CodeSnipList &codeSnips() const;
     CodeSnipList &codeSnips();
diff --git a/sources/shiboken6/ApiExtractor/modifications.cpp b/sources/shiboken6/ApiExtractor/modifications.cpp
index b0b5881fb..5cc8b00f4 100644
--- a/sources/shiboken6/ApiExtractor/modifications.cpp
+++ b/sources/shiboken6/ApiExtractor/modifications.cpp
@@ -579,11 +579,16 @@ void FunctionModification::setAllowThread(FunctionModification::AllowThread allo
         d->m_allowThread = allow;
 }
 
-bool FunctionModification::matches(const QString &functionSignature) const
+bool FunctionModification::matches(const QStringList &functionSignatures) const
 {
-    return d->m_signature.isEmpty()
-            ? d->m_signaturePattern.match(functionSignature).hasMatch()
-            : d->m_signature == functionSignature;
+    if (!d->m_signature.isEmpty())
+        return functionSignatures.contains(d->m_signature);
+
+    for (const auto &s : functionSignatures) {
+        if (d->m_signaturePattern.match(s).hasMatch())
+            return true;
+    }
+    return false;
 }
 
 bool FunctionModification::setSignature(const QString &s, QString *errorMessage)
diff --git a/sources/shiboken6/ApiExtractor/modifications.h b/sources/shiboken6/ApiExtractor/modifications.h
index 992ba6434..c49966cc2 100644
--- a/sources/shiboken6/ApiExtractor/modifications.h
+++ b/sources/shiboken6/ApiExtractor/modifications.h
@@ -228,7 +228,7 @@ public:
     AllowThread allowThread() const;
     void setAllowThread(AllowThread allow);
 
-    bool matches(const QString &functionSignature) const;
+    bool matches(const QStringList &functionSignatures) const;
 
     bool setSignature(const QString &s, QString *errorMessage =  nullptr);
     QString signature() const;
diff --git a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp
index e9167bb35..3c8a773e5 100644
--- a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp
@@ -289,7 +289,8 @@ void TestModifyFunction::testGlobalFunctionModification()
     QVERIFY(!builder.isNull());
     QCOMPARE(builder->globalFunctions().size(), 1);
 
-    FunctionModificationList mods = TypeDatabase::instance()->functionModifications(u"function(A*)"_s);
+    auto *td = TypeDatabase::instance();
+    FunctionModificationList mods = td->globalFunctionModifications({u"function(A*)"_s});
     QCOMPARE(mods.size(), 1);
     const QList<ArgumentModification> &argMods = mods.constFirst().argument_mods();
     QCOMPARE(argMods.size(), 1);
diff --git a/sources/shiboken6/ApiExtractor/typedatabase.cpp b/sources/shiboken6/ApiExtractor/typedatabase.cpp
index e0b1219a9..50f20b1f3 100644
--- a/sources/shiboken6/ApiExtractor/typedatabase.cpp
+++ b/sources/shiboken6/ApiExtractor/typedatabase.cpp
@@ -754,11 +754,12 @@ QString TypeDatabase::globalNamespaceClassName(const TypeEntry * /*entry*/)
     return u"Global"_s;
 }
 
-FunctionModificationList TypeDatabase::functionModifications(const QString& signature) const
+FunctionModificationList
+    TypeDatabase::globalFunctionModifications(const QStringList &signatures) const
 {
     FunctionModificationList lst;
     for (const auto &mod : d->m_functionMods) {
-        if (mod.matches(signature))
+        if (mod.matches(signatures))
             lst << mod;
     }
 
diff --git a/sources/shiboken6/ApiExtractor/typedatabase.h b/sources/shiboken6/ApiExtractor/typedatabase.h
index 38a47856a..af53971a1 100644
--- a/sources/shiboken6/ApiExtractor/typedatabase.h
+++ b/sources/shiboken6/ApiExtractor/typedatabase.h
@@ -163,7 +163,8 @@ public:
 
     void addGlobalUserFunctionModifications(const FunctionModificationList &functionModifications);
 
-    FunctionModificationList functionModifications(const QString &signature) const;
+    FunctionModificationList
+        globalFunctionModifications(const QStringList &signatures) const;
 
     void setSuppressWarnings(bool on);
 
diff --git a/sources/shiboken6/ApiExtractor/typesystem.cpp b/sources/shiboken6/ApiExtractor/typesystem.cpp
index 35025e36a..36f411a09 100644
--- a/sources/shiboken6/ApiExtractor/typesystem.cpp
+++ b/sources/shiboken6/ApiExtractor/typesystem.cpp
@@ -1306,12 +1306,13 @@ void ComplexTypeEntry::addFunctionModification(const FunctionModification &funct
     d->m_functionMods << functionModification;
 }
 
-FunctionModificationList ComplexTypeEntry::functionModifications(const QString &signature) const
+FunctionModificationList
+    ComplexTypeEntry::functionModifications(const QStringList &signatures) const
 {
     S_D(const ComplexTypeEntry);
     FunctionModificationList lst;
     for (const auto &mod : std::as_const(d->m_functionMods)) {
-        if (mod.matches(signature))
+        if (mod.matches(signatures))
             lst << mod;
     }
     return lst;