Merge pull request #3779 from 9rnsr/fix13142

Issue 13142 - Enums on different classes confuse the compiler
dlang · Jul 17, 2014 · 5b9f27c · 5b9f27c
1 parent cad191c
commit 5b9f27c
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 6 deletions.
diff --git a/src/enum.c b/src/enum.c
@@ -306,7 +306,7 @@ Expression *EnumDeclaration::getMaxMinValue(Loc loc, Identifier *id)
         goto Lerrors;
     }
     if (*pval)
-        return *pval;
+        goto Ldone;
 
     if (scope)
         semantic(scope);
@@ -360,7 +360,16 @@ Expression *EnumDeclaration::getMaxMinValue(Loc loc, Identifier *id)
                 *pval = e;
         }
     }
-    return *pval;
+Ldone:
+  {
+    Expression *e = *pval;
+    if (e->op != TOKerror)
+    {
+        e = e->copy();
+        e->loc = loc;
+    }
+    return e;
+  }
 
 Lerrors:
     *pval = new ErrorExp();

diff --git a/src/mtype.c b/src/mtype.c
@@ -7415,18 +7415,19 @@ Expression *TypeEnum::dotExp(Scope *sc, Expression *e, Identifier *ident, int fl
 }
 
 Expression *TypeEnum::getProperty(Loc loc, Identifier *ident, int flag)
-{   Expression *e;
-
+{
+    Expression *e;
     if (ident == Id::max || ident == Id::min)
-        {
+    {
         return sym->getMaxMinValue(loc, ident);
     }
     else if (ident == Id::init)
     {
         e = defaultInitLiteral(loc);
     }
     else if (ident == Id::stringof)
-    {   char *s = toChars();
+    {
+        char *s = toChars();
         e = new StringExp(loc, s, strlen(s), 'c');
         Scope sc;
         e = e->semantic(&sc);

diff --git a/test/fail_compilation/diag13142.d b/test/fail_compilation/diag13142.d
@@ -0,0 +1,27 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/diag13142.d(25): Error: cannot implicitly convert expression (3) of type int to TYPE
+---
+*/
+
+class Button
+{
+    enum TYPE // button type
+    {
+        COMMAND,
+        CHECK,
+        OPTION,
+    }
+}
+
+class Toolbar
+{
+    enum ButtonTYPE // button type
+    {
+        COMMAND   = Button.TYPE.COMMAND,
+        CHECK     = Button.TYPE.CHECK,
+        OPTION    = Button.TYPE.OPTION,
+        DELIMETER = Button.TYPE.max + 1
+    }
+}