Merge pull request #1952 from yebblies/missingdefault

Add missing default cases to switches
dlang · May 4, 2013 · 21dc76c · 21dc76c
1 parent 9019ed0
commit 21dc76c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/src/cast.c b/src/cast.c
@@ -1670,6 +1670,8 @@ Expression *Expression::integralPromotions(Scope *sc)
         case Tdchar:
             e = e->castTo(sc, Type::tuns32);
             break;
+        default:
+            break;
     }
     return e;
 }

diff --git a/src/lexer.c b/src/lexer.c
@@ -930,6 +930,8 @@ void Lexer::scan(Token *t)
                         }
                         continue;
                     }
+                    default:
+                        break;
                 }
                 t->value = TOKdiv;
                 return;

diff --git a/src/mtype.c b/src/mtype.c
@@ -1444,8 +1444,9 @@ int TypeBasic::isZeroInit(Loc loc)
         case Tcomplex64:
         case Tcomplex80:
             return 0;           // no
+        default:
+            return 1;           // yes
     }
-    return 1;                   // yes
 }
 
 int TypeBasic::isbit()
@@ -1909,6 +1910,8 @@ Type *TypeSArray::semantic(Loc loc, Scope *sc)
         case Tnone:
             error(loc, "can't have array of %s", tbn->toChars());
             goto Lerror;
+        default:
+            break;
     }
     if (tbn->isscope())
     {   error(loc, "cannot have array of auto %s", tbn->toChars());
@@ -2101,7 +2104,9 @@ Type *TypeDArray::semantic(Loc loc, Scope *sc)
         case Tnone:
         case Ttuple:
             error(loc, "can't have array of %s", tbn->toChars());
-            tn = next = tint32;
+        case Terror:
+            return Type::terror;
+        default:
             break;
     }
     if (tn->isscope())
@@ -2499,7 +2504,9 @@ Type *TypePointer::semantic(Loc loc, Scope *sc)
     {
         case Ttuple:
             error(loc, "can't have pointer to %s", n->toChars());
-            n = tint32;
+       case Terror:
+            return Type::terror;
+        default:
             break;
     }
     if (n != next)

diff --git a/src/parse.c b/src/parse.c
@@ -4937,6 +4937,8 @@ Expression *Parser::parseUnaryExp()
                         }
                         return e;
                     }
+                    default:
+                        break;
                 }
             }
 #endif