shiboken: Fix invalid code generated for signatures with string default parameters

In the case of a default parameter with backslash escaping,
wrong code can be generared.
Factor out a helper function and generate signature strings
as C++ raw string literals.

Fixes: PYSIDE-1310
Change-Id: If7aa8e2449e959ce298da45a2977728823b25c2f
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

2 files changed, 19 insertions, 16 deletions

diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index 52892663e..4c637e701 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -4646,8 +4646,6 @@ void CppGenerator::writeSignatureInfo(QTextStream &s, const AbstractMetaFunction
                 strArg += QLatin1Char('=');
                 QString e = arg->defaultValueExpression();
                 e.replace(QLatin1String("::"), QLatin1String("."));
-                // the tests insert stuff like Str("<unknown>"):
-                e.replace(QLatin1Char('"'), QLatin1String("\\\""));
                 strArg += e;
             }
             args << arg->name() + QLatin1Char(':') + strArg;
@@ -4976,6 +4974,20 @@ QString CppGenerator::getInitFunctionName(const GeneratorContext &context) const
         : getFilteredCppSignatureString(context.preciseType()->cppSignature());
 }
 
+void CppGenerator::writeSignatureStrings(QTextStream &s,
+                                         QTextStream &signatureStream,
+                                         const QString &arrayName,
+                                         const char *comment) const
+{
+    s << "// The signatures string for the " << comment << ".\n";
+    s << "// Multiple signatures have their index \"n:\" in front.\n";
+    s << "static const char *" << arrayName << "_SignatureStrings[] = {\n";
+    QString line;
+    while (signatureStream.readLineInto(&line))
+        s << INDENT << "R\"CPP(" << line << ")CPP\",\n";
+    s << INDENT << NULL_PTR << "}; // Sentinel\n\n";
+}
+
 void CppGenerator::writeClassRegister(QTextStream &s,
                                       const AbstractMetaClass *metaClass,
                                       const GeneratorContext &classContext,
@@ -4990,13 +5002,7 @@ void CppGenerator::writeClassRegister(QTextStream &s,
     QString initFunctionName = getInitFunctionName(classContext);
 
     // PYSIDE-510: Create a signatures string for the introspection feature.
-    s << "// The signatures string for the functions.\n";
-    s << "// Multiple signatures have their index \"n:\" in front.\n";
-    s << "static const char *" << initFunctionName << "_SignatureStrings[] = {\n";
-    QString line;
-    while (signatureStream.readLineInto(&line))
-        s << INDENT << '"' << line << "\",\n";
-    s << INDENT << NULL_PTR << "}; // Sentinel\n\n";
+    writeSignatureStrings(s, signatureStream, initFunctionName, "functions");
     s << "void init_" << initFunctionName;
     s << "(PyObject *" << enclosingObjectVariable << ")\n{\n";
 
@@ -5802,13 +5808,7 @@ bool CppGenerator::finishGeneration()
     s << "#endif\n\n";
 
     // PYSIDE-510: Create a signatures string for the introspection feature.
-    s << "// The signatures string for the global functions.\n";
-    s << "// Multiple signatures have their index \"n:\" in front.\n";
-    s << "static const char *" << moduleName() << "_SignatureStrings[] = {\n";
-    QString line;
-    while (signatureStream.readLineInto(&line))
-        s << INDENT << '"' << line << "\",\n";
-    s << INDENT << NULL_PTR << "}; // Sentinel\n\n";
+    writeSignatureStrings(s, signatureStream, moduleName(), "global functions");
 
     s << "SBK_MODULE_INIT_FUNCTION_BEGIN(" << moduleName() << ")\n";
 
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.h b/sources/shiboken2/generator/shiboken2/cppgenerator.h
index 7308f7d18..4e995d56f 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.h
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.h
@@ -249,6 +249,9 @@ private:
     QString getInitFunctionName(const GeneratorContext &context) const;
     QString getSimpleClassInitFunctionName(const AbstractMetaClass *metaClass) const;
 
+    void writeSignatureStrings(QTextStream &s, QTextStream &signatureStream,
+                               const QString &arrayName,
+                               const char *comment) const;
     void writeClassRegister(QTextStream &s,
                             const AbstractMetaClass *metaClass,
                             const GeneratorContext &classContext,