X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=main.c;h=0d9fe04a9f8c043b845c2c1193c78d263f1a56a4;hb=3dbe54f0cd906a22024788ed29a8c5ab739f2434;hp=1301e7549b70da667312bf89e2e27f6acb0e5731;hpb=d1373af7fc9b4657b1fb663bf6ea03c73e9ab8c7;p=xonotic%2Fgmqcc.git diff --git a/main.c b/main.c index 1301e75..0d9fe04 100644 --- a/main.c +++ b/main.c @@ -1,6 +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 @@ -31,6 +32,7 @@ const char *opts_output = "progs.dat"; int opts_standard = COMPILER_GMQCC; bool opts_debug = false; bool opts_memchk = false; +bool opts_dumpfin = false; bool opts_dump = false; bool opts_werror = false; bool opts_forcecrc = false; @@ -202,6 +204,7 @@ static bool options_parse(int argc, char **argv) { 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")) { @@ -219,11 +222,38 @@ static bool options_parse(int argc, char **argv) { 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); continue; } + + /* show defaults (like pathscale) */ + if (!strcmp(argv[0]+1, "show-defaults")) { + size_t itr; + char buffer[1024]; + for (itr = 0; itr < COUNT_FLAGS; ++itr) { + if (!OPTS_FLAG(itr)) + continue; + + memset(buffer, 0, sizeof(buffer)); + util_strtononcmd(opts_flag_list[itr].name, buffer, strlen(opts_flag_list[itr].name) + 1); + + con_out("-f%s ", buffer); + } + for (itr = 0; itr < COUNT_WARNINGS; ++itr) { + if (!OPTS_WARN(itr)) + continue; + + memset(buffer, 0, sizeof(buffer)); + util_strtononcmd(opts_warn_list[itr].name, buffer, strlen(opts_warn_list[itr].name) + 1); + con_out("-W%s ", buffer); + } + con_out("\n"); + exit(0); + } if (!strcmp(argv[0]+1, "debug")) { opts_debug = true; @@ -233,6 +263,10 @@ static bool options_parse(int argc, char **argv) { opts_dump = true; continue; } + if (!strcmp(argv[0]+1, "dumpfin")) { + opts_dumpfin = true; + continue; + } if (!strcmp(argv[0]+1, "memchk")) { opts_memchk = true; continue; @@ -247,7 +281,7 @@ static bool options_parse(int argc, char **argv) { case 'h': usage(); exit(0); - break; + /* break; never reached because of exit(0) */ case 'E': opts_pp_only = true; @@ -256,7 +290,7 @@ static bool options_parse(int argc, char **argv) { /* handle all -fflags */ case 'f': util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1); - if (!strcmp(argv[0]+2, "HELP")) { + if (!strcmp(argv[0]+2, "HELP") || *(argv[0]+2) == '?') { con_out("Possible flags:\n"); for (itr = 0; itr < COUNT_FLAGS; ++itr) { util_strtononcmd(opts_flag_list[itr].name, buffer, sizeof(buffer)); @@ -277,7 +311,7 @@ static bool options_parse(int argc, char **argv) { break; case 'W': util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1); - if (!strcmp(argv[0]+2, "HELP")) { + if (!strcmp(argv[0]+2, "HELP") || *(argv[0]+2) == '?') { con_out("Possible warnings:\n"); for (itr = 0; itr < COUNT_WARNINGS; ++itr) { util_strtononcmd(opts_warn_list[itr].name, buffer, sizeof(buffer)); @@ -375,13 +409,11 @@ static bool options_parse(int argc, char **argv) { else { /* it's a QC filename */ - argitem item; item.filename = argv[0]; item.type = TYPE_QC; vec_push(items, item); } } - con_change(redirout, redirerr); return true; } @@ -416,6 +448,7 @@ int main(int argc, char **argv) { int retval = 0; bool opts_output_free = false; bool progs_src = false; + FILE *outfile = NULL; app_name = argv[0]; con_init(); @@ -438,8 +471,10 @@ int main(int argc, char **argv) { 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_warn, WARN_DOUBLE_DECLARATION, true); options_set(opts_flags, ADJUST_VECTOR_FIELDS, true); + options_set(opts_flags, FTEPP, false); if (!options_parse(argc, argv)) { return usage(); @@ -449,6 +484,9 @@ int main(int argc, char **argv) { if (opts_standard == COMPILER_GMQCC) { operators = c_operators; operator_count = c_operator_count; + } else if (opts_standard == COMPILER_FTEQCC) { + operators = fte_operators; + operator_count = fte_operator_count; } else { operators = qcc_operators; operator_count = qcc_operator_count; @@ -466,6 +504,19 @@ int main(int argc, char **argv) { con_out("standard = %i\n", opts_standard); } + 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 (!opts_pp_only) { if (!parser_init()) { con_err("failed to initialize parser\n"); @@ -473,17 +524,8 @@ int main(int argc, char **argv) { goto cleanup; } } - if (opts_pp_only || opts_standard == COMPILER_FTEQCC) { - FILE *out = NULL; - if (opts_output_wasset) { - out = util_fopen(opts_output, "wb"); - if (!out) { - con_err("failed to open `%s` for writing\n", opts_output); - retval = 1; - goto cleanup; - } - } - if (!ftepp_init(out)) { + if (opts_pp_only || OPTS_FLAG(FTEPP)) { + if (!ftepp_init()) { con_err("failed to initialize parser\n"); retval = 1; goto cleanup; @@ -551,14 +593,36 @@ srcdone: } if (opts_pp_only) { + const char *out; if (!ftepp_preprocess_file(items[itr].filename)) { retval = 1; goto cleanup; } + out = ftepp_get(); + if (out) + fprintf(outfile, "%s", out); + ftepp_flush(); } - else if (!parser_compile_file(items[itr].filename)) { - retval = 1; - goto cleanup; + 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) { @@ -584,7 +648,8 @@ cleanup: con_close(); vec_free(items); - parser_cleanup(); + if (!opts_pp_only) + parser_cleanup(); if (opts_output_free) mem_d((char*)opts_output);