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>

1 files changed, 15 insertions, 8 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h
index d1a0fbf88..e05079bdc 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h
@@ -288,6 +288,7 @@ class AbstractMetaType
 {
     Q_GADGET
 public:
+    typedef QVector<Indirection> Indirections;
 
     enum TypeUsagePattern {
         InvalidPattern,
@@ -443,16 +444,21 @@ public:
 
     int actualIndirections() const
     {
-        return m_indirections + (m_referenceType == LValueReference ? 1 : 0);
-    }
-    int indirections() const
-    {
-        return m_indirections;
+        return m_indirections.size() + (m_referenceType == LValueReference ? 1 : 0);
     }
+
+    Indirections indirectionsV() const { return m_indirections; }
+    void setIndirectionsV(const Indirections &i) { m_indirections = i; }
+    void clearIndirections() { m_indirections.clear(); }
+
+    // "Legacy"?
+    int indirections() const { return m_indirections.size(); }
     void setIndirections(int indirections)
     {
-        m_indirections = indirections;
+        m_indirections = Indirections(indirections, Indirection::Pointer);
     }
+    void addIndirection(Indirection i = Indirection::Pointer)
+        { m_indirections.append(i); }
 
     void setArrayElementCount(int n)
     {
@@ -541,12 +547,13 @@ private:
     int m_arrayElementCount = -1;
     const AbstractMetaType *m_arrayElementType = nullptr;
     const AbstractMetaType *m_originalTemplateType = nullptr;
+    Indirections m_indirections;
 
     TypeUsagePattern m_pattern = InvalidPattern;
     uint m_constant : 1;
     uint m_cppInstantiation : 1;
-    int m_indirections : 4;
-    uint m_reserved : 26; // unused
+    uint m_reserved : 30; // unused
+
     ReferenceType m_referenceType = NoReference;
     AbstractMetaTypeList m_children;