shiboken: Refactor finding of enums

In the AbstractMetaBuilder, change the list of enums into a QHash with the type entry as key
since that is mostly used for searching. Streamline and simplify
the search functionality accordingly.

Task-number: PYSIDE-817
Change-Id: I205cad1f90bc26511ea6b6e9b76ddb1bae544cf1
Reviewed-by: Christian Tismer <tismer@stackless.com>

5 files changed, 16 insertions, 49 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 69b9ac7df..9653831cc 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -160,6 +160,13 @@ AbstractMetaEnumList AbstractMetaBuilder::globalEnums() const
     return d->m_globalEnums;
 }
 
+AbstractMetaEnum *AbstractMetaBuilder::findEnum(const TypeEntry *typeEntry) const
+{
+    if (typeEntry && typeEntry->isFlags())
+        typeEntry = static_cast<const FlagsTypeEntry*>(typeEntry)->originator();
+    return d->m_enums.value(typeEntry);
+}
+
 void AbstractMetaBuilderPrivate::checkFunctionModifications()
 {
     const auto &entries = TypeDatabase::instance()->entries();
@@ -595,17 +602,10 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom)
                 const QString name = static_cast<const EnumTypeEntry *>(entry)->targetLangQualifier();
                 AbstractMetaClass *cls = AbstractMetaClass::findClass(m_metaClasses, name);
 
-                bool enumFound = false;
-                if (cls) {
-                    enumFound = cls->findEnum(entry->targetLangName());
-                } else { // Global enum
-                    for (AbstractMetaEnum *metaEnum : qAsConst(m_enums)) {
-                        if (metaEnum->typeEntry() == entry) {
-                            enumFound = true;
-                            break;
-                        }
-                    }
-                }
+                const bool enumFound = cls
+                    ? cls->findEnum(entry->targetLangName()) != nullptr
+                    : m_enums.contains(entry);
+
                 if (!enumFound) {
                     entry->setCodeGeneration(TypeEntry::GenerateNothing);
                     qCWarning(lcShiboken).noquote().nospace()
@@ -946,7 +946,7 @@ AbstractMetaEnum *AbstractMetaBuilderPrivate::traverseEnum(const EnumModelItem &
         }
     }
 
-    m_enums << metaEnum;
+    m_enums.insert(typeEntry, metaEnum);
 
     if (!metaEnum->typeEntry()->include().isValid())
         setInclude(metaEnum->typeEntry(), enumItem->fileName());
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder.h
index bea2ac4c0..01806f6b4 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.h
@@ -41,6 +41,7 @@ class AbstractMetaClass;
 class AbstractMetaType;
 class AbstractMetaEnumValue;
 class TypeInfo;
+class TypeEntry;
 
 class AbstractMetaBuilder
 {
@@ -63,6 +64,7 @@ public:
     AbstractMetaClassList smartPointers() const;
     AbstractMetaFunctionList globalFunctions() const;
     AbstractMetaEnumList globalEnums() const;
+    AbstractMetaEnum *findEnum(const TypeEntry *typeEntry) const;
 
     /**
     *   Sorts a list of classes topologically, if an AbstractMetaClass object
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
index 953ee5633..ec55d1b47 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
@@ -175,7 +175,7 @@ public:
     RejectMap m_rejectedFunctions;
     RejectMap m_rejectedFields;
 
-    QList<AbstractMetaEnum *> m_enums;
+    QHash<const TypeEntry *, AbstractMetaEnum *> m_enums;
 
     AbstractMetaClass *m_currentClass;
     QList<ScopeModelItem> m_scopes;
diff --git a/sources/shiboken2/ApiExtractor/apiextractor.cpp b/sources/shiboken2/ApiExtractor/apiextractor.cpp
index 80ffc3910..775485c81 100644
--- a/sources/shiboken2/ApiExtractor/apiextractor.cpp
+++ b/sources/shiboken2/ApiExtractor/apiextractor.cpp
@@ -177,41 +177,9 @@ static const AbstractMetaEnum* findEnumOnClasses(AbstractMetaClassList metaClass
     return result;
 }
 
-const AbstractMetaEnum* ApiExtractor::findAbstractMetaEnum(const EnumTypeEntry* typeEntry) const
-{
-    if (!typeEntry)
-        return 0;
-    const AbstractMetaEnumList &globalEnums = m_builder->globalEnums();
-    for (AbstractMetaEnum* metaEnum : globalEnums) {
-        if (metaEnum->typeEntry() == typeEntry)
-            return metaEnum;
-    }
-    return findEnumOnClasses(m_builder->classes(), typeEntry);
-}
-
 const AbstractMetaEnum* ApiExtractor::findAbstractMetaEnum(const TypeEntry* typeEntry) const
 {
-    if (!typeEntry)
-        return 0;
-    if (typeEntry->isFlags())
-        return findAbstractMetaEnum(static_cast<const FlagsTypeEntry*>(typeEntry));
-    if (typeEntry->isEnum())
-        return findAbstractMetaEnum(static_cast<const EnumTypeEntry*>(typeEntry));
-    return 0;
-}
-
-const AbstractMetaEnum* ApiExtractor::findAbstractMetaEnum(const FlagsTypeEntry* typeEntry) const
-{
-    if (!typeEntry)
-        return 0;
-    return findAbstractMetaEnum(typeEntry->originator());
-}
-
-const AbstractMetaEnum* ApiExtractor::findAbstractMetaEnum(const AbstractMetaType* metaType) const
-{
-    if (!metaType)
-        return 0;
-    return findAbstractMetaEnum(metaType->typeEntry());
+    return m_builder->findEnum(typeEntry);
 }
 
 int ApiExtractor::classCount() const
diff --git a/sources/shiboken2/ApiExtractor/apiextractor.h b/sources/shiboken2/ApiExtractor/apiextractor.h
index 674e5a742..ab520c9de 100644
--- a/sources/shiboken2/ApiExtractor/apiextractor.h
+++ b/sources/shiboken2/ApiExtractor/apiextractor.h
@@ -87,10 +87,7 @@ public:
     PrimitiveTypeEntryList primitiveTypes() const;
     ContainerTypeEntryList containerTypes() const;
 
-    const AbstractMetaEnum* findAbstractMetaEnum(const EnumTypeEntry* typeEntry) const;
     const AbstractMetaEnum* findAbstractMetaEnum(const TypeEntry* typeEntry) const;
-    const AbstractMetaEnum* findAbstractMetaEnum(const FlagsTypeEntry* typeEntry) const;
-    const AbstractMetaEnum* findAbstractMetaEnum(const AbstractMetaType* metaType) const;
 
     int classCount() const;