improve the warning

[xonotic/gmqcc.git] / main.c

diff --git a/main.c b/main.c
index 23f4de8b9294f918b1eb43c75454358a5e4f57b6..773b08ed711e815c89da14e1c64235f649b49a2f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -34,6 +34,8 @@ bool        opts_memchk   = false;
 bool        opts_dump     = false;
 bool        opts_werror   = false;
 bool        opts_forcecrc = false;
+bool        opts_pp_only  = false;
+size_t      opts_max_array_size = 1024;
 
 uint16_t    opts_forced_crc;
 
@@ -61,6 +63,7 @@ static int usage() {
     printf("  -o, --output=file      output file, defaults to progs.dat\n"
            "  -a filename            add an asm file to be assembled\n"
            "  -s filename            add a progs.src file to be used\n");
+    printf("  -E                     stop after preprocessing\n");
     printf("  -f<flag>               enable a flag\n"
            "  -fno-<flag>            disable a flag\n"
            "  -std standard          select one of the following standards\n"
@@ -69,14 +72,13 @@ static int usage() {
            "       -std=gmqcc        this compiler (default)\n");
     printf("  -W<warning>            enable a warning\n"
            "  -Wno-<warning>         disable a warning\n"
-           "  -Wall                  enable all warnings\n");
+           "  -Wall                  enable all warnings\n"
+           "  -Werror                treat warnings as errors\n");
     printf("  -force-crc=num         force a specific checksum into the header\n");
     printf("\n");
     printf("flags:\n"
-           "  -fdarkplaces-string-table-bug\n"
-           "            patch the string table to work with some bugged darkplaces versions\n"
-           "  -fomit-nullbytes\n"
-           "            omits certain null-bytes for a smaller output - requires a patched engine\n"
+           "  -fadjust-vector-fields\n"
+           "            when assigning a vector field, its _y and _z fields also get assigned\n"
            );
     return -1;
 }
@@ -160,6 +162,22 @@ static bool options_long_gcc(const char *optname, int *argc_, char ***argv_, cha
     return options_long_witharg_all(optname, argc_, argv_, out, 1, false);
 }
 
+static void options_set(uint32_t *flags, size_t idx, bool on)
+{
+    longbit lb = LONGBIT(idx);
+#if 0
+    if (on)
+        flags[lb.idx] |= (1<<(lb.bit));
+    else
+        flags[lb.idx] &= ~(1<<(lb.bit));
+#else
+    if (on)
+        flags[0] |= (1<<(lb));
+    else
+        flags[0] &= ~(1<<(lb));
+#endif
+}
+
 static bool options_parse(int argc, char **argv) {
     bool argend = false;
     size_t itr;
@@ -174,15 +192,19 @@ static bool options_parse(int argc, char **argv) {
         if (argv[0][0] == '-') {
     /* All gcc-type long options */
             if (options_long_gcc("std", &argc, &argv, &argarg)) {
-                if      (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default"))
+                if      (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default")) {
+                    options_set(opts_flags, ADJUST_VECTOR_FIELDS, true);
                     opts_standard = COMPILER_GMQCC;
-                else if (!strcmp(argarg, "qcc"))
+                } else if (!strcmp(argarg, "qcc")) {
+                    options_set(opts_flags, ADJUST_VECTOR_FIELDS, false);
                     opts_standard = COMPILER_QCC;
-                else if (!strcmp(argarg, "fte") || !strcmp(argarg, "fteqcc"))
+                } else if (!strcmp(argarg, "fte") || !strcmp(argarg, "fteqcc")) {
+                    options_set(opts_flags, ADJUST_VECTOR_FIELDS, false);
                     opts_standard = COMPILER_FTEQCC;
-                else if (!strcmp(argarg, "qccx"))
+                } else if (!strcmp(argarg, "qccx")) {
+                    options_set(opts_flags, ADJUST_VECTOR_FIELDS, false);
                     opts_standard = COMPILER_QCCX;
-                else {
+                } else {
                     printf("Unknown standard: %s\n", argarg);
                     return false;
                 }
@@ -213,6 +235,10 @@ static bool options_parse(int argc, char **argv) {
                     exit(0);
                     break;
 
+                case 'E':
+                    opts_pp_only = true;
+                    break;
+
                 /* handle all -fflags */
                 case 'f':
                     util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1);
@@ -253,6 +279,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;
@@ -339,22 +370,6 @@ static bool options_parse(int argc, char **argv) {
     return true;
 }
 
-static void options_set(uint32_t *flags, size_t idx, bool on)
-{
-    longbit lb = LONGBIT(idx);
-#if 0
-    if (on)
-        flags[lb.idx] |= (1<<(lb.bit));
-    else
-        flags[lb.idx] &= ~(1<<(lb.bit));
-#else
-    if (on)
-        flags[0] |= (1<<(lb));
-    else
-        flags[0] &= ~(1<<(lb));
-#endif
-}
-
 /* returns the line number, or -1 on error */
 static bool progs_nextline(char **out, size_t *alen,FILE *src)
 {
@@ -401,6 +416,12 @@ int main(int argc, char **argv) {
     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);
+    options_set(opts_warn, WARN_END_SYS_FIELDS, true);
+    options_set(opts_warn, WARN_ASSIGN_FUNCTION_TYPES, true);
+
+    options_set(opts_flags, ADJUST_VECTOR_FIELDS, true);
 
     if (!options_parse(argc, argv)) {
         return usage();
@@ -452,7 +473,11 @@ int main(int argc, char **argv) {
             }
         }
 
-        parser_finish(opts_output);
+        if (!parser_finish(opts_output)) {
+            retval = 1;
+            goto cleanup;
+        }
+
     } else {
         FILE *src;
         char *line;