static void version() {
con_out("GMQCC %d.%d.%d Built %s %s\n",
- GMQCC_VERSION_MINOR,
GMQCC_VERSION_MAJOR,
+ GMQCC_VERSION_MINOR,
GMQCC_VERSION_PATCH,
__DATE__,
__TIME__
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(" -config file use the specified ini file\n");
con_out(" -std=standard select one of the following standards\n"
" -std=qcc original QuakeC\n"
" -std=fteqcc fteqcc QuakeC\n"
" -fhelp list possible flags\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");
+ " -Wall enable all warnings\n");
+ con_out(" -Werror treat warnings as errors\n"
+ " -Werror-<warning> treat a warning as error\n"
+ " -Wno-error-<warning> opposite of the above\n");
con_out(" -Whelp list possible warnings\n");
con_out(" -O<number> optimization level\n"
" -O<name> enable specific optimization\n"
bool argend = false;
size_t itr;
char buffer[1024];
- char *redirout = (char*)stdout;
- char *redirerr = (char*)stderr;
+ char *redirout = NULL;
+ char *redirerr = NULL;
+ char *config = NULL;
while (!argend && argc > 1) {
char *argarg;
con_change(redirout, redirerr);
continue;
}
+ if (options_long_gcc("config", &argc, &argv, &argarg)) {
+ config = argarg;
+ 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;
/* debug turns on -flno */
case 'g':
opts_setflag("LNO", true);
+ opts.g = true;
break;
case 'D':
}
exit(0);
}
- else if (!strcmp(argv[0]+2, "NO_ERROR")) {
- opts.werror = false;
+ else if (!strcmp(argv[0]+2, "NO_ERROR") ||
+ !strcmp(argv[0]+2, "NO_ERROR_ALL"))
+ {
+ for (itr = 0; itr < sizeof(opts.werror)/sizeof(opts.werror[0]); ++itr)
+ opts.werror[itr] = 0;
break;
}
- else if (!strcmp(argv[0]+2, "ERROR")) {
- opts.werror = true;
+ else if (!strcmp(argv[0]+2, "ERROR") ||
+ !strcmp(argv[0]+2, "ERROR_ALL"))
+ {
+ for (itr = 0; itr < sizeof(opts.werror)/sizeof(opts.werror[0]); ++itr)
+ opts.werror[itr] = 0xFFFFFFFFL;
break;
}
else if (!strcmp(argv[0]+2, "NONE")) {
opts.warn[itr] = 0xFFFFFFFFL;
break;
}
- if (!strncmp(argv[0]+2, "NO_", 3)) {
+ else if (!strncmp(argv[0]+2, "ERROR_", 6)) {
+ if (!opts_setwerror(argv[0]+8, true)) {
+ con_out("unknown warning: %s\n", argv[0]+2);
+ return false;
+ }
+ }
+ else if (!strncmp(argv[0]+2, "NO_ERROR_", 9)) {
+ if (!opts_setwerror(argv[0]+11, false)) {
+ con_out("unknown warning: %s\n", argv[0]+2);
+ return false;
+ }
+ }
+ else if (!strncmp(argv[0]+2, "NO_", 3)) {
if (!opts_setwarn(argv[0]+5, false)) {
con_out("unknown warning: %s\n", argv[0]+2);
return false;
vec_push(items, item);
}
}
+ opts_ini_init(config);
return true;
}
char *end;
line = *out;
- len = util_getline(&line, alen, src);
+ len = file_getline(&line, alen, src);
if (len == -1)
return false;
return usage();
}
+ 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);
+ }
+
/* the standard decides which set of operators to use */
if (opts.standard == COMPILER_GMQCC) {
operators = c_operators;
exit(1);
}
operators_free = true;
- newops = mem_a(sizeof(operators[0]) * operator_count);
+ newops = (oper_info*)mem_a(sizeof(operators[0]) * operator_count);
memcpy(newops, operators, sizeof(operators[0]) * operator_count);
memcpy(&newops[operator_count-2], &operators[operator_count-1], sizeof(newops[0]));
memcpy(&newops[operator_count-1], &operators[operator_count-2], sizeof(newops[0]));
if (opts.pp_only) {
if (opts_output_wasset) {
- outfile = util_fopen(opts.output, "wb");
+ outfile = file_open(opts.output, "wb");
if (!outfile) {
con_err("failed to open `%s` for writing\n", opts.output);
retval = 1;
goto cleanup;
}
}
- else
- outfile = stdout;
+ else {
+ outfile = con_default_out();
+ }
}
if (!opts.pp_only) {
}
}
+ if (OPTS_FLAG(TRUE_EMPTY_STRINGS))
+ type_not_instr[TYPE_STRING] = INSTR_NOT_F;
+
util_debug("COM", "starting ...\n");
/* add macros */
progs_src = true;
- src = util_fopen("progs.src", "rb");
+ src = file_open("progs.src", "rb");
if (!src) {
con_err("failed to open `progs.src` for reading\n");
retval = 1;
}
srcdone:
- fclose(src);
+ file_close(src);
mem_d(line);
}
}
out = ftepp_get();
if (out)
- fprintf(outfile, "%s", out);
+ file_printf(outfile, "%s", out);
ftepp_flush();
}
else {
}
data = ftepp_get();
if (vec_size(data)) {
- if (!parser_compile_string_len(items[itr].filename, data, vec_size(data))) {
+ if (!parser_compile_string(items[itr].filename, data, vec_size(data))) {
retval = 1;
goto cleanup;
}