shiboken: Detect class enums by Clang entirely

The Clang function clang_EnumDecl_isScoped() tells whether an enum is a class,
so, there is no need to specify that in the typesystem.

Use that information to pass it up to the metalang classes and revert the
parts of 44cb6c51e6c3b43376f284941454dc8c13b81c3f that added it to the
type system.

Task-number: PYSIDE-487
Change-Id: Ie10885f74168821d0307e91b6f1f7f3f30dd074b
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 42 insertions, 3 deletions

diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
index 1ed054d91..0984246c8 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
@@ -41,6 +41,7 @@
 #include <QtCore/QVector>
 
 #include <string.h>
+#include <ctype.h>
 
 #if QT_VERSION < 0x050800
 #  define Q_FALLTHROUGH()  (void)0
@@ -437,6 +438,36 @@ QString BuilderPrivate::cursorValueExpression(BaseVisitor *bv, const CXCursor &c
     return QString::fromLocal8Bit(equalSign, int(snippet.second - equalSign)).trimmed();
 }
 
+// A hacky reimplementation of clang_EnumDecl_isScoped() for Clang < 5.0
+// which simply checks for a blank-delimited " class " keyword in the enum snippet.
+
+#define CLANG_NO_ENUMDECL_ISSCOPED \
+    (CINDEX_VERSION_MAJOR == 0 && CINDEX_VERSION_MINOR < 43)
+
+#if CLANG_NO_ENUMDECL_ISSCOPED
+static const char *indexOf(const BaseVisitor::CodeSnippet &snippet, const char *needle)
+{
+    const size_t snippetLength = snippet.first ? size_t(snippet.second - snippet.first) : 0;
+    const size_t needleLength = strlen(needle);
+    if (needleLength > snippetLength)
+        return nullptr;
+    for (const char *c = snippet.first, *end = snippet.second - needleLength; c < end; ++c) {
+        if (memcmp(c, needle, needleLength) == 0)
+            return c;
+    }
+    return nullptr;
+}
+
+long clang_EnumDecl_isScoped4(BaseVisitor *bv, const CXCursor &cursor)
+{
+    BaseVisitor::CodeSnippet snippet = bv->getCodeSnippet(cursor);
+    const char *classSpec = indexOf(snippet, "class");
+    const bool isClass = classSpec && classSpec > snippet.first
+        && isspace(*(classSpec - 1)) && isspace(*(classSpec + 5));
+    return isClass ? 1 : 0;
+}
+#endif // CLANG_NO_ENUMDECL_ISSCOPED
+
 // Add a base class to the current class from CXCursor_CXXBaseSpecifier
 void BuilderPrivate::addBaseClass(const CXCursor &cursor)
 {
@@ -641,13 +672,21 @@ BaseVisitor::StartTokenResult Builder::startToken(const CXCursor &cursor)
         break;
     case CXCursor_EnumDecl: {
         QString name = getCursorSpelling(cursor);
-        const bool anonymous = name.isEmpty();
-        if (anonymous)
+        EnumKind kind = CEnum;
+        if (name.isEmpty()) {
+            kind = AnonymousEnum;
             name = QStringLiteral("enum_") + QString::number(++d->m_anonymousEnumCount);
+#if !CLANG_NO_ENUMDECL_ISSCOPED
+        } else if (clang_EnumDecl_isScoped(cursor) != 0) {
+#else
+        } else if (clang_EnumDecl_isScoped4(this, cursor) != 0) {
+#endif
+            kind = EnumClass;
+        }
         d->m_currentEnum.reset(new _EnumModelItem(d->m_model, name));
         setFileName(cursor, d->m_currentEnum.data());
         d->m_currentEnum->setScope(d->m_scope);
-        d->m_currentEnum->setAnonymous(anonymous);
+        d->m_currentEnum->setEnumKind(kind);
         if (!qSharedPointerDynamicCast<_ClassModelItem>(d->m_scopeStack.back()).isNull())
             d->m_currentEnum->setAccessPolicy(accessPolicy(clang_getCXXAccessSpecifier(cursor)));
         d->m_scopeStack.back()->addEnum(d->m_currentEnum);