Signature: Produce Correctly Nested Python Interfaces

The signature extension has been around for a while.
As more and more demands arise, the quality of the generated
signatures becomes more demanding:

All signatures seem quite correct in PySide. But when testing
the shiboken signatures, some weird results occurred.
It turned out that nested classes were correctly handled by
the code generator, but the produced signatures were quite
wrong. Example:

Before the patch: sample.ValueIdentity.multiplicator()->int
After the patch: sample.Photon.ValueIdentity.multiplicator()->int

This quirk becomes an issue, because now signatures are
replacing the internally generated TypeError messages.

Task-number: PYSIDE-510
Task-number: PYSIDE-795
Change-Id: I16a26ecc2a2d384cb3184144d3934b2606723d53
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

3 files changed, 19 insertions, 6 deletions

diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index 0f94793e9..14bc99f7b 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -502,7 +502,7 @@ void CppGenerator::generateClass(QTextStream &s, GeneratorContext &classContext)
 
     if (metaClass->typeEntry()->isValue() || metaClass->typeEntry()->isSmartPointer()) {
         writeCopyFunction(s, classContext);
-        signatureStream << metaClass->fullName() << ".__copy__()" << endl;
+        signatureStream << fullPythonClassName(metaClass) << ".__copy__()" << endl;
     }
 
     // Write single method definitions
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
index 6d263dd01..b9eea7529 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
@@ -361,7 +361,19 @@ QString ShibokenGenerator::wrapperName(const AbstractMetaType *metaType) const
     return metaType->cppSignature();
 }
 
-QString ShibokenGenerator::fullPythonFunctionName(const AbstractMetaFunction* func)
+QString ShibokenGenerator::fullPythonClassName(const AbstractMetaClass *metaClass)
+{
+    QString fullClassName = metaClass->name();
+    const AbstractMetaClass *enclosing = metaClass->enclosingClass();
+    while (enclosing) {
+        fullClassName.prepend(enclosing->name() + QLatin1Char('.'));
+        enclosing = enclosing->enclosingClass();
+    }
+    fullClassName.prepend(packageName() + QLatin1Char('.'));
+    return fullClassName;
+}
+
+QString ShibokenGenerator::fullPythonFunctionName(const AbstractMetaFunction *func) //WS
 {
     QString funcName;
     if (func->isOperatorOverload())
@@ -369,11 +381,11 @@ QString ShibokenGenerator::fullPythonFunctionName(const AbstractMetaFunction* fu
     else
        funcName = func->name();
     if (func->ownerClass()) {
-        QString fullName = func->ownerClass()->fullName();
+        QString fullClassName = fullPythonClassName(func->ownerClass());
         if (func->isConstructor())
-            funcName = fullName;
+            funcName = fullClassName;
         else
-            funcName.prepend(fullName + QLatin1Char('.'));
+            funcName.prepend(fullClassName + QLatin1Char('.'));
     }
     else {
         funcName = packageName() + QLatin1Char('.') + func->name();
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.h b/sources/shiboken2/generator/shiboken2/shibokengenerator.h
index 76f71827a..60e31a99b 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.h
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.h
@@ -214,7 +214,8 @@ protected:
     QString wrapperName(const AbstractMetaClass* metaClass) const;
     QString wrapperName(const AbstractMetaType *metaType) const;
 
-    QString fullPythonFunctionName(const AbstractMetaFunction* func);
+    QString fullPythonClassName(const AbstractMetaClass *metaClass);
+    QString fullPythonFunctionName(const AbstractMetaFunction *func); //WS
 
     static QString protectedEnumSurrogateName(const AbstractMetaEnum* metaEnum);
     static QString protectedFieldGetterName(const AbstractMetaField* field);