Warna bout unused variables - -Wunused-variable, on by default

[xonotic/gmqcc.git] / parser.c

diff --git a/parser.c b/parser.c
index 79b1d40dca344f799ee8a5d0fa15016e8d4ee381..33eba59f7960d774ad03dbb4a8bc72dc1f77d741 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -44,7 +44,7 @@ MEM_VEC_FUNCTIONS(parser_t, ast_value*, imm_vector)
 MEM_VEC_FUNCTIONS(parser_t, varentry_t, locals)
 MEM_VEC_FUNCTIONS(parser_t, ast_function*, functions)
 
-static void parser_pop_local(parser_t *parser);
+static bool GMQCC_WARN parser_pop_local(parser_t *parser);
 static bool parser_variable(parser_t *parser, ast_block *localblock);
 static ast_block* parser_parse_block(parser_t *parser, bool warnreturn);
 static bool parser_parse_block_into(parser_t *parser, ast_block *block, bool warnreturn);
@@ -343,6 +343,10 @@ static ast_value *parser_parse_type(parser_t *parser, int basetype, bool *isfunc
                     parseerror(parser, "`...` must be the last parameter of a variadic function declaration");
                     goto on_error;
                 }
+                if (opts_standard == COMPILER_QCC) {
+                    if (parsewarning(parser, WARN_EXTENSIONS, "variadic functions are not available in this standard"))
+                        goto on_error;
+                }
                 break;
             }
 
@@ -1104,6 +1108,8 @@ static ast_expression* parser_expression_leave(parser_t *parser, bool stopatcomm
                 parseerror(parser, "unexpected ident: %s", parser_tokval(parser));
                 goto onerr;
             }
+            if (ast_istype(var, ast_value))
+                ((ast_value*)var)->uses++;
             if (!shunt_out_add(&sy, syexp(parser_ctx(parser), var))) {
                 parseerror(parser, "out of memory");
                 goto onerr;
@@ -1516,6 +1522,7 @@ static bool parser_parse_for(parser_t *parser, ast_block *block, ast_expression
     ast_loop *aloop;
     ast_expression *initexpr, *cond, *increment, *ontrue;
     size_t oldblocklocal;
+    bool   retval = true;
 
     lex_ctx ctx = parser_ctx(parser);
 
@@ -1610,15 +1617,15 @@ static bool parser_parse_for(parser_t *parser, ast_block *block, ast_expression
     *out = (ast_expression*)aloop;
 
     while (parser->locals_count > parser->blocklocal)
-        parser_pop_local(parser);
+        retval = retval && parser_pop_local(parser);
     parser->blocklocal = oldblocklocal;
-    return true;
+    return retval;
 onerr:
     if (initexpr)  ast_delete(initexpr);
     if (cond)      ast_delete(cond);
     if (increment) ast_delete(increment);
     while (parser->locals_count > parser->blocklocal)
-        parser_pop_local(parser);
+        (void)!parser_pop_local(parser);
     parser->blocklocal = oldblocklocal;
     return false;
 }
@@ -1739,15 +1746,24 @@ static bool parser_parse_statement(parser_t *parser, ast_block *block, ast_expre
     }
 }
 
-static void parser_pop_local(parser_t *parser)
+static bool GMQCC_WARN parser_pop_local(parser_t *parser)
 {
+    varentry_t *ve;
     parser->locals_count--;
+
+    ve = &parser->locals[parser->locals_count];
+    if (ast_istype(ve->var, ast_value) && !(((ast_value*)(ve->var))->uses)) {
+        if (parsewarning(parser, WARN_UNUSED_VARIABLE, "unused variable: `%s`", ve->name))
+            return false;
+    }
     mem_d(parser->locals[parser->locals_count].name);
+    return true;
 }
 
 static bool parser_parse_block_into(parser_t *parser, ast_block *block, bool warnreturn)
 {
     size_t oldblocklocal;
+    bool   retval = true;
 
     oldblocklocal = parser->blocklocal;
     parser->blocklocal = parser->locals_count;
@@ -1796,7 +1812,7 @@ static bool parser_parse_block_into(parser_t *parser, ast_block *block, bool war
 
 cleanup:
     while (parser->locals_count > parser->blocklocal)
-        parser_pop_local(parser);
+        retval = retval && parser_pop_local(parser);
     parser->blocklocal = oldblocklocal;
     return !!block;
 }
@@ -1898,6 +1914,8 @@ static bool parser_variable(parser_t *parser, ast_block *localblock)
     bool hadproto;
     bool isparam;
 
+    bool retval = true;
+
     int basetype = parser_token(parser)->constval.t;
 
     if (!parser_next(parser)) {
@@ -2101,10 +2119,10 @@ static bool parser_variable(parser_t *parser, ast_block *localblock)
                         !ast_block_collect(localblock, vy.var) ||
                         !ast_block_collect(localblock, vz.var))
                     {
-                        parser_pop_local(parser);
-                        parser_pop_local(parser);
-                        parser_pop_local(parser);
-                        parser_pop_local(parser);
+                        (void)!parser_pop_local(parser);
+                        (void)!parser_pop_local(parser);
+                        (void)!parser_pop_local(parser);
+                        (void)!parser_pop_local(parser);
                         ast_value_delete(var);
                         ast_value_delete(typevar);
                         return false;
@@ -2122,7 +2140,7 @@ static bool parser_variable(parser_t *parser, ast_block *localblock)
                 }
                 if (localblock && !ast_block_locals_add(localblock, var))
                 {
-                    parser_pop_local(parser);
+                    (void)!parser_pop_local(parser);
                     ast_value_delete(var);
                     ast_value_delete(typevar);
                     return false;
@@ -2443,9 +2461,9 @@ nextvar:
                     !ast_block_collect(block, vy.var) ||
                     !ast_block_collect(block, vz.var) )
                 {
-                    parser_pop_local(parser);
-                    parser_pop_local(parser);
-                    parser_pop_local(parser);
+                    (void)!parser_pop_local(parser);
+                    (void)!parser_pop_local(parser);
+                    (void)!parser_pop_local(parser);
                     ast_block_delete(block);
                     ast_value_delete(typevar);
                     return false;
@@ -2479,7 +2497,7 @@ nextvar:
             }
             parser->function = old;
             while (parser->locals_count)
-                parser_pop_local(parser);
+                retval = retval && parser_pop_local(parser);
 
             if (!block) {
                 ast_value_delete(typevar);
@@ -2499,12 +2517,17 @@ nextvar:
             else if (opts_standard == COMPILER_QCC)
                 parseerror(parser, "missing semicolon after function body (mandatory with -std=qcc)");
             ast_value_delete(typevar);
-            return true;
+            return retval;
         } else {
             ast_expression *cexp;
             ast_value      *cval;
 
             cexp = parser_expression_leave(parser, true);
+            if (!cexp) {
+                ast_value_delete(typevar);
+                return false;
+            }
+
             cval = (ast_value*)cexp;
             if (!ast_istype(cval, ast_value) || !cval->isconst)
                 parseerror(parser, "cannot initialize a global constant variable with a non-constant expression");