Merge pull request #2384 from hpohl/labels

remove unused labels
dlang · Jul 26, 2013 · ece6d64 · ece6d64
2 parents 21b130d + be5ea96
commit ece6d64
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 11 deletions.
diff --git a/src/clone.c b/src/clone.c
@@ -680,7 +680,6 @@ FuncDeclaration *StructDeclaration::buildXopCmp(Scope *sc)
     if (global.endGagging(errors))    // if errors happened
     {
         members->remove(index);
-    Lerrcmp:
         if (!xerrcmp)
         {
             Expression *e = new IdentifierExp(loc, Id::empty);

diff --git a/src/expression.c b/src/expression.c
@@ -501,7 +501,6 @@ Expression *resolvePropertiesX(Scope *sc, Expression *e1, Expression *e2 = NULL)
         }
     }
 
-return_expr:
     if (!e1->type)
     {
         error(loc, "cannot resolve type for %s", e1->toChars());
@@ -9152,7 +9151,6 @@ Expression *CallExp::addDtorHook(Scope *sc)
             return e;
         }
     }
-Lnone:
     return this;
 }
 

diff --git a/src/interpret.c b/src/interpret.c
@@ -1473,7 +1473,6 @@ Expression *DoStatement::interpret(InterState *istate)
         if (istate->gotoTarget && istate->gotoTarget != this)
             break; // continue at a higher level
 
-    Lcontinue:
         istate->gotoTarget = NULL;
         e = condition->interpret(istate);
         if (exceptionOrCantInterpret(e))

diff --git a/src/mtype.c b/src/mtype.c
@@ -6498,7 +6498,6 @@ void TypeQualified::resolveHelper(Loc loc, Scope *sc,
                 }
                 else
                 {
-                  Lerror:
                     if (id->dyncast() == DYNCAST_DSYMBOL)
                     {   // searchX already handles errors for template instances
                         assert(global.errors);

diff --git a/src/opover.c b/src/opover.c
@@ -1576,10 +1576,10 @@ static int inferApplyArgTypesY(TypeFunction *tf, Parameters *arguments, int flag
             arg->type = arg->type->addStorageClass(arg->storageClass);
         }
     }
-  Lmatch:
+Lmatch:
     return 1;
 
-  Lnomatch:
+Lnomatch:
     return 0;
 }
 

diff --git a/src/parse.c b/src/parse.c
@@ -1555,7 +1555,6 @@ Parameters *Parser::parseParameters(int *pvarargs, TemplateParameters **tpl)
                         nextToken();
                         break;
                     }
-                            L3:
                     a = new Parameter(storageClass, at, ai, ae);
                     arguments->push(a);
                     if (token.value == TOKcomma)
@@ -6002,7 +6001,6 @@ Expression *Parser::parsePrimaryExp()
                     /* fall through to TOKlparen */
 
                 case TOKlparen:
-                Lparen:
                 {   // (parameters) => expression
                     // (parameters) { statements... }
                     parameters = parseParameters(&varargs, &tpl);

diff --git a/src/template.c b/src/template.c
@@ -2382,7 +2382,7 @@ void templateResolve(Match *m, TemplateDeclaration *tdstart, Loc loc, Scope *sc,
                 if (c1 < c2) goto Ltd_best;
             }
 
-          Lambig:           // td_best and td are ambiguous
+          Lambig:   // td_best and td are ambiguous
             //printf("Lambig\n");
             td_ambig = td;
             m->nextf = fd;  // Caution! m->nextf isn't complete instantiated fd, so must not call toPrettyChars()
@@ -6447,7 +6447,6 @@ Identifier *TemplateInstance::genIdent(Objects *args)
             buf.writeByte('S');
             sa = sa->toAlias();
             Declaration *d = sa->isDeclaration();
-          Lsa2:
             if (d && (!d->type || !d->type->deco))
             {
                 error("forward reference of %s %s", d->kind(), d->toChars());