Merge branch 'master' into test-suite

Conflicts:
	Makefile
	ir.c

diff --combined Makefile
index 89168d76aa7fa5c8142e3924794d421bb11a46fd,ad8c9411c7467b647c7e3ad2cb14de64bf07e0ff..aa5ef11f11b60b2f9955c596c60b522e78c4dde4
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -23,18 -23,17 +23,19 @@@ ifeq ($(track), no
      CFLAGS += -DNOTRACK
  endif
  
 -OBJ     = \
 +OBJ     =             \
            util.o      \
            code.o      \
            ast.o       \
            ir.o        \
-           con.o
-           
+           con.o       \
+           ftepp.o
++
 +OBJ_T = test.o util.o con.o
  OBJ_C = main.o lexer.o parser.o
  OBJ_X = exec-standalone.o util.o con.o
  
 -#default is compiler only
 +
  default: gmqcc
  %.o: %.c
        $(CC) -c $< -o $@ $(CFLAGS)
@@@ -42,23 -41,17 +43,23 @@@
  exec-standalone.o: exec.c
        $(CC) -c $< -o $@ $(CFLAGS) -DQCVM_EXECUTOR=1
  
 -qcvm:     $(OBJ_X)
 +qcvm: $(OBJ_X)
        $(CC) -o $@ $^ $(CFLAGS) -lm
  
 -# compiler target
  gmqcc: $(OBJ_C) $(OBJ)
        $(CC) -o $@ $^ $(CFLAGS)
  
 -all: gmqcc qcvm
 +test: $(OBJ_T)
 +      $(CC) -o $@ $^ $(CFLAGS)
 +      
 +runtests:
 +      ./test
 +
 +all: gmqcc qcvm test
  
  clean:
 -      rm -f *.o gmqcc qcvm
 +      rm -f *.o gmqcc qcvm test *.dat
 +
  
  $(OBJ) $(OBJ_C) $(OBJ_X): gmqcc.h
  main.o: lexer.h

diff --combined gmqcc.h
index 51369030d09e17d61228b85013a6a63664d9b0c4,1ea2ceff8bb472286c8bc3982d1f785fdb4dcc9e..265bee56d1dc28e2acb7c742cc12513429ae57a0
--- 1/gmqcc.h
--- 2/gmqcc.h
+++ b/gmqcc.h
@@@ -196,7 -196,6 +196,7 @@@ void  util_memory_d      (void       *
  void *util_memory_r      (void       *, size_t,       unsigned int, const char *);
  void  util_meminfo       ();
  
 +bool  util_filexists     (const char *);
  bool  util_strupper      (const char *);
  bool  util_strdigit      (const char *);
  bool  util_strncmpexact  (const char *, const char *, size_t);
@@@ -752,6 -751,18 +752,18 @@@ bool parser_compile_file  (const char *
  bool parser_compile_string(const char *name, const char *str);
  bool parser_finish        (const char *output);
  void parser_cleanup       ();
+ /* There's really no need to strlen() preprocessed files */
+ bool parser_compile_string_len(const char *name, const char *str, size_t len);
+ 
+ /*===================================================================*/
+ /*====================== ftepp.c commandline ========================*/
+ /*===================================================================*/
+ bool ftepp_init             ();
+ bool ftepp_preprocess_file  (const char *filename);
+ bool ftepp_preprocess_string(const char *name, const char *str);
+ void ftepp_finish           ();
+ const char *ftepp_get       ();
+ void ftepp_flush            ();
  
  /*===================================================================*/
  /*======================= main.c commandline ========================*/

diff --combined main.c
index b483db9880d1dd4b4de6a19f2515e5aee3c6f4af,990acf2c1b51565ba2fe1fe3a9deb8edceb23e2b..4c8062d7dcdb1b125101c77348c26952c9ac592c
--- 1/main.c
--- 2/main.c
+++ b/main.c
@@@ -1,6 -1,7 +1,7 @@@
  /*
   * Copyright (C) 2012
   *     Dale Weiler
+  *     Wolfgang Bumiller
   *
   * Permission is hereby granted, free of charge, to any person obtaining a copy of
   * this software and associated documentation files (the "Software"), to deal in
@@@ -57,28 -58,28 +58,28 @@@ static const char *app_name
  static int usage() {
      con_out("usage: %s [options] [files...]", app_name);
      con_out("options:\n"
-            "  -h, --help             show this help message\n"
-            "  -debug                 turns on compiler debug messages\n"
-            "  -memchk                turns on compiler memory leak check\n");
+             "  -h, --help             show this help message\n"
+             "  -debug                 turns on compiler debug messages\n"
+             "  -memchk                turns on compiler memory leak check\n");
      con_out("  -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");
+             "  -a filename            add an asm file to be assembled\n"
+             "  -s filename            add a progs.src file to be used\n");
      con_out("  -E                     stop after preprocessing\n");
      con_out("  -f<flag>               enable a flag\n"
-            "  -fno-<flag>            disable a flag\n"
-            "  -std standard          select one of the following standards\n"
-            "       -std=qcc          original QuakeC\n"
-            "       -std=fteqcc       fteqcc QuakeC\n"
-            "       -std=gmqcc        this compiler (default)\n");
+             "  -fno-<flag>            disable a flag\n"
+             "  -std standard          select one of the following standards\n"
+             "       -std=qcc          original QuakeC\n"
+             "       -std=fteqcc       fteqcc QuakeC\n"
+             "       -std=gmqcc        this compiler (default)\n");
      con_out("  -W<warning>            enable a warning\n"
-            "  -Wno-<warning>         disable a warning\n"
-            "  -Wall                  enable all warnings\n"
-            "  -Werror                treat warnings as errors\n");
+             "  -Wno-<warning>         disable a warning\n"
+             "  -Wall                  enable all warnings\n"
+             "  -Werror                treat warnings as errors\n");
      con_out("  -force-crc=num         force a specific checksum into the header\n");
      con_out("\n");
      con_out("flags:\n"
-            "  -fadjust-vector-fields\n"
-            "            when assigning a vector field, its _y and _z fields also get assigned\n"
+             "  -fadjust-vector-fields\n"
+             "            when assigning a vector field, its _y and _z fields also get assigned\n"
             );
      return -1;
  }
@@@ -202,6 -203,7 +203,7 @@@ static bool options_parse(int argc, cha
                      options_set(opts_flags, ADJUST_VECTOR_FIELDS, false);
                      opts_standard = COMPILER_QCC;
                  } else if (!strcmp(argarg, "fte") || !strcmp(argarg, "fteqcc")) {
+                     options_set(opts_flags, FTEPP,                true);
                      options_set(opts_flags, ADJUST_VECTOR_FIELDS, false);
                      opts_standard = COMPILER_FTEQCC;
                  } else if (!strcmp(argarg, "qccx")) {
@@@ -224,8 -226,6 +226,8 @@@
              if (options_long_gcc("redirerr", &argc, &argv, &redirerr)) {
                  continue;
              }
 +            
 +            con_change(redirout, redirerr);
  
              if (!strcmp(argv[0]+1, "debug")) {
                  opts_debug = true;
@@@ -383,6 -383,7 +385,6 @@@
              vec_push(items, item);
          }
      }
 -    con_change(redirout, redirerr);
      return true;
  }
  
@@@ -416,6 -417,8 +418,8 @@@ int main(int argc, char **argv) 
      size_t itr;
      int retval = 0;
      bool opts_output_free = false;
+     bool progs_src = false;
+     FILE *outfile = NULL;
  
      app_name = argv[0];
      con_init();
@@@ -436,8 -439,11 +440,11 @@@
      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_warn, WARN_PREPROCESSOR, true);
+     options_set(opts_warn, WARN_MULTIFILE_IF, true);
  
      options_set(opts_flags, ADJUST_VECTOR_FIELDS, true);
+     options_set(opts_flags, FTEPP, false);
  
      if (!options_parse(argc, argv)) {
          return usage();
@@@ -464,53 -470,53 +471,53 @@@
          con_out("standard = %i\n", opts_standard);
      }
  
-     if (!parser_init()) {
-         con_out("failed to initialize parser\n");
-         retval = 1;
-         goto cleanup;
-     }
- 
-     util_debug("COM", "starting ...\n");
- 
-     if (vec_size(items)) {
-         con_out("Mode: manual\n");
-         con_out("There are %lu items to compile:\n", (unsigned long)vec_size(items));
-         for (itr = 0; itr < vec_size(items); ++itr) {
-             con_out("  item: %s (%s)\n",
-                    items[itr].filename,
-                    ( (items[itr].type == TYPE_QC ? "qc" :
-                      (items[itr].type == TYPE_ASM ? "asm" :
-                      (items[itr].type == TYPE_SRC ? "progs.src" :
-                      ("unknown"))))));
- 
-             if (!parser_compile_file(items[itr].filename))
-             {
-                     retval = 1;
-                     goto cleanup;
+     if (opts_pp_only) {
+         if (opts_output_wasset) {
+             outfile = util_fopen(opts_output, "wb");
+             if (!outfile) {
+                 con_err("failed to open `%s` for writing\n", opts_output);
+                 retval = 1;
+                 goto cleanup;
              }
          }
+         else
+             outfile = stdout;
+     }
  
-         if (!parser_finish(opts_output)) {
+     if (!opts_pp_only) {
+         if (!parser_init()) {
+             con_err("failed to initialize parser\n");
              retval = 1;
              goto cleanup;
          }
+     }
+     if (opts_pp_only || OPTS_FLAG(FTEPP)) {
+         if (!ftepp_init()) {
+             con_err("failed to initialize parser\n");
+             retval = 1;
+             goto cleanup;
+         }
+     }
  
-     } else {
+     util_debug("COM", "starting ...\n");
+ 
+     if (!vec_size(items)) {
          FILE *src;
          char *line;
          size_t linelen = 0;
  
-         con_out("Mode: progs.src\n");
+         progs_src = true;
+ 
          src = util_fopen("progs.src", "rb");
          if (!src) {
-             con_out("failed to open `progs.src` for reading\n");
+             con_err("failed to open `progs.src` for reading\n");
              retval = 1;
              goto cleanup;
          }
  
          line = NULL;
          if (!progs_nextline(&line, &linelen, src) || !line[0]) {
-             con_out("illformatted progs.src file: expected output filename in first line\n");
+             con_err("illformatted progs.src file: expected output filename in first line\n");
              retval = 1;
              goto srcdone;
          }
@@@ -521,30 -527,92 +528,92 @@@
          }
  
          while (progs_nextline(&line, &linelen, src)) {
+             argitem item;
              if (!line[0] || (line[0] == '/' && line[1] == '/'))
                  continue;
-             con_out("  src: %s\n", line);
-             if (!parser_compile_file(line)) {
-                 retval = 1;
-                 goto srcdone;
-             }
+             item.filename = util_strdup(line);
+             item.type     = TYPE_QC;
+             vec_push(items, item);
          }
  
-         parser_finish(opts_output);
- 
  srcdone:
          fclose(src);
          mem_d(line);
      }
  
+     if (retval)
+         goto cleanup;
+ 
+     if (vec_size(items)) {
+         if (!opts_pp_only) {
+             con_out("Mode: %s\n", (progs_src ? "progs.src" : "manual"));
+             con_out("There are %lu items to compile:\n", (unsigned long)vec_size(items));
+         }
+         for (itr = 0; itr < vec_size(items); ++itr) {
+             if (!opts_pp_only) {
+                 con_out("  item: %s (%s)\n",
+                        items[itr].filename,
+                        ( (items[itr].type == TYPE_QC ? "qc" :
+                          (items[itr].type == TYPE_ASM ? "asm" :
+                          (items[itr].type == TYPE_SRC ? "progs.src" :
+                          ("unknown"))))));
+             }
+ 
+             if (opts_pp_only) {
+                 if (!ftepp_preprocess_file(items[itr].filename)) {
+                     retval = 1;
+                     goto cleanup;
+                 }
+                 fprintf(outfile, "%s", ftepp_get());
+                 ftepp_flush();
+             }
+             else {
+                 if (OPTS_FLAG(FTEPP)) {
+                     const char *data;
+                     if (!ftepp_preprocess_file(items[itr].filename)) {
+                         retval = 1;
+                         goto cleanup;
+                     }
+                     data = ftepp_get();
+                     if (!parser_compile_string_len(items[itr].filename, data, vec_size(data)-1)) {
+                         retval = 1;
+                         goto cleanup;
+                     }
+                     ftepp_flush();
+                 }
+                 else {
+                     if (!parser_compile_file(items[itr].filename)) {
+                         retval = 1;
+                         goto cleanup;
+                     }
+                 }
+             }
+ 
+             if (progs_src) {
+                 mem_d(items[itr].filename);
+                 items[itr].filename = NULL;
+             }
+         }
+ 
+         ftepp_finish();
+         if (!opts_pp_only) {
+             if (!parser_finish(opts_output)) {
+                 retval = 1;
+                 goto cleanup;
+             }
+         }
+     }
+ 
      /* stuff */
  
  cleanup:
      util_debug("COM", "cleaning ...\n");
+     ftepp_finish();
      con_close();
      vec_free(items);
  
-     parser_cleanup();
+     if (!opts_pp_only)
+         parser_cleanup();
      if (opts_output_free)
          mem_d((char*)opts_output);