X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=main.c;h=2b055d2210f35bf59d556053f366e27c7c12e3d8;hb=f3c5c40104d4757b0b4344a96a4916035a1ba103;hp=a52e70449c4a038aa4dc372f19b1dd2fc13451b5;hpb=fa155f8a42a95111099b8c97a6617cb81317ea6c;p=xonotic%2Fgmqcc.git diff --git a/main.c b/main.c index a52e704..2b055d2 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 + * Copyright (C) 2012, 2013 * Dale Weiler * Wolfgang Bumiller * @@ -51,6 +51,11 @@ static void version() { __DATE__, __TIME__ ); +#ifdef GMQCC_GITINFO + con_out("git build: %s\n", GMQCC_GITINFO); +#elif defined(GMQCC_VERION_TYPE_DEVEL) + con_out("development build\n"); +#endif } static int usage() { @@ -62,6 +67,7 @@ static int usage() { con_out(" -o, --output=file output file, defaults to progs.dat\n" " -s filename add a progs.src file to be used\n"); con_out(" -E stop after preprocessing\n"); + con_out(" -q, --quiet be less verbose\n"); con_out(" -config file use the specified ini file\n"); con_out(" -std=standard select one of the following standards\n" " -std=qcc original QuakeC\n" @@ -157,7 +163,15 @@ static bool options_parse(int argc, char **argv) { if (options_long_gcc("std", &argc, &argv, &argarg)) { if (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default")) { - opts_set(opts.flags, ADJUST_VECTOR_FIELDS, true); + opts_set(opts.flags, ADJUST_VECTOR_FIELDS, true); + opts_set(opts.flags, CORRECT_LOGIC, true); + opts_set(opts.flags, FALSE_EMPTY_STRINGS, false); + opts_set(opts.flags, TRUE_EMPTY_STRINGS, true); + opts_set(opts.flags, LOOP_LABELS, true); + opts_set(opts.flags, TRANSLATABLE_STRINGS, true); + opts_set(opts.flags, INITIALIZED_NONCONSTANTS, true); + opts_set(opts.werror, WARN_INVALID_PARAMETER_COUNT, true); + opts_set(opts.werror, WARN_MISSING_RETURN_VALUES, true); opts.standard = COMPILER_GMQCC; } else if (!strcmp(argarg, "qcc")) { @@ -172,8 +186,8 @@ static bool options_parse(int argc, char **argv) { opts_set(opts.flags, TRANSLATABLE_STRINGS, true); opts_set(opts.flags, ADJUST_VECTOR_FIELDS, false); opts_set(opts.flags, ASSIGN_FUNCTION_TYPES, true); - opts_set(opts.warn, WARN_TERNARY_PRECEDENCE, true); opts_set(opts.flags, CORRECT_TERNARY, false); + opts_set(opts.warn, WARN_TERNARY_PRECEDENCE, true); opts.standard = COMPILER_FTEQCC; } else if (!strcmp(argarg, "qccx")) { @@ -271,6 +285,10 @@ static bool options_parse(int argc, char **argv) { opts.g = true; break; + case 'q': + opts.quiet = true; + break; + case 'D': if (!strlen(argv[0]+2)) { con_err("expected name after -D\n"); @@ -330,8 +348,10 @@ static bool options_parse(int argc, char **argv) { else if (!strcmp(argv[0]+2, "ERROR") || !strcmp(argv[0]+2, "ERROR_ALL")) { + opts_backup_non_Werror_all(); for (itr = 0; itr < sizeof(opts.werror)/sizeof(opts.werror[0]); ++itr) opts.werror[itr] = 0xFFFFFFFFL; + opts_restore_non_Werror_all(); break; } else if (!strcmp(argv[0]+2, "NONE")) { @@ -340,8 +360,10 @@ static bool options_parse(int argc, char **argv) { break; } else if (!strcmp(argv[0]+2, "ALL")) { + opts_backup_non_Wall(); for (itr = 0; itr < sizeof(opts.warn)/sizeof(opts.warn[0]); ++itr) opts.warn[itr] = 0xFFFFFFFFL; + opts_restore_non_Wall(); break; } else if (!strncmp(argv[0]+2, "ERROR_", 6)) { @@ -439,6 +461,22 @@ static bool options_parse(int argc, char **argv) { version(); exit(0); } + else if (!strcmp(argv[0]+2, "quiet")) { + opts.quiet = true; + break; + } + else if (!strcmp(argv[0]+2, "correct")) { + opts.correction = true; + break; + } + else if (!strcmp(argv[0]+2, "no-correct")) { + opts.correction = false; + break; + } + else if (!strcmp(argv[0]+2, "add-info")) { + opts.add_info = true; + break; + } else { /* All long options with arguments */ if (options_long_witharg("output", &argc, &argv, &argarg)) { @@ -514,7 +552,7 @@ int main(int argc, char **argv) { if (OPTS_FLAG(TRUE_EMPTY_STRINGS) && OPTS_FLAG(FALSE_EMPTY_STRINGS)) { con_err("-ftrue-empty-strings and -ffalse-empty-strings are mutually exclusive"); - exit(1); + exit(EXIT_FAILURE); } /* the standard decides which set of operators to use */ @@ -537,7 +575,7 @@ int main(int argc, char **argv) { operators[operator_count-1].id != opid2(':','?')) { con_err("internal error: operator precedence table wasn't updated correctly!\n"); - exit(1); + exit(EXIT_FAILURE); } operators_free = true; newops = (oper_info*)mem_a(sizeof(operators[0]) * operator_count); @@ -554,7 +592,7 @@ int main(int argc, char **argv) { con_out("Flag %s = %i\n", opts_flag_list[itr].name, OPTS_FLAG(itr)); for (itr = 0; itr < COUNT_WARNINGS; ++itr) con_out("Warning %s = %i\n", opts_warn_list[itr].name, OPTS_WARN(itr)); - + con_out("output = %s\n", opts.output); con_out("optimization level = %d\n", opts.O); con_out("standard = %i\n", opts.standard); @@ -651,12 +689,12 @@ srcdone: goto cleanup; if (vec_size(items)) { - if (!opts.pp_only) { + if (!opts.quiet && !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) { + if (!opts.quiet && !opts.pp_only) { con_out(" item: %s (%s)\n", items[itr].filename, ( (items[itr].type == TYPE_QC ? "qc" : @@ -716,7 +754,7 @@ srcdone: } /* stuff */ - if (!opts.pp_only) { + if (!opts.quiet && !opts.pp_only) { for (itr = 0; itr < COUNT_OPTIMIZATIONS; ++itr) { if (opts_optimizationcount[itr]) { con_out("%s: %u\n", opts_opt_list[itr].name, (unsigned int)opts_optimizationcount[itr]);