shiboken: Replace some character #defines by char constants

Change defines to variables where possible (not used in string literal
concatenations).
Remove constants only used in one file from the header.

Change regular expressions to raw string literals for clarity.
Replace static instance of the CONVERTTOCPP regular expressions
by an accessor of ShibokenGenerator.

Change PATH_SPLITTER in main.cpp define to a QChar constant.

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

6 files changed, 51 insertions, 37 deletions

diff --git a/sources/shiboken2/ApiExtractor/typesystem.cpp b/sources/shiboken2/ApiExtractor/typesystem.cpp
index e17286900..d08fed7f9 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.cpp
+++ b/sources/shiboken2/ApiExtractor/typesystem.cpp
@@ -42,6 +42,9 @@
 
 #include <algorithm>
 
+const char *TARGET_CONVERSION_RULE_FLAG = "0";
+const char *NATIVE_CONVERSION_RULE_FLAG = "1";
+
 static QString strings_Object = QLatin1String("Object");
 static QString strings_String = QLatin1String("String");
 static QString strings_char = QLatin1String("char");
diff --git a/sources/shiboken2/ApiExtractor/typesystem.h b/sources/shiboken2/ApiExtractor/typesystem.h
index f7571b934..db0cc97d3 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.h
+++ b/sources/shiboken2/ApiExtractor/typesystem.h
@@ -43,8 +43,8 @@
 #include <QtCore/QVersionNumber>
 
 //Used to identify the conversion rule to avoid break API
-#define TARGET_CONVERSION_RULE_FLAG "0"
-#define NATIVE_CONVERSION_RULE_FLAG "1"
+extern const char *TARGET_CONVERSION_RULE_FLAG;
+extern const char *NATIVE_CONVERSION_RULE_FLAG;
 
 class Indentor;
 
diff --git a/sources/shiboken2/generator/main.cpp b/sources/shiboken2/generator/main.cpp
index 9c3d7275b..701ede7b7 100644
--- a/sources/shiboken2/generator/main.cpp
+++ b/sources/shiboken2/generator/main.cpp
@@ -43,9 +43,9 @@
 #include "qtdocgenerator.h"
 
 #ifdef _WINDOWS
-    #define PATH_SPLITTER ";"
+static const QChar pathSplitter = QLatin1Char(';');
 #else
-    #define PATH_SPLITTER ":"
+static const QChar pathSplitter = QLatin1Char(':');
 #endif
 
 static inline QString languageLevelOption() { return QStringLiteral("language-level"); }
@@ -147,18 +147,18 @@ static bool processProjectFile(QFile& projectFile, QMap<QString, QString>& args)
     }
 
     if (!includePaths.isEmpty())
-        args.insert(includePathOption(), includePaths.join(QLatin1String(PATH_SPLITTER)));
+        args.insert(includePathOption(), includePaths.join(pathSplitter));
 
     if (!frameworkIncludePaths.isEmpty())
         args.insert(frameworkIncludePathOption(),
-                    frameworkIncludePaths.join(QLatin1String(PATH_SPLITTER)));
+                    frameworkIncludePaths.join(pathSplitter));
     if (!systemIncludePaths.isEmpty()) {
         args.insert(systemIncludePathOption(),
-                    systemIncludePaths.join(QLatin1String(PATH_SPLITTER)));
+                    systemIncludePaths.join(pathSplitter));
     }
 
     if (!typesystemPaths.isEmpty())
-        args.insert(typesystemPathOption(), typesystemPaths.join(QLatin1String(PATH_SPLITTER)));
+        args.insert(typesystemPathOption(), typesystemPaths.join(pathSplitter));
     if (!apiVersions.isEmpty())
         args.insert(QLatin1String("api-version"), apiVersions.join(QLatin1Char('|')));
     if (!languageLevel.isEmpty())
