Anonymous enums now supported.

3 files changed, 16 insertions, 1 deletions

diff --git a/parser/binder.cpp b/parser/binder.cpp
index 8b6c4c024..faace02ca 100644
--- a/parser/binder.cpp
+++ b/parser/binder.cpp
@@ -657,7 +657,8 @@ void Binder::visitEnumSpecifier(EnumSpecifierAST *node)
     name_cc.run(node->name);
     QString name = name_cc.name();
 
-    if (name.isEmpty()) {
+    bool isAnonymous = name.isEmpty();
+    if (isAnonymous) {
         // anonymous enum
         QString key = _M_context.join("::");
         int current = ++_M_anonymous_enums[key];
@@ -669,6 +670,7 @@ void Binder::visitEnumSpecifier(EnumSpecifierAST *node)
     _M_current_enum->setAccessPolicy(_M_current_access);
     updateItemPosition(_M_current_enum->toItem(), node);
     _M_current_enum->setName(name);
+    _M_current_enum->setAnonymous(isAnonymous);
     _M_current_enum->setScope(enumScope->qualifiedName());
 
     _M_qualified_types[_M_current_enum->qualifiedName().join(".")] = QString();
diff --git a/parser/codemodel.cpp b/parser/codemodel.cpp
index 419471505..0cc14fcce 100644
--- a/parser/codemodel.cpp
+++ b/parser/codemodel.cpp
@@ -727,6 +727,16 @@ void _EnumModelItem::removeEnumerator(EnumeratorModelItem item)
     _M_enumerators.removeAt(_M_enumerators.indexOf(item));
 }
 
+bool _EnumModelItem::isAnonymous() const
+{
+    return _M_anonymous;
+}
+
+void _EnumModelItem::setAnonymous(bool anonymous)
+{
+    _M_anonymous = anonymous;
+}
+
 // ---------------------------------------------------------------------------
 QString _EnumeratorModelItem::value() const
 {
diff --git a/parser/codemodel.h b/parser/codemodel.h
index 3ea94480f..f87f57a35 100644
--- a/parser/codemodel.h
+++ b/parser/codemodel.h
@@ -736,6 +736,8 @@ public:
     EnumeratorList enumerators() const;
     void addEnumerator(EnumeratorModelItem item);
     void removeEnumerator(EnumeratorModelItem item);
+    bool isAnonymous() const;
+    void setAnonymous(bool anonymous);
 
 protected:
     _EnumModelItem(CodeModel *model, int kind = __node_kind)
@@ -745,6 +747,7 @@ protected:
 private:
     CodeModel::AccessPolicy _M_accessPolicy;
     EnumeratorList _M_enumerators;
+    bool _M_anonymous;
 
 private:
     _EnumModelItem(const _EnumModelItem &other);