Remove redundant global.params.warnings checks

dlang · Oct 8, 2012 · 8fcc1c2 · 8fcc1c2
1 parent 9aea891
commit 8fcc1c2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 23 deletions.
diff --git a/src/doc.c b/src/doc.c
@@ -432,8 +432,7 @@ void escapeStrayParenthesis(OutBuffer *buf, unsigned start, Loc loc)
                 if (par_open == 0)
                 {
                     //stray ')'
-                    if (global.params.warnings)
-                        warning(loc, "Ddoc: Stray ')'. This may cause incorrect Ddoc output."
+                    warning(loc, "Ddoc: Stray ')'. This may cause incorrect Ddoc output."
                         " Use $(RPAREN) instead for unpaired right parentheses.");
                     buf->remove(u, 1); //remove the )
                     buf->insert(u, "$(RPAREN)", 9); //insert this instead
@@ -468,8 +467,7 @@ void escapeStrayParenthesis(OutBuffer *buf, unsigned start, Loc loc)
                     if (par_open == 0)
                     {
                         //stray '('
-                        if (global.params.warnings)
-                            warning(loc, "Ddoc: Stray '('. This may cause incorrect Ddoc output."
+                        warning(loc, "Ddoc: Stray '('. This may cause incorrect Ddoc output."
                             " Use $(LPAREN) instead for unpaired left parentheses.");
                         buf->remove(u, 1); //remove the (
                         buf->insert(u, "$(LPAREN)", 9); //insert this instead

diff --git a/src/expression.c b/src/expression.c
@@ -5129,7 +5129,7 @@ Expression *VarExp::modifiableLvalue(Scope *sc, Expression *e)
 
 #if (BUG6652 == 1)
     VarDeclaration *v = var->isVarDeclaration();
-    if (v && (v->storage_class & STCbug6652) && global.params.warnings)
+    if (v && (v->storage_class & STCbug6652))
         warning("Variable modified in foreach body requires ref storage class");
 #elif (BUG6652 == 2)
     VarDeclaration *v = var->isVarDeclaration();

diff --git a/src/parse.c b/src/parse.c
@@ -3754,9 +3754,7 @@ Statement *Parser::parseStatement(int flags)
             if (!(flags & PSsemi_ok))
             {
                 if (flags & PSsemi)
-                {   if (global.params.warnings)
-                        warning(loc, "use '{ }' for an empty statement, not a ';'");
-                }
+                    warning(loc, "use '{ }' for an empty statement, not a ';'");
                 else
                     error("use '{ }' for an empty statement, not a ';'");
             }

diff --git a/src/scope.c b/src/scope.c
@@ -255,8 +255,7 @@ Dsymbol *Scope::search(Loc loc, Identifier *ident, Dsymbol **pscopesym)
             s = sc->scopesym->search(loc, ident, 0);
             if (s)
             {
-                if ((global.params.warnings ||
-                    global.params.Dversion > 1) &&
+                if (global.params.Dversion > 1 &&
                     ident == Id::length &&
                     sc->scopesym->isArrayScopeSymbol() &&
                     sc->enclosing &&

diff --git a/src/typinf.c b/src/typinf.c
@@ -633,19 +633,13 @@ void TypeInfoStructDeclaration::toDt(dt_t **pdt)
             dtxoff(pdt, fd->toSymbol(), 0, TYnptr);
             TypeFunction *tf = (TypeFunction *)fd->type;
             assert(tf->ty == Tfunction);
-            if (global.params.warnings)
-            {
-                /* I'm a little unsure this is the right way to do it. Perhaps a better
-                 * way would to automatically add these attributes to any struct member
-                 * function with the name "toHash".
-                 * So I'm leaving this here as an experiment for the moment.
-                 */
-                if (!tf->isnothrow || tf->trust == TRUSTsystem /*|| tf->purity == PUREimpure*/)
-                {   warning(fd->loc, "toHash() must be declared as extern (D) uint toHash() const nothrow @safe, not %s", tf->toChars());
-                    if (global.params.warnings == 1)
-                        global.errors++;
-                }
-            }
+            /* I'm a little unsure this is the right way to do it. Perhaps a better
+             * way would to automatically add these attributes to any struct member
+             * function with the name "toHash".
+             * So I'm leaving this here as an experiment for the moment.
+             */
+            if (!tf->isnothrow || tf->trust == TRUSTsystem /*|| tf->purity == PUREimpure*/)
+                warning(fd->loc, "toHash() must be declared as extern (D) uint toHash() const nothrow @safe, not %s", tf->toChars());
         }
         else
         {