@@ -214,7 +214,7 @@ static void addPathOptionValue(const QString &option, const QString &value,
 {
     const CommandArgumentMap::iterator it = args.find(option);
     if (it != args.end())
-        it.value().append(QLatin1String(PATH_SPLITTER) + value);
+        it.value().append(pathSplitter + value);
     else
         args.insert(option, value);
 }
@@ -302,7 +302,9 @@ void printUsage()
     s << "Usage:\n  "
       << "shiboken [options] header-file typesystem-file\n\n"
       << "General options:\n";
-    const QString pathSyntax = QLatin1String("<path>[" PATH_SPLITTER "<path>" PATH_SPLITTER "...]");
+    QString pathSyntax;
+    QTextStream(&pathSyntax) << "<path>[" << pathSplitter << "<path>"
+        << pathSplitter << "...]";
     OptionDescriptions generalOptions = OptionDescriptions()
         << qMakePair(QLatin1String("api-version=<\"package mask\">,<\"version\">"),
                      QLatin1String("Specify the supported api version used to generate the bindings"))
@@ -388,7 +390,7 @@ static void parseIncludePathOption(const QString &option, HeaderType headerType,
     const CommandArgumentMap::iterator it = args.find(option);
     if (it != args.end()) {
         const QStringList includePathListList =
-            it.value().split(QLatin1String(PATH_SPLITTER), QString::SkipEmptyParts);
+            it.value().split(pathSplitter, QString::SkipEmptyParts);
         args.erase(it);
         for (const QString &s : includePathListList)
             extractor.addIncludePath(HeaderPath{QFile::encodeName(s), headerType});
@@ -540,7 +542,7 @@ int main(int argc, char *argv[])
 
     ait = args.find(QLatin1String("typesystem-paths"));
     if (ait != args.end()) {
-        extractor.addTypesystemSearchPath(ait.value().split(QLatin1String(PATH_SPLITTER)));
+        extractor.addTypesystemSearchPath(ait.value().split(pathSplitter));
         args.erase(ait);
     }
 
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index 380820f24..3177c7420 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -41,6 +41,8 @@
 #include <QtCore/QDebug>
 #include <QMetaType>
 
+static const char CPP_ARG0[] = "cppArg0";
+
 QHash<QString, QString> CppGenerator::m_nbFuncs = QHash<QString, QString>();
 QHash<QString, QString> CppGenerator::m_sqFuncs = QHash<QString, QString>();
 QHash<QString, QString> CppGenerator::m_mpFuncs = QHash<QString, QString>();
@@ -2918,10 +2920,8 @@ void CppGenerator::writePythonToCppConversionFunctions(QTextStream& s, const Abs
         const AbstractMetaType* type = containerType->instantiations().at(i);
         QString typeName = getFullTypeName(type);
         if (type->isValue() && isValueTypeWithCopyConstructorOnly(type)) {
-            static const QRegularExpression regex(QLatin1String(CONVERTTOCPP_REGEX));
-            Q_ASSERT(regex.isValid());
             for (int pos = 0; ; ) {
-                const QRegularExpressionMatch match = regex.match(code, pos);
+                const QRegularExpressionMatch match = convertToCppRegEx().match(code, pos);
                 if (!match.hasMatch())
                     break;
                 pos = match.capturedEnd();
@@ -4326,14 +4326,16 @@ void CppGenerator::writeRichCompareFunction(QTextStream &s, GeneratorContext &co
                         CodeSnipList snips = func->injectedCodeSnips();
                         writeCodeSnips(s, snips, TypeSystem::CodeSnipPositionAny, TypeSystem::TargetLangCode, func, func->arguments().constLast());
                     } else {
-                        QString expression = QString::fromLatin1("%1%2 %3 (%4" CPP_ARG0 ")")
-                                                .arg(func->isPointerOperator() ? QLatin1String("&") : QString(),
-                                                     QLatin1String(CPP_SELF_VAR), op,
-                                                     shouldDereferenceAbstractMetaTypePointer(argType) ? QLatin1String("*") : QString());
                         s << INDENT;
                         if (func->type())
                             s << func->type()->cppSignature() << " " CPP_RETURN_VAR " = ";
-                        s << expression << ';' << endl;
+                        // expression
+                        if (func->isPointerOperator())
+                            s << '&';
+                        s << CPP_SELF_VAR << ' ' << op << '(';
+                        if (shouldDereferenceAbstractMetaTypePointer(argType))
+                            s << '*';
+                        s << CPP_ARG0 << ");" << endl;
                         s << INDENT << PYTHON_RETURN_VAR " = ";
                         if (func->type())
                             writeToPythonConversion(s, func->type(), metaClass, QLatin1String(CPP_RETURN_VAR));
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
index 6bdbb5b76..9fdbb91a6 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
@@ -40,13 +40,18 @@
 #include <limits>
 #include <memory>
 
-#define NULL_VALUE "NULL"
-#define AVOID_PROTECTED_HACK "avoid-protected-hack"
-#define PARENT_CTOR_HEURISTIC "enable-parent-ctor-heuristic"
-#define RETURN_VALUE_HEURISTIC "enable-return-value-heuristic"
-#define ENABLE_PYSIDE_EXTENSIONS "enable-pyside-extensions"
-#define DISABLE_VERBOSE_ERROR_MESSAGES "disable-verbose-error-messages"
-#define USE_ISNULL_AS_NB_NONZERO "use-isnull-as-nb_nonzero"
+static const char NULL_VALUE[] = "NULL";
+static const char AVOID_PROTECTED_HACK[] = "avoid-protected-hack";
+static const char PARENT_CTOR_HEURISTIC[] = "enable-parent-ctor-heuristic";
+static const char RETURN_VALUE_HEURISTIC[] = "enable-return-value-heuristic";
+static const char ENABLE_PYSIDE_EXTENSIONS[] = "enable-pyside-extensions";
+static const char DISABLE_VERBOSE_ERROR_MESSAGES[] = "disable-verbose-error-messages";
+static const char USE_ISNULL_AS_NB_NONZERO[] = "use-isnull-as-nb_nonzero";
+
+const char *CONV_RULE_OUT_VAR_SUFFIX = "_out";
+const char *BEGIN_ALLOW_THREADS =
+    "PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS";
+const char *END_ALLOW_THREADS = "PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS";
 
 //static void dumpFunction(AbstractMetaFunctionList lst);
 
@@ -118,6 +123,12 @@ ShibokenGenerator::ShibokenGenerator()
     m_typeSystemConvName[TypeSystemIsConvertibleFunction] = QLatin1String("isConvertible");
     m_typeSystemConvName[TypeSystemToCppFunction]         = QLatin1String("toCpp");
     m_typeSystemConvName[TypeSystemToPythonFunction]      = QLatin1String("toPython");
+
+    const char CHECKTYPE_REGEX[] = R"(%CHECKTYPE\[([^\[]*)\]\()";
+    const char ISCONVERTIBLE_REGEX[] = R"(%ISCONVERTIBLE\[([^\[]*)\]\()";
+    const char CONVERTTOPYTHON_REGEX[] = R"(%CONVERTTOPYTHON\[([^\[]*)\]\()";
+    const char CONVERTTOCPP_REGEX[] =
+        R"((\*?%?[a-zA-Z_][\w\.]*(?:\[[^\[^<^>]+\])*)(?:\s+)=(?:\s+)%CONVERTTOCPP\[([^\[]*)\]\()";
     m_typeSystemConvRegEx[TypeSystemCheckFunction]         = QRegularExpression(QLatin1String(CHECKTYPE_REGEX));
     m_typeSystemConvRegEx[TypeSystemIsConvertibleFunction] = QRegularExpression(QLatin1String(ISCONVERTIBLE_REGEX));
     m_typeSystemConvRegEx[TypeSystemToPythonFunction]      = QRegularExpression(QLatin1String(CONVERTTOPYTHON_REGEX));
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.h b/sources/shiboken2/generator/shiboken2/shibokengenerator.h
index 3be69c651..95f50d860 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.h
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.h
@@ -29,9 +29,7 @@
 #ifndef SHIBOKENGENERATOR_H
 #define SHIBOKENGENERATOR_H
 
-#define CONV_RULE_OUT_VAR_SUFFIX  "_out"
 #define CPP_ARG                   "cppArg"
-#define CPP_ARG0                  CPP_ARG"0"
 #define CPP_ARG_REMOVED           "removed_" CPP_ARG
 #define CPP_RETURN_VAR            "cppResult"
 #define CPP_SELF_VAR              "cppSelf"
@@ -40,17 +38,12 @@
 #define PYTHON_OVERRIDE_VAR       "pyOverride"
 #define PYTHON_RETURN_VAR         "pyResult"
 #define PYTHON_SELF_VAR           "self"
-#define THREAD_STATE_SAVER_VAR    "threadStateSaver"
-#define BEGIN_ALLOW_THREADS       "PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS"
-#define END_ALLOW_THREADS         "PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS"
 #define PYTHON_TO_CPP_VAR         "pythonToCpp"
 #define SMART_POINTER_GETTER      "kSmartPointerGetter"
 
-#define CHECKTYPE_REGEX           "%CHECKTYPE\\[([^\\[]*)\\]\\("
-#define ISCONVERTIBLE_REGEX       "%ISCONVERTIBLE\\[([^\\[]*)\\]\\("
-#define CONVERTTOPYTHON_REGEX     "%CONVERTTOPYTHON\\[([^\\[]*)\\]\\("
-#define CONVERTTOCPP_REGEX        "(\\*?%?[a-zA-Z_][\\w\\.]*(?:\\[[^\\[^<^>]+\\])*)"\
-                                  "(?:\\s+)=(?:\\s+)%CONVERTTOCPP\\[([^\\[]*)\\]\\("
+extern const char *CONV_RULE_OUT_VAR_SUFFIX;
+extern const char *BEGIN_ALLOW_THREADS;
+extern const char *END_ALLOW_THREADS;
 
 #include <generator.h>
 
@@ -433,6 +426,9 @@ protected:
 
     Indentor INDENT;
 
+    const QRegularExpression &convertToCppRegEx() const
+    { return m_typeSystemConvRegEx[TypeSystemToCppFunction]; }
+
     static QString msgCouldNotFindMinimalConstructor(const QString &where, const QString &type);
 
     static QHash<QString, QString> m_pythonPrimitiveTypeName;