Merge pull request dlang#1902 from IgorStepanov/allmembersenum

Fixes Issue 9939 allMembers trait doesn't returns members of nested anonymous enum
9rnsr · Apr 16, 2013 · f7e81e8 · f7e81e8
2 parents 73835a8 + c86e8b2
commit f7e81e8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/traits.c b/src/traits.c
@@ -499,6 +499,14 @@ Expression *TraitsExp::semantic(Scope *sc)
 
                     idents->push(sm->ident);
                 }
+                else
+                {
+                    EnumDeclaration *ed = sm->isEnumDeclaration();
+                    if (ed)
+                    {
+                        ScopeDsymbol::foreach(NULL, ed->members, &PushIdentsDg::dg, (Identifiers *)ctx);
+                    }
+                }
                 return 0;
             }
         };

diff --git a/test/runnable/traits.d b/test/runnable/traits.d
@@ -1141,6 +1141,24 @@ void test9136()
 
 /********************************************************/
 
+struct Test25
+{
+    int f;
+    enum /*Anonymous enum*/
+    {
+        A,
+        B
+    }
+    enum NamedEnum
+    {
+        C,
+        D
+    }
+}
+
+static assert([__traits(allMembers, Test25)] == ["f", "A", "B", "NamedEnum"]);
+/********************************************************/
+
 int main()
 {
     test1();