Fixing handling of duplicate frame macros: 'continue' would continue the inner for...

[xonotic/gmqcc.git] / main.c

diff --git a/main.c b/main.c
index 7369a9ca7d06987be0a7863becc8fe0583b42cb4..4b850d0c8614d1314fabb8792b1202027166aa00 100644 (file)
--- a/main.c
+++ b/main.c
@@ -33,9 +33,16 @@ bool        opts_debug    = false;
 bool        opts_memchk   = false;
 bool        opts_dump     = false;
 bool        opts_werror   = false;
+bool        opts_forcecrc = false;
+
+uint16_t    opts_forced_crc;
 
 static bool opts_output_wasset = false;
 
+/* set by the standard */
+const oper_info *operators      = NULL;
+size_t           operator_count = 0;
+
 typedef struct { char *filename; int type; } argitem;
 VECTOR_MAKE(argitem, items);
 
@@ -63,6 +70,7 @@ static int usage() {
     printf("  -W<warning>            enable a warning\n"
            "  -Wno-<warning>         disable a warning\n"
            "  -Wall                  enable all warnings\n");
+    printf("  -force-crc=num         force a specific checksum into the header\n");
     printf("\n");
     printf("flags:\n"
            "  -fdarkplaces-string-table-bug\n"
@@ -180,6 +188,11 @@ static bool options_parse(int argc, char **argv) {
                 }
                 continue;
             }
+            if (options_long_gcc("force-crc", &argc, &argv, &argarg)) {
+                opts_forcecrc = true;
+                opts_forced_crc = strtol(argarg, NULL, 0);
+                continue;
+            }
             if (!strcmp(argv[0]+1, "debug")) {
                 opts_debug = true;
                 continue;
@@ -240,6 +253,11 @@ static bool options_parse(int argc, char **argv) {
                         opts_werror = true;
                         break;
                     }
+                    else if (!strcmp(argv[0]+2, "NONE")) {
+                        for (itr = 0; itr < sizeof(opts_warn)/sizeof(opts_warn[0]); ++itr)
+                            opts_warn[itr] = 0;
+                        break;
+                    }
                     else if (!strcmp(argv[0]+2, "ALL")) {
                         for (itr = 0; itr < sizeof(opts_warn)/sizeof(opts_warn[0]); ++itr)
                             opts_warn[itr] = 0xFFFFFFFFL;
@@ -343,16 +361,15 @@ static void options_set(uint32_t *flags, size_t idx, bool on)
 }
 
 /* returns the line number, or -1 on error */
-static bool progs_nextline(char **out, FILE *src)
+static bool progs_nextline(char **out, size_t *alen,FILE *src)
 {
-    size_t alen;
     int    len;
     char  *line;
     char  *start;
     char  *end;
 
     line = *out;
-    len = util_getline(&line, &alen, src);
+    len = util_getline(&line, alen, src);
     if (len == -1)
         return false;
 
@@ -381,11 +398,30 @@ int main(int argc, char **argv) {
     options_set(opts_warn, WARN_UNKNOWN_CONTROL_SEQUENCE, true);
     options_set(opts_warn, WARN_EXTENSIONS, true);
     options_set(opts_warn, WARN_FIELD_REDECLARED, true);
+    options_set(opts_warn, WARN_TOO_FEW_PARAMETERS, true);
+    options_set(opts_warn, WARN_MISSING_RETURN_VALUES, true);
+    options_set(opts_warn, WARN_USED_UNINITIALIZED, true);
+    options_set(opts_warn, WARN_LOCAL_CONSTANTS, true);
+    options_set(opts_warn, WARN_VOID_VARIABLES, true);
+    options_set(opts_warn, WARN_IMPLICIT_FUNCTION_POINTER, true);
+    options_set(opts_warn, WARN_VARIADIC_FUNCTION, true);
+    options_set(opts_warn, WARN_FRAME_MACROS, true);
+    options_set(opts_warn, WARN_UNUSED_VARIABLE, true);
+    options_set(opts_warn, WARN_EFFECTLESS_STATEMENT, true);
 
     if (!options_parse(argc, argv)) {
         return usage();
     }
 
+    /* the standard decides which set of operators to use */
+    if (opts_standard == COMPILER_GMQCC) {
+        operators = c_operators;
+        operator_count = c_operator_count;
+    } else {
+        operators = qcc_operators;
+        operator_count = qcc_operator_count;
+    }
+
     if (opts_dump) {
         for (itr = 0; itr < COUNT_FLAGS; ++itr) {
             printf("Flag %s = %i\n", opts_flag_list[itr].name, OPTS_FLAG(itr));
@@ -427,6 +463,7 @@ int main(int argc, char **argv) {
     } else {
         FILE *src;
         char *line;
+        size_t linelen = 0;
 
         printf("Mode: progs.src\n");
         src = util_fopen("progs.src", "rb");
@@ -437,7 +474,7 @@ int main(int argc, char **argv) {
         }
 
         line = NULL;
-        if (!progs_nextline(&line, src) || !line[0]) {
+        if (!progs_nextline(&line, &linelen, src) || !line[0]) {
             printf("illformatted progs.src file: expected output filename in first line\n");
             retval = 1;
             goto srcdone;
@@ -448,7 +485,7 @@ int main(int argc, char **argv) {
             opts_output_free = true;
         }
 
-        while (progs_nextline(&line, src)) {
+        while (progs_nextline(&line, &linelen, src)) {
             if (!line[0] || (line[0] == '/' && line[1] == '/'))
                 continue;
             printf("  src: %s\n", line);