shiboken: Use enum values from Clang

Remove a lot of ugly value parsing code in favor of
clang_getEnumConstantDeclValue() and
clang_getEnumConstantDeclUnsignedValue() depending on the
type.

Introduce a class EnumValue containing a union of qint64 and quint64 values
to represent signed/unsigned values correctly and use that in the code model
and meta language classes.

Change-Id: If2efb7cfd560237907678b8f6fdfb0bc689c0c93
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

4 files changed, 177 insertions, 9 deletions

diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
index fbfeaadf7..1262f5901 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
@@ -1014,6 +1014,16 @@ void _EnumModelItem::addEnumerator(EnumeratorModelItem item)
     m_enumerators.append(item);
 }
 
+bool _EnumModelItem::isSigned() const
+{
+    return m_signed;
+}
+
+void _EnumModelItem::setSigned(bool s)
+{
+    m_signed = s;
+}
+
 #ifndef QT_NO_DEBUG_STREAM
 void _EnumModelItem::formatDebug(QDebug &d) const
 {
@@ -1028,6 +1038,8 @@ void _EnumModelItem::formatDebug(QDebug &d) const
         d << " (class)";
         break;
     }
+    if (!m_signed)
+         d << " (unsigned)";
     formatModelItemList(d, ", enumerators=", m_enumerators);
 }
 #endif // !QT_NO_DEBUG_STREAM
@@ -1037,22 +1049,21 @@ _EnumeratorModelItem::~_EnumeratorModelItem()
 {
 }
 
-QString _EnumeratorModelItem::value() const
+QString _EnumeratorModelItem::stringValue() const
 {
-    return m_value;
+    return m_stringValue;
 }
 
-void _EnumeratorModelItem::setValue(const QString &value)
+void _EnumeratorModelItem::setStringValue(const QString &value)
 {
-    m_value = value;
+    m_stringValue = value;
 }
 
 #ifndef QT_NO_DEBUG_STREAM
 void _EnumeratorModelItem::formatDebug(QDebug &d) const
 {
     _CodeModelItem::formatDebug(d);
-    if (!m_value.isEmpty())
-        d << ", value=\"" << m_value << '"';
+    d << ", value=" << m_value << ", stringValue=\"" << m_stringValue << '"';
 }
 #endif // !QT_NO_DEBUG_STREAM
 
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.h b/sources/shiboken2/ApiExtractor/parser/codemodel.h
index b300cf249..ed0eedf7d 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.h
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.h
@@ -33,6 +33,7 @@
 
 #include "codemodel_fwd.h"
 #include "codemodel_enums.h"
+#include "enumvalue.h"
 
 #include <QtCore/QHash>
 #include <QtCore/QSet>
@@ -633,6 +634,8 @@ public:
 
     explicit _EnumModelItem(CodeModel *model, const QString &name, int kind = __node_kind)
         : _CodeModelItem(model, name, kind) {}
+    explicit _EnumModelItem(CodeModel *model, int kind = __node_kind)
+        : _CodeModelItem(model, kind) {}
     ~_EnumModelItem();
 
     CodeModel::AccessPolicy accessPolicy() const;
@@ -648,10 +651,14 @@ public:
     void formatDebug(QDebug &d) const override;
 #endif
 
+    bool isSigned() const;
+    void setSigned(bool s);
+
 private:
     CodeModel::AccessPolicy m_accessPolicy = CodeModel::Public;
     EnumeratorList m_enumerators;
     EnumKind m_enumKind = CEnum;
+    bool m_signed = true;
 };
 
 class _EnumeratorModelItem: public _CodeModelItem
@@ -665,15 +672,19 @@ public:
         : _CodeModelItem(model, name, kind) {}
     ~_EnumeratorModelItem();
 
-    QString value() const;
-    void setValue(const QString &value);
+    QString stringValue() const;
+    void setStringValue(const QString &stringValue);
+
+    EnumValue value() const { return m_value; }
+    void setValue(EnumValue v) { m_value = v; }
 
 #ifndef QT_NO_DEBUG_STREAM
     void formatDebug(QDebug &d) const override;
 #endif
 
 private:
-    QString m_value;
+    QString m_stringValue;
+    EnumValue m_value;
 };
 
 class _TemplateParameterModelItem: public _CodeModelItem
diff --git a/sources/shiboken2/ApiExtractor/parser/enumvalue.cpp b/sources/shiboken2/ApiExtractor/parser/enumvalue.cpp
new file mode 100644
index 000000000..84723eb14
--- /dev/null
+++ b/sources/shiboken2/ApiExtractor/parser/enumvalue.cpp
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of PySide2.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "enumvalue.h"
+
+#include <QtCore/QDebug>
+#include <QtCore/QString>
+#include <QtCore/QTextStream>
+
+QString EnumValue::toString() const
+{
+    return m_type == EnumValue::Signed
+        ? QString::number(m_value) : QString::number(m_unsignedValue);
+}
+
+void EnumValue::setValue(qint64 v)
+{
+    m_value = v;
+    m_type = Signed;
+}
+
+void EnumValue::setUnsignedValue(quint64 v)
+{
+    m_unsignedValue = v;
+    m_type = Unsigned;
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug d,const EnumValue &v)
+{
+    QDebugStateSaver saver(d);
+    d.nospace();
+    d.noquote();
+    d << "EnumValue(";
+    if (v.m_type == EnumValue::Signed)
+        d << v.m_value;
+    else
+        d << v.m_unsignedValue << 'u';
+    d << ')';
+    return d;
+}
+#endif // !QT_NO_DEBUG_STREAM
+
+QTextStream &operator<<(QTextStream &s, const EnumValue &v)
+{
+    if (v.m_type == EnumValue::Signed)
+        s << v.m_value;
+    else
+        s << v.m_unsignedValue;
+    return s;
+}
diff --git a/sources/shiboken2/ApiExtractor/parser/enumvalue.h b/sources/shiboken2/ApiExtractor/parser/enumvalue.h
new file mode 100644
index 000000000..2e2070306
--- /dev/null
+++ b/sources/shiboken2/ApiExtractor/parser/enumvalue.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of PySide2.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ENUMVALUE_H
+#define ENUMVALUE_H
+
+#include <QtCore/QtGlobal>
+
+QT_FORWARD_DECLARE_CLASS(QDebug)
+QT_FORWARD_DECLARE_CLASS(QString)
+QT_FORWARD_DECLARE_CLASS(QTextStream)
+
+class EnumValue
+{
+public:
+    enum Type
+    {
+        Signed,
+        Unsigned
+    };
+
+    QString toString() const;
+
+    Type type() { return m_type; }
+    qint64 value() const { return m_value; }
+    quint64 unsignedValue() const { return m_unsignedValue; }
+
+    void setValue(qint64 v);
+    void setUnsignedValue(quint64 v);
+
+private:
+#ifndef QT_NO_DEBUG_STREAM
+    friend QDebug operator<<(QDebug, const EnumValue &);
+#endif
+    friend QTextStream &operator<<(QTextStream &, const EnumValue &);
+
+    union
+    {
+        qint64 m_value = 0;
+        quint64 m_unsignedValue;
+    };
+    Type m_type = Signed;
+};
+
+#endif // ENUMVALUE_H