Merge pull request #1907 from donc/voidenum9921

9921: Enum variables of type void should be illegal
dlang · Apr 18, 2013 · 2fb8a99 · 2fb8a99
2 parents 202a28b + 35a3765
commit 2fb8a99
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/src/enum.c b/src/enum.c
@@ -126,7 +126,7 @@ void EnumDeclaration::semantic(Scope *sc)
 
     //printf("EnumDeclaration::semantic(sd = %p, '%s') %s\n", sc->scopesym, sc->scopesym->toChars(), toChars());
     //printf("EnumDeclaration::semantic() %s\n", toChars());
-    if (!members)               // enum ident;
+    if (!members && !memtype)               // enum ident;
         return;
 
     if (!memtype && !isAnonymous())
@@ -182,6 +182,11 @@ void EnumDeclaration::semantic(Scope *sc)
                 return;
             }
         }
+        if (memtype->ty == Tvoid)
+        {
+            error("base type must not be void");
+            memtype = Type::terror;
+        }
 #if 0   // Decided to abandon this restriction for D 2.0
         if (!memtype->isintegral())
         {   error("base type must be of integral type, not %s", memtype->toChars());
@@ -191,6 +196,10 @@ void EnumDeclaration::semantic(Scope *sc)
     }
 
     isdone = 1;
+
+    if (!members)               // enum ident : memtype;
+        return;
+
     Module::dprogress++;
 
     type = type->semantic(loc, sc);
@@ -277,6 +286,13 @@ void EnumDeclaration::semantic(Scope *sc)
             if (!isAnonymous())
                 e = e->castTo(sce, type);
         }
+        else if (memtype && memtype == Type::terror)
+        {
+            e = new ErrorExp();
+            minval = e;
+            maxval = e;
+            defaultval = e;
+        }
         else
         {
             // Lazily evaluate enum.max
@@ -327,7 +343,7 @@ void EnumDeclaration::semantic(Scope *sc)
          * If enum doesn't have a name, we can never identify the enum type,
          * so there is no purpose for a .min, .max or .default
          */
-        if (!isAnonymous())
+        if (!isAnonymous() && memtype != Type::terror)
         {
             if (first)
             {   defaultval = e;

diff --git a/test/fail_compilation/enum9921.d b/test/fail_compilation/enum9921.d
@@ -0,0 +1,12 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/enum9921.d(1): Error: enum enum9921.X base type must not be void
+fail_compilation/enum9921.d(3): Error: enum enum9921.Z base type must not be void
+---
+*/
+
+#line 1
+enum X : void;
+
+enum Z : void { Y };