shiboken: Introduce enumeration for C++ indirections

Replace the int "indirections" field of TypeInfo and AbstractMetaType
by a Vector of an enumeration representing '*' and "* const".
It is then possible distinguish between "int *" and "int *const".

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

3 files changed, 34 insertions, 13 deletions

diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
index 39f438f4e..4ad86bd15 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
@@ -140,7 +140,7 @@ TypeInfo TypeInfo::combine(const TypeInfo &__lhs, const TypeInfo &__rhs)
     __result.setVolatile(__result.isVolatile() || __rhs.isVolatile());
     if (__rhs.referenceType() > __result.referenceType())
         __result.setReferenceType(__rhs.referenceType());
-    __result.setIndirections(__result.indirections() + __rhs.indirections());
+    __result.m_indirections.append(__rhs.m_indirections);
     __result.setArrayElements(__result.arrayElements() + __rhs.arrayElements());
     __result.m_instantiations.append(__rhs.m_instantiations);
 
@@ -149,7 +149,7 @@ TypeInfo TypeInfo::combine(const TypeInfo &__lhs, const TypeInfo &__rhs)
 
 bool TypeInfo::isVoid() const
 {
-    return m_indirections == 0 && m_referenceType == NoReference
+    return m_indirections.isEmpty() && m_referenceType == NoReference
         && m_arguments.isEmpty() && m_arrayElements.isEmpty()
         && m_instantiations.isEmpty()
         && m_qualifiedName.size() == 1
@@ -218,8 +218,8 @@ QString TypeInfo::toString() const
         tmp += QLatin1Char('>');
     }
 
-    if (indirections())
-        tmp += QString(indirections(), QLatin1Char('*'));
+    for (Indirection i : m_indirections)
+        tmp.append(indirectionKeyword(i));
 
     switch (referenceType()) {
     case NoReference:
@@ -273,6 +273,12 @@ bool TypeInfo::operator==(const TypeInfo &other) const
            && m_instantiations == other.m_instantiations;
 }
 
+QString TypeInfo::indirectionKeyword(Indirection i)
+{
+    return i == Indirection::Pointer
+        ? QStringLiteral("*") : QStringLiteral("* const");
+}
+
 #ifndef QT_NO_DEBUG_STREAM
 template <class It>
 void formatSequence(QDebug &d, It i1, It i2, const char *separator=", ")
@@ -293,8 +299,11 @@ void TypeInfo::formatDebug(QDebug &d) const
         d << ", [const]";
     if (m_volatile)
         d << ", [volatile]";
-    if (m_indirections)
-        d << ", indirections=" << m_indirections;
+    if (!m_indirections.isEmpty()) {
+        d << ", indirections=";
+        for (auto i : m_indirections)
+            d << ' ' << TypeInfo::indirectionKeyword(i);
+    }
     switch (m_referenceType) {
     case NoReference:
         break;
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.h b/sources/shiboken2/ApiExtractor/parser/codemodel.h
index fbc1f2b7a..1bc3e6e12 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.h
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.h
@@ -100,6 +100,8 @@ class TypeInfo
 {
     friend class TypeParser;
 public:
+    typedef QVector<Indirection> Indirections;
+
     TypeInfo() : flags(0), m_referenceType(NoReference) {}
 
     QStringList qualifiedName() const
@@ -137,14 +139,16 @@ public:
     ReferenceType referenceType() const { return m_referenceType; }
     void setReferenceType(ReferenceType r) { m_referenceType = r; }
 
-    int indirections() const
-    {
-        return m_indirections;
-    }
+    Indirections indirectionsV() const { return m_indirections; }
+    void setIndirectionsV(const Indirections &i) { m_indirections = i; }
+    void addIndirection(Indirection i) { m_indirections.append(i); }
+
+    // "Legacy", rename?
+    int indirections() const { return m_indirections.size(); }
 
     void setIndirections(int indirections)
     {
-        m_indirections = indirections;
+        m_indirections = Indirections(indirections, Indirection::Pointer);
     }
 
     bool isFunctionPointer() const
@@ -197,6 +201,8 @@ public:
     void formatDebug(QDebug &d) const;
 #endif
 
+    static QString indirectionKeyword(Indirection i);
+
 private:
     static TypeInfo resolveType(CodeModelItem item, TypeInfo const &__type, CodeModelItem __scope);
 
@@ -204,6 +210,7 @@ private:
     QStringList m_arrayElements;
     QVector<TypeInfo> m_arguments;
     QVector<TypeInfo> m_instantiations;
+    Indirections m_indirections;
 
     union {
         uint flags;
@@ -212,8 +219,7 @@ private:
             uint m_constant: 1;
             uint m_volatile: 1;
             uint m_functionPointer: 1;
-            uint m_indirections: 6;
-            uint m_padding: 23;
+            uint m_padding: 29;
         };
     };
 
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel_enums.h b/sources/shiboken2/ApiExtractor/parser/codemodel_enums.h
index b8a10ba93..9a3cc0e07 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel_enums.h
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel_enums.h
@@ -41,4 +41,10 @@ enum EnumKind {
     EnumClass      // C++ 11    : enum class Foo { value1, value2 }
 };
 
+enum class Indirection
+{
+    Pointer, // int *
+    ConstPointer // int *const
+};
+
 #endif // CODEMODEL_ENUMS_H