Merge pull request #2813 from yebblies/danglingelses

[DDMD] Get rid of dangling elses
dlang · Nov 18, 2013 · 7512d97 · 7512d97
2 parents b5c4e44 + 3630991
commit 7512d97
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 31 deletions.
diff --git a/src/cast.c b/src/cast.c
@@ -1077,14 +1077,6 @@ Expression *Expression::castTo(Scope *sc, Type *t)
             else
                 e = new AddrExp(loc, e);
         }
-#if 0
-        else if (tb->ty == Tdelegate && type->ty != Tdelegate)
-        {
-            TypeDelegate *td = (TypeDelegate *)tb;
-            TypeFunction *tf = (TypeFunction *)td->nextOf();
-            return toDelegate(sc, tf->nextOf());
-        }
-#endif
         else
         {
             if (typeb->ty == Tstruct)

diff --git a/src/constfold.c b/src/constfold.c
@@ -835,11 +835,6 @@ Expression *Equal(TOK op, Type *type, Expression *e1, Expression *e2)
                 cmp = 0;
         }
     }
-#if 0 // Should handle this
-    else if (e1->op == TOKarrayliteral && e2->op == TOKstring)
-    {
-    }
-#endif
     else if (e1->isConst() != 1 || e2->isConst() != 1)
         return EXP_CANT_INTERPRET;
     else if (e1->type->isreal())

diff --git a/src/ctfeexpr.c b/src/ctfeexpr.c
@@ -331,12 +331,14 @@ Expression *copyLiteral(Expression *e)
         else if (e->op == TOKindex)
             r = new IndexExp(e->loc, ((IndexExp *)e)->e1, ((IndexExp *)e)->e2);
         else if (e->op == TOKdotvar)
+        {
 #if DMDV2
             r = new DotVarExp(e->loc, ((DotVarExp *)e)->e1,
                 ((DotVarExp *)e)->var, ((DotVarExp *)e)->hasOverloads);
 #else
             r = new DotVarExp(e->loc, ((DotVarExp *)e)->e1, ((DotVarExp *)e)->var);
 #endif
+        }
         else
             assert(0);
         r->type = e->type;

diff --git a/src/dsymbol.c b/src/dsymbol.c
@@ -797,12 +797,10 @@ void Dsymbol::addComment(const utf8_t *comment)
 
     if (!this->comment)
         this->comment = comment;
-#if 1
     else if (comment && strcmp((char *)comment, (char *)this->comment) != 0)
     {   // Concatenate the two
         this->comment = Lexer::combineComments(this->comment, comment);
     }
-#endif
 }
 
 /********************************* OverloadSet ****************************/

diff --git a/src/interpret.c b/src/interpret.c
@@ -5592,16 +5592,17 @@ Expression *PtrExp::interpret(InterState *istate, CtfeGoal goal)
         }
         e = Ptr(type, e1);
     }
+    else
+    {
 #if DMDV2
 #else // this is required for D1, where structs return *this instead of 'this'.
-    else if (e1->op == TOKthis)
-    {
-        if (ctfeStack.getThis())
-            return ctfeStack.getThis()->interpret(istate);
-    }
+        if (e1->op == TOKthis)
+        {
+            if (ctfeStack.getThis())
+                return ctfeStack.getThis()->interpret(istate);
+            goto Ldone;
+        }
 #endif
-    else
-    {
         // Check for .classinfo, which is lowered in the semantic pass into **(class).
         if (e1->op == TOKstar && e1->type->ty == Tpointer && isTypeInfo_Class(e1->type->nextOf()))
         {
@@ -5739,6 +5740,7 @@ Expression *PtrExp::interpret(InterState *istate, CtfeGoal goal)
         e = paintTypeOntoLiteral(type, e);
     }
 
+Ldone:
 #if LOG
     if (e == EXP_CANT_INTERPRET)
         printf("PtrExp::interpret() %s = EXP_CANT_INTERPRET\n", toChars());

diff --git a/src/lexer.c b/src/lexer.c
@@ -931,12 +931,6 @@ void Lexer::scan(Token *t)
                 {   p++;
                     t->value = TOKminass;
                 }
-#if 0
-                else if (*p == '>')
-                {   p++;
-                    t->value = TOKarrow;
-                }
-#endif
                 else if (*p == '-')
                 {   p++;
                     t->value = TOKminusminus;

diff --git a/src/root/root.c b/src/root/root.c
@@ -959,7 +959,7 @@ File::~File()
         if (ref == 0)
             mem.free(buffer);
 #if _WIN32
-        else if (ref == 2)
+        if (ref == 2)
             UnmapViewOfFile(buffer);
 #endif
     }

diff --git a/src/statement.c b/src/statement.c
@@ -4294,7 +4294,6 @@ Statement *SynchronizedStatement::semantic(Scope *sc)
         return s->semantic(sc);
 #endif
     }
-#if 1
     else
     {   /* Generate our own critical section, then rewrite as:
          *  __gshared byte[CriticalSection.sizeof] critsec;
@@ -4331,7 +4330,6 @@ Statement *SynchronizedStatement::semantic(Scope *sc)
         s = new CompoundStatement(loc, cs);
         return s->semantic(sc);
     }
-#endif
 Lbody:
     if (body)
         body = body->semantic(sc);