bool opts_werror = false;
bool opts_forcecrc = false;
bool opts_pp_only = false;
+size_t opts_max_array_size = 1024;
uint16_t opts_forced_crc;
size_t operator_count = 0;
typedef struct { char *filename; int type; } argitem;
-VECTOR_MAKE(argitem, items);
+static argitem *items = NULL;
#define TYPE_QC 0
#define TYPE_ASM 1
return options_long_witharg_all(optname, argc_, argv_, out, 1, false);
}
+static 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 bool options_parse(int argc, char **argv) {
bool argend = false;
size_t itr;
- char buffer[1024];
+ char buffer[1024];
+ char *redirout = (char*)stdout;
+ char *redirerr = (char*)stderr;
+
while (!argend && argc > 1) {
char *argarg;
argitem item;
if (argv[0][0] == '-') {
/* All gcc-type long options */
if (options_long_gcc("std", &argc, &argv, &argarg)) {
- if (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default"))
+ if (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default")) {
+ options_set(opts_flags, ADJUST_VECTOR_FIELDS, true);
opts_standard = COMPILER_GMQCC;
- else if (!strcmp(argarg, "qcc"))
+ } else if (!strcmp(argarg, "qcc")) {
+ options_set(opts_flags, ADJUST_VECTOR_FIELDS, false);
opts_standard = COMPILER_QCC;
- else if (!strcmp(argarg, "fte") || !strcmp(argarg, "fteqcc"))
+ } else if (!strcmp(argarg, "fte") || !strcmp(argarg, "fteqcc")) {
+ options_set(opts_flags, ADJUST_VECTOR_FIELDS, false);
opts_standard = COMPILER_FTEQCC;
- else if (!strcmp(argarg, "qccx"))
+ } else if (!strcmp(argarg, "qccx")) {
+ options_set(opts_flags, ADJUST_VECTOR_FIELDS, false);
opts_standard = COMPILER_QCCX;
- else {
+ } else {
con_out("Unknown standard: %s\n", argarg);
return false;
}
opts_forced_crc = strtol(argarg, NULL, 0);
continue;
}
+ if (options_long_gcc("redirout", &argc, &argv, &redirout)) {
+ continue;
+ }
+ if (options_long_gcc("redirerr", &argc, &argv, &redirerr)) {
+ continue;
+ }
+
if (!strcmp(argv[0]+1, "debug")) {
opts_debug = true;
continue;
opts_memchk = true;
continue;
}
+ if (!strcmp(argv[0]+1, "nocolor")) {
+ con_color(0);
+ continue;
+ }
switch (argv[0][1]) {
/* -h, show usage but exit with 0 */
return false;
}
item.filename = argarg;
- items_add(item);
+ vec_push(items, item);
break;
case '-':
argitem item;
item.filename = argv[0];
item.type = TYPE_QC;
- items_add(item);
+ vec_push(items, item);
}
}
+ con_change(redirout, redirerr);
return true;
}
-static 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
-}
-
/* 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;
options_set(opts_warn, WARN_END_SYS_FIELDS, true);
options_set(opts_warn, WARN_ASSIGN_FUNCTION_TYPES, true);
+ options_set(opts_flags, ADJUST_VECTOR_FIELDS, true);
+
if (!options_parse(argc, argv)) {
return usage();
}
util_debug("COM", "starting ...\n");
- if (items_elements) {
+ if (vec_size(items)) {
con_out("Mode: manual\n");
- con_out("There are %lu items to compile:\n", (unsigned long)items_elements);
- for (itr = 0; itr < items_elements; ++itr) {
+ con_out("There are %lu items to compile:\n", (unsigned long)vec_size(items));
+ for (itr = 0; itr < vec_size(items); ++itr) {
con_out(" item: %s (%s)\n",
- items_data[itr].filename,
- ( (items_data[itr].type == TYPE_QC ? "qc" :
- (items_data[itr].type == TYPE_ASM ? "asm" :
- (items_data[itr].type == TYPE_SRC ? "progs.src" :
+ items[itr].filename,
+ ( (items[itr].type == TYPE_QC ? "qc" :
+ (items[itr].type == TYPE_ASM ? "asm" :
+ (items[itr].type == TYPE_SRC ? "progs.src" :
("unknown"))))));
- if (!parser_compile_file(items_data[itr].filename))
- {
- retval = 1;
- goto cleanup;
+ if (!parser_compile_file(items[itr].filename))
+ {
+ retval = 1;
+ goto cleanup;
}
}
cleanup:
util_debug("COM", "cleaning ...\n");
-
- mem_d(items_data);
+ con_close();
+ vec_free(items);
parser_cleanup();
if (opts_output_free)