Merge branch 'master' into blub/parser

[xonotic/gmqcc.git] / main.c

diff --git a/main.c b/main.c
index ca404f9db25f68027fc986416719260efcc44e5f..bef80723632b9176167b9cf3d4ee939aecca124e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -68,36 +68,6 @@ static int usage() {
     return -1;
 }
 
-static void strtocmd(char *str)
-{
-    for(; *str; ++str) {
-        if (*str == '-') {
-            *str = '_';
-            continue;
-        }
-        if (isalpha(*str) && !isupper(*str)) {
-            *str += 'A' - 'a';
-            continue;
-        }
-    }
-}
-
-static void strtononcmd(char *buf, const char *str)
-{
-    for(; *str; ++buf, ++str) {
-        if (*str == '_') {
-            *buf = '-';
-            continue;
-        }
-        if (isalpha(*str) && isupper(*str)) {
-            *buf = *str + 'a' - 'A';
-            continue;
-        }
-        *buf = *str;
-    }
-    *buf = 0;
-}
-
 static bool options_setflag_all(const char *name, bool on, uint32_t *flags, const opts_flag_def *list, size_t listsize) {
     size_t i;
 
@@ -223,16 +193,16 @@ static bool options_parse(int argc, char **argv) {
 
                 /* handle all -fflags */
                 case 'f':
-                    strtocmd(argv[0]+2);
+                    util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1);
                     if (!strcmp(argv[0]+2, "HELP")) {
                         printf("Possible flags:\n");
                         for (itr = 0; itr < COUNT_FLAGS; ++itr) {
-                            strtononcmd(buffer, opts_flag_list[itr].name);
+                            util_strtononcmd(opts_flag_list[itr].name, buffer, sizeof(buffer));
                             printf(" -f%s\n", buffer);
                         }
                         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;
@@ -244,21 +214,21 @@ static bool options_parse(int argc, char **argv) {
                     }
                     break;
                 case 'W':
-                    strtocmd(argv[0]+2);
+                    util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1);
                     if (!strcmp(argv[0]+2, "HELP")) {
                         printf("Possible warnings:\n");
                         for (itr = 0; itr < COUNT_WARNINGS; ++itr) {
-                            strtononcmd(buffer, opts_warn_list[itr].name);
+                            util_strtononcmd(opts_warn_list[itr].name, buffer, sizeof(buffer));
                             printf(" -W%s\n", buffer);
                         }
                         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;
@@ -338,10 +308,34 @@ 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;
     app_name = argv[0];
 
+    /* default options / warn flags */
+    options_set(opts_warn, WARN_UNKNOWN_CONTROL_SEQUENCE, true);
+
     if (!options_parse(argc, argv)) {
         return usage();
     }
@@ -356,6 +350,13 @@ int main(int argc, char **argv) {
     printf("optimization level = %i\n", (int)opts_O);
     printf("standard = %i\n", opts_standard);
 
+    if (!parser_init()) {
+        printf("failed to initialize parser\n");
+        goto cleanup;
+    }
+
+    util_debug("COM", "starting ...\n");
+
     if (items_elements) {
         printf("Mode: manual\n");
         printf("There are %lu items to compile:\n", (unsigned long)items_elements);
@@ -366,17 +367,23 @@ 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))
+                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;
 }