bool opts_memchk = false;
bool opts_dump = false;
bool opts_werror = false;
+bool opts_forcecrc = false;
+bool opts_pp_only = false;
+
+uint16_t opts_forced_crc;
static bool opts_output_wasset = false;
+/* set by the standard */
+const oper_info *operators = NULL;
+size_t operator_count = 0;
+
typedef struct { char *filename; int type; } argitem;
VECTOR_MAKE(argitem, items);
printf(" -o, --output=file output file, defaults to progs.dat\n"
" -a filename add an asm file to be assembled\n"
" -s filename add a progs.src file to be used\n");
+ printf(" -E stop after preprocessing\n");
printf(" -f<flag> enable a flag\n"
" -fno-<flag> disable a flag\n"
" -std standard select one of the following standards\n"
" -std=gmqcc this compiler (default)\n");
printf(" -W<warning> enable a warning\n"
" -Wno-<warning> disable a warning\n"
- " -Wall enable all warnings\n");
+ " -Wall enable all warnings\n"
+ " -Werror treat warnings as errors\n");
+ printf(" -force-crc=num force a specific checksum into the header\n");
printf("\n");
printf("flags:\n"
- " -fdarkplaces-string-table-bug\n"
- " patch the string table to work with some bugged darkplaces versions\n"
- " -fomit-nullbytes\n"
- " omits certain null-bytes for a smaller output - requires a patched engine\n"
+ " -fadjust-vector-fields\n"
+ " when assigning a vector field, its _y and _z fields also get assigned\n"
);
return -1;
}
}
continue;
}
+ if (options_long_gcc("force-crc", &argc, &argv, &argarg)) {
+ opts_forcecrc = true;
+ opts_forced_crc = strtol(argarg, NULL, 0);
+ continue;
+ }
if (!strcmp(argv[0]+1, "debug")) {
opts_debug = true;
continue;
exit(0);
break;
+ case 'E':
+ opts_pp_only = true;
+ break;
+
/* handle all -fflags */
case 'f':
util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1);
opts_werror = true;
break;
}
+ else if (!strcmp(argv[0]+2, "NONE")) {
+ for (itr = 0; itr < sizeof(opts_warn)/sizeof(opts_warn[0]); ++itr)
+ opts_warn[itr] = 0;
+ break;
+ }
else if (!strcmp(argv[0]+2, "ALL")) {
for (itr = 0; itr < sizeof(opts_warn)/sizeof(opts_warn[0]); ++itr)
opts_warn[itr] = 0xFFFFFFFFL;
}
/* returns the line number, or -1 on error */
-static bool progs_nextline(char **out, FILE *src)
+static bool progs_nextline(char **out, size_t *alen,FILE *src)
{
- size_t alen;
int len;
char *line;
char *start;
char *end;
line = *out;
- len = util_getline(&line, &alen, src);
+ len = util_getline(&line, alen, src);
if (len == -1)
return false;
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);
if (!options_parse(argc, argv)) {
return usage();
}
+ /* the standard decides which set of operators to use */
+ if (opts_standard == COMPILER_GMQCC) {
+ operators = c_operators;
+ operator_count = c_operator_count;
+ } else {
+ operators = qcc_operators;
+ operator_count = qcc_operator_count;
+ }
+
if (opts_dump) {
for (itr = 0; itr < COUNT_FLAGS; ++itr) {
printf("Flag %s = %i\n", opts_flag_list[itr].name, OPTS_FLAG(itr));
(items_data[itr].type == TYPE_SRC ? "progs.src" :
("unknown"))))));
- if (!parser_compile(items_data[itr].filename)) {
+ if (!parser_compile_file(items_data[itr].filename)) {
retval = 1;
goto cleanup;
}
}
- parser_finish(opts_output);
+ if (!parser_finish(opts_output)) {
+ retval = 1;
+ goto cleanup;
+ }
+
} else {
FILE *src;
char *line;
+ size_t linelen = 0;
printf("Mode: progs.src\n");
src = util_fopen("progs.src", "rb");
}
line = NULL;
- if (!progs_nextline(&line, src) || !line[0]) {
+ if (!progs_nextline(&line, &linelen, src) || !line[0]) {
printf("illformatted progs.src file: expected output filename in first line\n");
retval = 1;
goto srcdone;
opts_output_free = true;
}
- while (progs_nextline(&line, src)) {
+ while (progs_nextline(&line, &linelen, src)) {
if (!line[0] || (line[0] == '/' && line[1] == '/'))
continue;
printf(" src: %s\n", line);
- if (!parser_compile(line)) {
+ if (!parser_compile_file(line)) {
retval = 1;
goto srcdone;
}