Use final switch for LINK

dlang · Jan 18, 2018 · 6517be5 · 6517be5
1 parent 59c08d8
commit 6517be5
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 28 deletions.
diff --git a/src/dmd/astbase.d b/src/dmd/astbase.d
@@ -6278,9 +6278,10 @@ struct ASTBase
 
     extern (C++) static const(char)* linkageToChars(LINK linkage)
     {
-        switch (linkage)
+        final switch (linkage)
         {
         case LINK.default_:
+        case LINK.system:
             return null;
         case LINK.d:
             return "D";
@@ -6294,8 +6295,6 @@ struct ASTBase
             return "Pascal";
         case LINK.objc:
             return "Objective-C";
-        default:
-            assert(0);
         }
     }
 

diff --git a/src/dmd/cppmanglewin.d b/src/dmd/cppmanglewin.d
@@ -973,7 +973,7 @@ private:
         }
         else
         {
-            switch (type.linkage)
+            final switch (type.linkage)
             {
             case LINK.c:
                 tmp.buf.writeByte('A');
@@ -990,7 +990,10 @@ private:
             case LINK.pascal:
                 tmp.buf.writeByte('C');
                 break;
-            default:
+            case LINK.d:
+            case LINK.default_:
+            case LINK.system:
+            case LINK.objc:
                 tmp.visit(cast(Type)type);
                 break;
             }

diff --git a/src/dmd/dmangle.d b/src/dmd/dmangle.d
@@ -351,8 +351,10 @@ public:
         if (modMask != t.mod)
             MODtoDecoBuffer(buf, t.mod);
         ubyte mc;
-        switch (t.linkage)
+        final switch (t.linkage)
         {
+        case LINK.default_:
+        case LINK.system:
         case LINK.d:
             mc = 'F';
             break;
@@ -371,8 +373,6 @@ public:
         case LINK.objc:
             mc = 'Y';
             break;
-        default:
-            assert(0);
         }
         buf.writeByte(mc);
         if (ta.purity || ta.isnothrow || ta.isnogc || ta.isproperty || ta.isref || ta.trust || ta.isreturn || ta.isscope)
@@ -545,7 +545,7 @@ public:
     {
         if (!d.parent || d.parent.isModule() || d.linkage == LINK.cpp) // if at global scope
         {
-            switch (d.linkage)
+            final switch (d.linkage)
             {
                 case LINK.d:
                     break;
@@ -557,11 +557,9 @@ public:
                 case LINK.cpp:
                     return Target.toCppMangle(d);
                 case LINK.default_:
+                case LINK.system:
                     d.error("forward declaration");
                     return d.ident.toChars();
-                default:
-                    fprintf(stderr, "'%s', linkage = %d\n", d.toChars(), d.linkage);
-                    assert(0);
             }
         }
         return null;

diff --git a/src/dmd/glue.d b/src/dmd/glue.d
@@ -1459,7 +1459,7 @@ uint totym(Type tx)
         case Tfunction:
         {
             TypeFunction tf = cast(TypeFunction)tx;
-            switch (tf.linkage)
+            final switch (tf.linkage)
             {
                 case LINK.windows:
                     if (global.params.is64bit)
@@ -1487,7 +1487,8 @@ uint totym(Type tx)
                     t = (tf.varargs == 1) ? TYnfunc : TYjfunc;
                     break;
 
-                default:
+                case LINK.default_:
+                case LINK.system:
                     printf("linkage = %d\n", tf.linkage);
                     assert(0);
             }

diff --git a/src/dmd/hdrgen.d b/src/dmd/hdrgen.d
@@ -3307,7 +3307,7 @@ private void linkageToBuffer(OutBuffer* buf, LINK linkage)
 
 extern (C++) const(char)* linkageToChars(LINK linkage)
 {
-    switch (linkage)
+    final switch (linkage)
     {
     case LINK.default_:
         return null;
@@ -3325,8 +3325,6 @@ extern (C++) const(char)* linkageToChars(LINK linkage)
         return "Objective-C";
     case LINK.system:
         return "System";
-    default:
-        assert(0);
     }
 }
 

diff --git a/src/dmd/json.d b/src/dmd/json.d
@@ -293,7 +293,7 @@ public:
 
     void property(const(char)* name, LINK linkage)
     {
-        switch (linkage)
+        final switch (linkage)
         {
         case LINK.default_:
             // Should not be printed
@@ -303,6 +303,10 @@ public:
             // Should not be printed
             //property(name, "d");
             break;
+        case LINK.system:
+            // Should not be printed
+            //property(name, "system");
+            break;
         case LINK.c:
             property(name, "c");
             break;
@@ -315,8 +319,9 @@ public:
         case LINK.pascal:
             property(name, "pascal");
             break;
-        default:
-            assert(false);
+        case LINK.objc:
+            property(name, "objc");
+            break;
         }
     }
 

diff --git a/src/dmd/target.d b/src/dmd/target.d
@@ -433,13 +433,19 @@ struct Target
      */
     extern (C++) static void prefixName(OutBuffer* buf, LINK linkage)
     {
-        switch (linkage)
+        final switch (linkage)
         {
         case LINK.cpp:
             if (global.params.isOSX)
                 buf.prependbyte('_');
             break;
-        default:
+        case LINK.default_:
+        case LINK.d:
+        case LINK.c:
+        case LINK.windows:
+        case LINK.pascal:
+        case LINK.objc:
+        case LINK.system:
             break;
         }
     }

diff --git a/src/dmd/tocsym.d b/src/dmd/tocsym.d
@@ -243,7 +243,7 @@ Symbol *toSymbol(Dsymbol s)
             }
 
             mangle_t m = 0;
-            switch (vd.linkage)
+            final switch (vd.linkage)
             {
                 case LINK.windows:
                     m = global.params.is64bit ? mTYman_c : mTYman_std;
@@ -265,7 +265,8 @@ Symbol *toSymbol(Dsymbol s)
                     s.Sflags |= SFLpublic;
                     m = mTYman_d;
                     break;
-                default:
+                case LINK.default_:
+                case LINK.system:
                     printf("linkage = %d, vd = %s %s @ [%s]\n",
                         vd.linkage, vd.kind(), vd.toChars(), vd.loc.toChars());
                     assert(0);
@@ -341,7 +342,7 @@ Symbol *toSymbol(Dsymbol s)
             }
             else
             {
-                switch (fd.linkage)
+                final switch (fd.linkage)
                 {
                     case LINK.windows:
                         t.Tmangle = global.params.is64bit ? mTYman_c : mTYman_std;
@@ -375,7 +376,8 @@ Symbol *toSymbol(Dsymbol s)
                         }
                         t.Tmangle = mTYman_d;
                         break;
-                    default:
+                    case LINK.default_:
+                    case LINK.system:
                         printf("linkage = %d\n", fd.linkage);
                         assert(0);
                 }

diff --git a/src/dmd/toobj.d b/src/dmd/toobj.d
@@ -1341,7 +1341,7 @@ void toObjFile(Dsymbol ds, bool multiobj)
          */
         static mangle_t mangle(const VarDeclaration vd)
         {
-            switch (vd.linkage)
+            final switch (vd.linkage)
             {
                 case LINK.windows:
                     return global.params.is64bit ? mTYman_c : mTYman_std;
@@ -1359,7 +1359,8 @@ void toObjFile(Dsymbol ds, bool multiobj)
                 case LINK.cpp:
                     return mTYman_d;
 
-                default:
+                case LINK.default_:
+                case LINK.system:
                     printf("linkage = %d\n", vd.linkage);
                     assert(0);
             }