error message replacement

[xonotic/gmqcc.git] / main.c

diff --git a/main.c b/main.c
index 7ca9fea528151d9278b092d525dc4deae10ef35e..21c0a0334c37b42dfa63591cb150d353b35ee922 100644 (file)
--- a/main.c
+++ b/main.c
@@ -30,6 +30,7 @@ const char *opts_output   = "progs.dat";
 int         opts_standard = COMPILER_GMQCC;
 bool        opts_debug    = false;
 bool        opts_memchk   = false;
+bool        opts_dump     = false;
 
 typedef struct { char *filename; int type; } argitem;
 VECTOR_MAKE(argitem, items);
@@ -179,6 +180,10 @@ static bool options_parse(int argc, char **argv) {
                 opts_debug = true;
                 continue;
             }
+            if (!strcmp(argv[0]+1, "dump")) {
+                opts_dump = true;
+                continue;
+            }
             if (!strcmp(argv[0]+1, "memchk")) {
                 opts_memchk = true;
                 continue;
@@ -202,7 +207,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 +228,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,23 +313,58 @@ 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);
+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);
+    options_set(opts_warn, WARN_EXTENSIONS, true);
+
     if (!options_parse(argc, argv)) {
         return usage();
     }
 
-    for (itr = 0; itr < COUNT_FLAGS; ++itr) {
-        printf("Flag %s = %i\n", opts_flag_list[itr].name, OPTS_FLAG(itr));
+    if (opts_dump) {
+        for (itr = 0; itr < COUNT_FLAGS; ++itr) {
+            printf("Flag %s = %i\n", opts_flag_list[itr].name, OPTS_FLAG(itr));
+        }
+        for (itr = 0; itr < COUNT_WARNINGS; ++itr) {
+            printf("Warning %s = %i\n", opts_warn_list[itr].name, OPTS_WARN(itr));
+        }
+        printf("output = %s\n", opts_output);
+        printf("optimization level = %i\n", (int)opts_O);
+        printf("standard = %i\n", opts_standard);
     }
-    for (itr = 0; itr < COUNT_WARNINGS; ++itr) {
-        printf("Warning %s = %i\n", opts_warn_list[itr].name, OPTS_WARN(itr));
+
+    if (!parser_init()) {
+        printf("failed to initialize parser\n");
+        goto cleanup;
     }
-    printf("output = %s\n", opts_output);
-    printf("optimization level = %i\n", (int)opts_O);
-    printf("standard = %i\n", opts_standard);
+
+    util_debug("COM", "starting ...\n");
 
     if (items_elements) {
         printf("Mode: manual\n");
@@ -336,17 +376,25 @@ int main(int argc, char **argv) {
                      (items_data[itr].type == TYPE_ASM ? "asm" :
                      (items_data[itr].type == TYPE_SRC ? "progs.src" :
                      ("unknown"))))));
+
+            if (!parser_compile(items_data[itr].filename)) {
+                retval = 1;
+                goto cleanup;
+            }
         }
+
+        parser_finish(opts_output);
     } else {
-        printf("Mode: progs.src\n");
+        printf("Mode: progs.src - not implemented\n");
     }
 
-    util_debug("COM", "starting ...\n");
-
     /* stuff */
 
+cleanup:
     util_debug("COM", "cleaning ...\n");
 
+    parser_cleanup();
+
     util_meminfo();
-    return 0;
+    return retval;
 }