From: Wolfgang Bumiller <blub@speed.at>
Date: Mon, 31 Dec 2012 11:37:47 +0000 (+0100)
Subject: -std=gmqcc now implies -Werror-missing-return-values; another hardcoded error removed
X-Git-Tag: before-library~409
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d8254cede0368482090009c21e7e49c7257a783e;p=xonotic%2Fgmqcc.git

-std=gmqcc now implies -Werror-missing-return-values; another hardcoded error removed
---

diff --git a/main.c b/main.c
index 8abb193..6d8bc93 100644
--- a/main.c
+++ b/main.c
@@ -164,6 +164,7 @@ static bool options_parse(int argc, char **argv) {
                     opts_set(opts.flags, TRUE_EMPTY_STRINGS,            true);
                     opts_set(opts.flags, LOOP_LABELS,                   true);
                     opts_set(opts.werror, WARN_INVALID_PARAMETER_COUNT, true);
+                    opts_set(opts.werror, WARN_MISSING_RETURN_VALUES,   true);
                     opts.standard = COMPILER_GMQCC;
 
                 } else if (!strcmp(argarg, "qcc")) {
diff --git a/parser.c b/parser.c
index 97a4dff..5bb7652 100644
--- a/parser.c
+++ b/parser.c
@@ -2534,10 +2534,7 @@ static bool parse_return(parser_t *parser, ast_block *block, ast_expression **ou
         if (!parser_next(parser))
             parseerror(parser, "parse error");
         if (expected->expression.next->expression.vtype != TYPE_VOID) {
-            if (opts.standard != COMPILER_GMQCC)
-                (void)!parsewarning(parser, WARN_MISSING_RETURN_VALUES, "return without value");
-            else
-                parseerror(parser, "return without value");
+            (void)!parsewarning(parser, WARN_MISSING_RETURN_VALUES, "return without value");
         }
         ret = ast_return_new(ctx, NULL);
     }