X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=main.c;h=3f6f6ef29318a6df614fa1eb25d24864c5a2118a;hp=652ee616c9e3d0faa6e0d2877ab46cd268d81789;hb=724bca0eeca05a68900e3054e118904b6618dc7c;hpb=2a7933973507dfe5d4625ca9ec7eff2aea91cf26 diff --git a/main.c b/main.c index 652ee61..3f6f6ef 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012, 2013 + * Copyright (C) 2012, 2013, 2014, 2015 * Dale Weiler * Wolfgang Bumiller * @@ -21,8 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include -#include #include #include @@ -87,6 +85,8 @@ static int usage(void) { " -Ono- disable specific optimization\n" " -Ohelp list optimizations\n"); con_out(" -force-crc=num force a specific checksum into the header\n"); + con_out(" -state-fps=num emulate OP_STATE with the specified FPS\n"); + con_out(" -coverage add coverage support\n"); return -1; } @@ -165,6 +165,9 @@ static bool options_parse(int argc, char **argv) { opts_set(opts.flags, ADJUST_VECTOR_FIELDS, true); opts_set(opts.flags, CORRECT_LOGIC, true); + opts_set(opts.flags, SHORT_LOGIC, true); + opts_set(opts.flags, UNTYPED_NIL, true); + opts_set(opts.flags, VARIADIC_ARGS, true); opts_set(opts.flags, FALSE_EMPTY_STRINGS, false); opts_set(opts.flags, TRUE_EMPTY_STRINGS, true); opts_set(opts.flags, LOOP_LABELS, true); @@ -176,6 +179,7 @@ static bool options_parse(int argc, char **argv) { opts_set(opts.warn, WARN_BREAKDEF, true); + OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_GMQCC; } else if (!strcmp(argarg, "qcc")) { @@ -214,12 +218,9 @@ static bool options_parse(int argc, char **argv) { OPTS_OPTION_U16 (OPTION_FORCED_CRC) = strtol(argarg, NULL, 0); continue; } - if (options_long_gcc("redirout", &argc, &argv, &redirout)) { - con_change(redirout, redirerr); - continue; - } - if (options_long_gcc("redirerr", &argc, &argv, &redirerr)) { - con_change(redirout, redirerr); + if (options_long_gcc("state-fps", &argc, &argv, &argarg)) { + OPTS_OPTION_U32(OPTION_STATE_FPS) = strtol(argarg, NULL, 0); + opts_set(opts.flags, EMULATE_STATE, true); continue; } if (options_long_gcc("config", &argc, &argv, &argarg)) { @@ -230,6 +231,10 @@ static bool options_parse(int argc, char **argv) { OPTS_OPTION_U16(OPTION_MEMDUMPCOLS) = (uint16_t)strtol(memdumpcols, NULL, 10); continue; } + if (options_long_gcc("progsrc", &argc, &argv, &argarg)) { + OPTS_OPTION_STR(OPTION_PROGSRC) = argarg; + continue; + } /* show defaults (like pathscale) */ if (!strcmp(argv[0]+1, "show-defaults")) { @@ -274,6 +279,10 @@ static bool options_parse(int argc, char **argv) { con_color(0); continue; } + if (!strcmp(argv[0]+1, "coverage")) { + OPTS_OPTION_BOOL(OPTION_COVERAGE) = true; + continue; + } switch (argv[0][1]) { /* -h, show usage but exit with 0 */ @@ -481,14 +490,6 @@ static bool options_parse(int argc, char **argv) { OPTS_OPTION_BOOL(OPTION_QUIET) = true; break; } - else if (!strcmp(argv[0]+2, "correct")) { - OPTS_OPTION_BOOL(OPTION_CORRECTION) = true; - break; - } - else if (!strcmp(argv[0]+2, "no-correct")) { - OPTS_OPTION_BOOL(OPTION_CORRECTION) = false; - break; - } else if (!strcmp(argv[0]+2, "add-info")) { OPTS_OPTION_BOOL(OPTION_ADD_INFO) = true; break; @@ -523,14 +524,14 @@ static bool options_parse(int argc, char **argv) { } /* returns the line number, or -1 on error */ -static bool progs_nextline(char **out, size_t *alen,FILE *src) { +static bool progs_nextline(char **out, size_t *alen, FILE *src) { int len; char *line; char *start; char *end; line = *out; - len = fs_file_getline(&line, alen, src); + len = util_getline(&line, alen, src); if (len == -1) return false; @@ -551,10 +552,9 @@ static bool progs_nextline(char **out, size_t *alen,FILE *src) { int main(int argc, char **argv) { size_t itr; int retval = 0; - bool opts_output_free = false; bool operators_free = false; bool progs_src = false; - FILE *outfile = NULL; + FILE *outfile = NULL; struct parser_s *parser = NULL; struct ftepp_s *ftepp = NULL; @@ -618,7 +618,7 @@ int main(int argc, char **argv) { if (OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { if (opts_output_wasset) { - outfile = fs_file_open(OPTS_OPTION_STR(OPTION_OUTPUT), "wb"); + outfile = fopen(OPTS_OPTION_STR(OPTION_OUTPUT), "wb"); if (!outfile) { con_err("failed to open `%s` for writing\n", OPTS_OPTION_STR(OPTION_OUTPUT)); retval = 1; @@ -646,8 +646,6 @@ int main(int argc, char **argv) { } } - util_debug("COM", "starting ...\n"); - /* add macros */ if (OPTS_OPTION_BOOL(OPTION_PP_ONLY) || OPTS_FLAG(FTEPP)) { for (itr = 0; itr < vec_size(ppems); itr++) { @@ -661,16 +659,16 @@ int main(int argc, char **argv) { } if (!vec_size(items)) { - FILE *src; - char *line = NULL; - size_t linelen = 0; - bool hasline = false; + FILE *src; + char *line = NULL; + size_t linelen = 0; + bool hasline = false; progs_src = true; - src = fs_file_open("progs.src", "rb"); + src = fopen(OPTS_OPTION_STR(OPTION_PROGSRC), "rb"); if (!src) { - con_err("failed to open `progs.src` for reading\n"); + con_err("failed to open `%s` for reading\n", OPTS_OPTION_STR(OPTION_PROGSRC)); retval = 1; goto cleanup; } @@ -686,13 +684,12 @@ int main(int argc, char **argv) { item.type = TYPE_QC; vec_push(items, item); } else if (!opts_output_wasset) { - OPTS_OPTION_STR(OPTION_OUTPUT) = util_strdup(line); - opts_output_free = true; + OPTS_OPTION_DUP(OPTION_OUTPUT) = util_strdup(line); hasline = true; } } - fs_file_close(src); + fclose(src); mem_d(line); } @@ -724,7 +721,7 @@ int main(int argc, char **argv) { } out = ftepp_get(ftepp); if (out) - fs_file_printf(outfile, "%s", out); + fprintf(outfile, "%s", out); ftepp_flush(ftepp); } else { @@ -768,7 +765,6 @@ int main(int argc, char **argv) { } cleanup: - util_debug("COM", "cleaning ...\n"); if (ftepp) ftepp_finish(ftepp); con_close(); @@ -777,13 +773,18 @@ cleanup: if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) if(parser) parser_cleanup(parser); - if (opts_output_free) - mem_d(OPTS_OPTION_STR(OPTION_OUTPUT)); + + /* free allocated option strings */ + for (itr = 0; itr < OPTION_COUNT; itr++) + if (OPTS_OPTION_DUPED(itr)) + mem_d(OPTS_OPTION_STR(itr)); + if (operators_free) mem_d((void*)operators); lex_cleanup(); - stat_info(); + if (!retval && compile_errors) + retval = 1; return retval; }