Check types on + and - operations

[xonotic/gmqcc.git] / main.c

diff --git a/main.c b/main.c
index 9cbf026dd75fa5c1a697fa5579dc1e82b1f699b0..c2e7a8d6cc842fa3af86aa51d62de288ffeb2a14 100644 (file)
--- a/main.c
+++ b/main.c
@@ -202,7 +202,7 @@ static bool options_parse(int argc, char **argv) {
                         }
                         exit(0);
                     }
-                    else if (!strncmp(argv[0]+2, "NO-", 3)) {
+                    else if (!strncmp(argv[0]+2, "NO_", 3)) {
                         if (!options_setflag(argv[0]+5, false)) {
                             printf("unknown flag: %s\n", argv[0]+2);
                             return false;
@@ -223,12 +223,12 @@ static bool options_parse(int argc, char **argv) {
                         }
                         exit(0);
                     }
-                    else if (!strcmp(argv[0]+2, "all")) {
+                    else if (!strcmp(argv[0]+2, "ALL")) {
                         for (itr = 0; itr < sizeof(opts_warn)/sizeof(opts_warn[0]); ++itr)
                             opts_warn[itr] = 0xFFFFFFFFL;
                         break;
                     }
-                    if (!strncmp(argv[0]+2, "no-", 3)) {
+                    if (!strncmp(argv[0]+2, "NO_", 3)) {
                         if (!options_setwarn(argv[0]+5, false)) {
                             printf("unknown warning: %s\n", argv[0]+2);
                             return false;
@@ -308,6 +308,22 @@ 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
+}
+
 bool parser_init();
 bool parser_compile(const char *filename);
 bool parser_finish(const char *output);
@@ -315,8 +331,12 @@ void parser_cleanup();
 
 int main(int argc, char **argv) {
     size_t itr;
+    int retval = 0;
     app_name = argv[0];
 
+    /* default options / warn flags */
+    options_set(opts_warn, WARN_UNKNOWN_CONTROL_SEQUENCE, true);
+
     if (!options_parse(argc, argv)) {
         return usage();
     }
@@ -349,8 +369,10 @@ int main(int argc, char **argv) {
                      (items_data[itr].type == TYPE_SRC ? "progs.src" :
                      ("unknown"))))));
 
-            if (!parser_compile(items_data[itr].filename))
+            if (!parser_compile(items_data[itr].filename)) {
+                retval = 1;
                 goto cleanup;
+            }
         }
 
         parser_finish(opts_output);
@@ -366,5 +388,5 @@ cleanup:
     parser_cleanup();
 
     util_meminfo();
-    return 0;
+    return retval;
 }