/*
- * Copyright (C) 2012
+ * Copyright (C) 2012, 2013
* Dale Weiler
* Wolfgang Bumiller
*
*/
#include "gmqcc.h"
#include "lexer.h"
+#include <time.h>
-/* counter increased in ir.c */
-unsigned int optimization_count[COUNT_OPTIMIZATIONS];
-static bool opts_output_wasset = false;
-
-cmd_options opts;
+/* TODO: cleanup this whole file .. it's a fuckign mess */
/* set by the standard */
const oper_info *operators = NULL;
size_t operator_count = 0;
+static bool opts_output_wasset = false;
-typedef struct { char *filename; int type; } argitem;
+typedef struct { char *filename; int type; } argitem;
+typedef struct { char *name; char *value; } ppitem;
static argitem *items = NULL;
+static ppitem *ppems = NULL;
#define TYPE_QC 0
#define TYPE_ASM 1
static const char *app_name;
+static void version() {
+ con_out("GMQCC %d.%d.%d Built %s %s\n" GMQCC_DEV_VERSION_STRING,
+ GMQCC_VERSION_MAJOR,
+ GMQCC_VERSION_MINOR,
+ GMQCC_VERSION_PATCH,
+ __DATE__,
+ __TIME__
+ );
+}
+
static int usage() {
con_out("usage: %s [options] [files...]", app_name);
con_out("options:\n"
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"
" -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"
return -1;
}
-static bool options_setflag_all(const char *name, bool on, uint32_t *flags, const opts_flag_def *list, size_t listsize) {
- size_t i;
-
- for (i = 0; i < listsize; ++i) {
- if (!strcmp(name, list[i].name)) {
- longbit lb = list[i].bit;
-#if 0
- if (on)
- flags[lb.idx] |= (1<<(lb.bit));
- else
- flags[lb.idx] &= ~(1<<(lb.bit));
-#else
- if (on)
- flags[0] |= (1<<lb);
- else
- flags[0] &= ~(1<<(lb));
-#endif
- return true;
- }
- }
- return false;
-}
-static bool options_setflag(const char *name, bool on) {
- return options_setflag_all(name, on, opts.flags, opts_flag_list, COUNT_FLAGS);
-}
-static bool options_setwarn(const char *name, bool on) {
- return options_setflag_all(name, on, opts.warn, opts_warn_list, COUNT_WARNINGS);
-}
-static bool options_setoptim(const char *name, bool on) {
- return options_setflag_all(name, on, opts.optimization, opts_opt_list, COUNT_OPTIMIZATIONS);
-}
-
+/* command line parsing */
static bool options_witharg(int *argc_, char ***argv_, char **out) {
int argc = *argc_;
char **argv = *argv_;
return options_long_witharg_all(optname, argc_, argv_, out, 1, false);
}
-void options_set(uint32_t *flags, size_t idx, bool on)
-{
- longbit lb = LONGBIT(idx);
-#if 0
- if (on)
- flags[lb.idx] |= (1<<(lb.bit));
- else
- flags[lb.idx] &= ~(1<<(lb.bit));
-#else
- if (on)
- flags[0] |= (1<<(lb));
- else
- flags[0] &= ~(1<<(lb));
-#endif
-}
-
-static void set_optimizations(unsigned int level)
-{
- size_t i;
- for (i = 0; i < COUNT_OPTIMIZATIONS; ++i)
- options_set(opts.optimization, i, level >= opts_opt_oflag[i]);
-}
-
static bool options_parse(int argc, char **argv) {
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;
+ char *memdumpcols = NULL;
while (!argend && argc > 1) {
char *argarg;
argitem item;
+ ppitem macro;
++argv;
--argc;
if (argv[0][0] == '-') {
- /* All gcc-type long options */
+ /* All gcc-type long options */
if (options_long_gcc("std", &argc, &argv, &argarg)) {
- if (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default")) {
- options_set(opts.flags, ADJUST_VECTOR_FIELDS, true);
- opts.standard = COMPILER_GMQCC;
+ if (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default")) {
+
+ 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_set(opts.flags, EXPRESSIONS_FOR_BUILTINS, true);
+
+
+ OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_GMQCC;
+
} else if (!strcmp(argarg, "qcc")) {
- options_set(opts.flags, ADJUST_VECTOR_FIELDS, false);
- options_set(opts.flags, ASSIGN_FUNCTION_TYPES, true);
- opts.standard = COMPILER_QCC;
+
+ opts_set(opts.flags, ADJUST_VECTOR_FIELDS, false);
+ opts_set(opts.flags, ASSIGN_FUNCTION_TYPES, true);
+
+ OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_QCC;
+
} else if (!strcmp(argarg, "fte") || !strcmp(argarg, "fteqcc")) {
- options_set(opts.flags, FTEPP, true);
- options_set(opts.flags, TRANSLATABLE_STRINGS, true);
- options_set(opts.flags, ADJUST_VECTOR_FIELDS, false);
- options_set(opts.flags, ASSIGN_FUNCTION_TYPES, true);
- options_set(opts.warn, WARN_TERNARY_PRECEDENCE, true);
- options_set(opts.flags, CORRECT_TERNARY, false);
- opts.standard = COMPILER_FTEQCC;
+
+ opts_set(opts.flags, FTEPP, true);
+ 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.flags, CORRECT_TERNARY, false);
+ opts_set(opts.warn, WARN_TERNARY_PRECEDENCE, true);
+
+ OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_FTEQCC;
+
} else if (!strcmp(argarg, "qccx")) {
- options_set(opts.flags, ADJUST_VECTOR_FIELDS, false);
- opts.standard = COMPILER_QCCX;
+
+ opts_set(opts.flags, ADJUST_VECTOR_FIELDS, false);
+ OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_QCCX;
+
} else {
con_out("Unknown standard: %s\n", argarg);
return false;
continue;
}
if (options_long_gcc("force-crc", &argc, &argv, &argarg)) {
- opts.forcecrc = true;
- opts.forced_crc = strtol(argarg, NULL, 0);
+
+ OPTS_OPTION_BOOL(OPTION_FORCECRC) = true;
+ 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("config", &argc, &argv, &argarg)) {
+ config = argarg;
+ continue;
+ }
+ if (options_long_gcc("memdumpcols", &argc, &argv, &memdumpcols)) {
+ OPTS_OPTION_U16(OPTION_MEMDUMPCOLS) = (uint16_t)strtol(memdumpcols, NULL, 10);
+ 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;
}
if (!strcmp(argv[0]+1, "debug")) {
- opts.debug = true;
+ OPTS_OPTION_BOOL(OPTION_DEBUG) = true;
continue;
}
if (!strcmp(argv[0]+1, "dump")) {
- opts.dump = true;
+ OPTS_OPTION_BOOL(OPTION_DUMP) = true;
continue;
}
if (!strcmp(argv[0]+1, "dumpfin")) {
- opts.dumpfin = true;
+ OPTS_OPTION_BOOL(OPTION_DUMPFIN) = true;
continue;
}
if (!strcmp(argv[0]+1, "memchk")) {
- opts.memchk = true;
+ OPTS_OPTION_BOOL(OPTION_MEMCHK) = true;
continue;
}
if (!strcmp(argv[0]+1, "nocolor")) {
exit(0);
/* break; never reached because of exit(0) */
+ case 'v':
+ version();
+ exit(0);
+
case 'E':
- opts.pp_only = true;
+ OPTS_OPTION_BOOL(OPTION_PP_ONLY) = true;
+ opts_set(opts.flags, FTEPP_PREDEFS, true); /* predefs on for -E */
break;
/* debug turns on -flno */
case 'g':
- options_setflag("LNO", true);
+ opts_setflag("LNO", true);
+ OPTS_OPTION_BOOL(OPTION_G) = true;
+ break;
+
+ case 'q':
+ OPTS_OPTION_BOOL(OPTION_QUIET) = true;
+ break;
+
+ case 'D':
+ if (!strlen(argv[0]+2)) {
+ con_err("expected name after -D\n");
+ exit(0);
+ }
+
+ if (!(argarg = strchr(argv[0] + 2, '='))) {
+ macro.name = util_strdup(argv[0]+2);
+ macro.value = NULL;
+ } else {
+ *argarg='\0'; /* terminate for name */
+ macro.name = util_strdup(argv[0]+2);
+ macro.value = util_strdup(argarg+1);
+ }
+ vec_push(ppems, macro);
break;
/* handle all -fflags */
case 'f':
util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1);
if (!strcmp(argv[0]+2, "HELP") || *(argv[0]+2) == '?') {
- con_out("Possible flags:\n");
+ con_out("Possible flags:\n\n");
for (itr = 0; itr < COUNT_FLAGS; ++itr) {
util_strtononcmd(opts_flag_list[itr].name, buffer, sizeof(buffer));
con_out(" -f%s\n", buffer);
exit(0);
}
else if (!strncmp(argv[0]+2, "NO_", 3)) {
- if (!options_setflag(argv[0]+5, false)) {
+ if (!opts_setflag(argv[0]+5, false)) {
con_out("unknown flag: %s\n", argv[0]+2);
return false;
}
}
- else if (!options_setflag(argv[0]+2, true)) {
+ else if (!opts_setflag(argv[0]+2, true)) {
con_out("unknown flag: %s\n", argv[0]+2);
return false;
}
for (itr = 0; itr < COUNT_WARNINGS; ++itr) {
util_strtononcmd(opts_warn_list[itr].name, buffer, sizeof(buffer));
con_out(" -W%s\n", buffer);
+ if (itr == WARN_DEBUG)
+ con_out(" Warnings included by -Wall:\n");
}
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"))
+ {
+ 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")) {
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;
}
- if (!strncmp(argv[0]+2, "NO_", 3)) {
- if (!options_setwarn(argv[0]+5, false)) {
+ 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;
}
}
- else if (!options_setwarn(argv[0]+2, true)) {
+ else if (!opts_setwarn(argv[0]+2, true)) {
con_out("unknown warning: %s\n", argv[0]+2);
return false;
}
return false;
}
if (isdigit(argarg[0])) {
- opts.O = atoi(argarg);
- set_optimizations(opts.O);
+ uint32_t val = (uint32_t)strtol(argarg, NULL, 10);
+ OPTS_OPTION_U32(OPTION_O) = val;
+ opts_setoptimlevel(val);
} else {
util_strtocmd(argarg, argarg, strlen(argarg)+1);
if (!strcmp(argarg, "HELP")) {
exit(0);
}
else if (!strcmp(argarg, "ALL"))
- set_optimizations(opts.O = 9999);
+ opts_setoptimlevel(OPTS_OPTION_U32(OPTION_O) = 9999);
else if (!strncmp(argarg, "NO_", 3)) {
- if (!options_setoptim(argarg+3, false)) {
+ if (!opts_setoptim(argarg+3, false)) {
con_out("unknown optimization: %s\n", argarg+3);
return false;
}
}
else {
- if (!options_setoptim(argarg, true)) {
+ if (!opts_setoptim(argarg, true)) {
con_out("unknown optimization: %s\n", argarg);
return false;
}
con_out("option -o requires an argument: the output file name\n");
return false;
}
- opts.output = argarg;
+ OPTS_OPTION_STR(OPTION_OUTPUT) = argarg;
opts_output_wasset = true;
break;
usage();
exit(0);
}
+ else if (!strcmp(argv[0]+2, "version")) {
+ version();
+ exit(0);
+ }
+ else if (!strcmp(argv[0]+2, "quiet")) {
+ 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;
+ }
else {
/* All long options with arguments */
if (options_long_witharg("output", &argc, &argv, &argarg)) {
- opts.output = argarg;
+ OPTS_OPTION_STR(OPTION_OUTPUT) = argarg;
opts_output_wasset = true;
} else {
con_out("Unknown parameter: %s\n", argv[0]);
vec_push(items, item);
}
}
+ opts_ini_init(config);
return true;
}
char *end;
line = *out;
- len = util_getline(&line, alen, src);
+ len = fs_file_getline(&line, alen, src);
if (len == -1)
return false;
}
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;
-
- memset(&opts, 0, sizeof(opts));
- opts.output = "progs.dat";
- opts.standard = COMPILER_GMQCC;
- opts.max_array_size = (1024<<3);
+ size_t itr;
+ int retval = 0;
+ bool opts_output_free = false;
+ bool operators_free = false;
+ bool progs_src = false;
+ FILE *outfile = NULL;
+ struct parser_s *parser = NULL;
+ struct ftepp_s *ftepp = NULL;
app_name = argv[0];
- con_init();
-
- /* default options / warn flags */
- options_set(opts.warn, WARN_UNKNOWN_CONTROL_SEQUENCE, true);
- options_set(opts.warn, WARN_EXTENSIONS, true);
- options_set(opts.warn, WARN_FIELD_REDECLARED, true);
- options_set(opts.warn, WARN_TOO_FEW_PARAMETERS, true);
- options_set(opts.warn, WARN_MISSING_RETURN_VALUES, true);
- options_set(opts.warn, WARN_USED_UNINITIALIZED, true);
- options_set(opts.warn, WARN_LOCAL_CONSTANTS, true);
- options_set(opts.warn, WARN_VOID_VARIABLES, true);
- options_set(opts.warn, WARN_IMPLICIT_FUNCTION_POINTER, true);
- options_set(opts.warn, WARN_VARIADIC_FUNCTION, true);
- options_set(opts.warn, WARN_FRAME_MACROS, true);
- options_set(opts.warn, WARN_UNUSED_VARIABLE, true);
- 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.warn, WARN_DOUBLE_DECLARATION, true);
- options_set(opts.warn, WARN_CONST_VAR, true);
- options_set(opts.warn, WARN_MULTIBYTE_CHARACTER, true);
-
- options_set(opts.flags, ADJUST_VECTOR_FIELDS, true);
- options_set(opts.flags, FTEPP, false);
- options_set(opts.flags, CORRECT_TERNARY, true);
+ con_init ();
+ opts_init("progs.dat", COMPILER_GMQCC, (1024 << 3));
+
+ util_seed(time(0));
if (!options_parse(argc, argv)) {
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(EXIT_FAILURE);
+ }
+
/* the standard decides which set of operators to use */
- if (opts.standard == COMPILER_GMQCC) {
- operators = c_operators;
+ if (OPTS_OPTION_U32(OPTION_STANDARD) == COMPILER_GMQCC) {
+ operators = c_operators;
operator_count = c_operator_count;
- } else if (opts.standard == COMPILER_FTEQCC) {
- operators = fte_operators;
+ } else if (OPTS_OPTION_U32(OPTION_STANDARD) == COMPILER_FTEQCC) {
+ operators = fte_operators;
operator_count = fte_operator_count;
} else {
- operators = qcc_operators;
+ operators = qcc_operators;
operator_count = qcc_operator_count;
}
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 = 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.dump) {
- for (itr = 0; itr < COUNT_FLAGS; ++itr) {
- con_out("Flag %s = %i\n", opts_flag_list[itr].name, OPTS_FLAG(itr));
- }
- for (itr = 0; itr < COUNT_WARNINGS; ++itr) {
+ if (OPTS_OPTION_BOOL(OPTION_DUMP)) {
+ for (itr = 0; itr < COUNT_FLAGS; ++itr)
+ 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 = %i\n", (int)opts.O);
- con_out("standard = %i\n", opts.standard);
+
+ con_out("output = %s\n", OPTS_OPTION_STR(OPTION_OUTPUT));
+ con_out("optimization level = %u\n", OPTS_OPTION_U32(OPTION_O));
+ con_out("standard = %u\n", OPTS_OPTION_U32(OPTION_STANDARD));
}
- if (opts.pp_only) {
+ if (OPTS_OPTION_BOOL(OPTION_PP_ONLY)) {
if (opts_output_wasset) {
- outfile = util_fopen(opts.output, "wb");
+ outfile = fs_file_open(OPTS_OPTION_STR(OPTION_OUTPUT), "wb");
if (!outfile) {
- con_err("failed to open `%s` for writing\n", opts.output);
+ con_err("failed to open `%s` for writing\n", OPTS_OPTION_STR(OPTION_OUTPUT));
retval = 1;
goto cleanup;
}
}
- else
- outfile = stdout;
+ else {
+ outfile = con_default_out();
+ }
}
- if (!opts.pp_only) {
- if (!parser_init()) {
+ if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) {
+ if (!(parser = parser_create())) {
con_err("failed to initialize parser\n");
retval = 1;
goto cleanup;
}
}
- if (opts.pp_only || OPTS_FLAG(FTEPP)) {
- if (!ftepp_init()) {
+
+ if (OPTS_OPTION_BOOL(OPTION_PP_ONLY) || OPTS_FLAG(FTEPP)) {
+ if (!(ftepp = ftepp_create())) {
con_err("failed to initialize parser\n");
retval = 1;
goto cleanup;
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++) {
+ ftepp_add_macro(ftepp, ppems[itr].name, ppems[itr].value);
+ mem_d(ppems[itr].name);
+
+ /* can be null */
+ if (ppems[itr].value)
+ mem_d(ppems[itr].value);
+ }
+ }
+
if (!vec_size(items)) {
FILE *src;
char *line;
progs_src = true;
- src = util_fopen("progs.src", "rb");
+ src = fs_file_open("progs.src", "rb");
if (!src) {
con_err("failed to open `progs.src` for reading\n");
retval = 1;
}
if (!opts_output_wasset) {
- opts.output = util_strdup(line);
+ OPTS_OPTION_STR(OPTION_OUTPUT) = util_strdup(line);
opts_output_free = true;
}
}
srcdone:
- fclose(src);
+ fs_file_close(src);
mem_d(line);
}
goto cleanup;
if (vec_size(items)) {
- if (!opts.pp_only) {
+ if (!OPTS_OPTION_BOOL(OPTION_QUIET) &&
+ !OPTS_OPTION_BOOL(OPTION_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_OPTION_BOOL(OPTION_QUIET) &&
+ !OPTS_OPTION_BOOL(OPTION_PP_ONLY))
+ {
con_out(" item: %s (%s)\n",
items[itr].filename,
( (items[itr].type == TYPE_QC ? "qc" :
("unknown"))))));
}
- if (opts.pp_only) {
+ if (OPTS_OPTION_BOOL(OPTION_PP_ONLY)) {
const char *out;
- if (!ftepp_preprocess_file(items[itr].filename)) {
+ if (!ftepp_preprocess_file(ftepp, items[itr].filename)) {
retval = 1;
goto cleanup;
}
- out = ftepp_get();
+ out = ftepp_get(ftepp);
if (out)
- fprintf(outfile, "%s", out);
- ftepp_flush();
+ fs_file_printf(outfile, "%s", out);
+ ftepp_flush(ftepp);
}
else {
if (OPTS_FLAG(FTEPP)) {
const char *data;
- if (!ftepp_preprocess_file(items[itr].filename)) {
+ if (!ftepp_preprocess_file(ftepp, items[itr].filename)) {
retval = 1;
goto cleanup;
}
- data = ftepp_get();
+ data = ftepp_get(ftepp);
if (vec_size(data)) {
- if (!parser_compile_string_len(items[itr].filename, data, vec_size(data))) {
+ if (!parser_compile_string(parser, items[itr].filename, data, vec_size(data))) {
retval = 1;
goto cleanup;
}
}
- ftepp_flush();
+ ftepp_flush(ftepp);
}
else {
- if (!parser_compile_file(items[itr].filename)) {
+ if (!parser_compile_file(parser, items[itr].filename)) {
retval = 1;
goto cleanup;
}
}
}
- ftepp_finish();
- if (!opts.pp_only) {
- if (!parser_finish(opts.output)) {
+ ftepp_finish(ftepp);
+ ftepp = NULL;
+ if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) {
+ if (!parser_finish(parser, OPTS_OPTION_STR(OPTION_OUTPUT))) {
retval = 1;
goto cleanup;
}
}
/* stuff */
-
- if (!opts.pp_only) {
+ if (!OPTS_OPTION_BOOL(OPTION_QUIET) &&
+ !OPTS_OPTION_BOOL(OPTION_PP_ONLY))
+ {
for (itr = 0; itr < COUNT_OPTIMIZATIONS; ++itr) {
- if (optimization_count[itr]) {
- con_out("%s: %u\n", opts_opt_list[itr].name, (unsigned int)optimization_count[itr]);
+ if (opts_optimizationcount[itr]) {
+ con_out("%s: %u\n", opts_opt_list[itr].name, (unsigned int)opts_optimizationcount[itr]);
}
}
}
cleanup:
util_debug("COM", "cleaning ...\n");
- ftepp_finish();
+ if (ftepp)
+ ftepp_finish(ftepp);
con_close();
vec_free(items);
+ vec_free(ppems);
- if (!opts.pp_only)
- parser_cleanup();
+ if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY))
+ parser_cleanup(parser);
if (opts_output_free)
- mem_d((char*)opts.output);
+ mem_d(OPTS_OPTION_STR(OPTION_OUTPUT));
if (operators_free)
mem_d((void*)operators);
projects / xonotic / gmqcc.git / blobdiff