Merge branch 'master' into blub/bc3

diff --combined main.c
index 64d08709011f25b67ddb2ef9c11138cbcd4532c0,6b751e3e03e7048788167dbd2bf4764c65e8505d..bef80723632b9176167b9cf3d4ee939aecca124e
--- 1/main.c
--- 2/main.c
+++ b/main.c
@@@ -202,7 -202,7 +202,7 @@@ static bool options_parse(int argc, cha
                          }
                          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 +223,12 @@@
                          }
                          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,34 -308,10 +308,34 @@@
      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();
      }
@@@ -350,13 -326,6 +350,13 @@@
      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);
@@@ -367,23 -336,17 +367,23 @@@
                       (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;
  }