darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-20 18:32:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into cooking

Browse source 
Conflicts:
	opts.def
This commit is contained in:
Dale Weiler 2013-06-17 20:14:26 +00:00
commit e6c1d66c35
3 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
main.c
View file

@ -176,6 +176,7 @@ static bool options_parse(int argc, char **argv) {
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_set(opts.warn, WARN_BREAKDEF, true);
OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_GMQCC;
@ -196,6 +197,7 @@ static bool options_parse(int argc, char **argv) {
opts_set(opts.flags, ASSIGN_FUNCTION_TYPES, true);
opts_set(opts.flags, CORRECT_TERNARY, false);
opts_set(opts.warn, WARN_TERNARY_PRECEDENCE, true);
opts_set(opts.warn, WARN_BREAKDEF, true);
OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_FTEQCC;
@ -662,9 +664,10 @@ int main(int argc, char **argv) {
}
if (!vec_size(items)) {
FILE *src;
char *line;
FILE *src;
char *line = NULL;
size_t linelen = 0;
bool hasline = false;
progs_src = true;
@ -675,28 +678,23 @@ int main(int argc, char **argv) {
goto cleanup;
}
line = NULL;
if (!progs_nextline(&line, &linelen, src) || !line[0]) {
con_err("illformatted progs.src file: expected output filename in first line\n");
retval = 1;
goto srcdone;
}
if (!opts_output_wasset) {
OPTS_OPTION_STR(OPTION_OUTPUT) = util_strdup(line);
opts_output_free = true;
}
while (progs_nextline(&line, &linelen, src)) {
argitem item;
if (!line[0] || (line[0] == '/' && line[1] == '/'))
continue;
item.filename = util_strdup(line);
item.type = TYPE_QC;
vec_push(items, item);
if (hasline) {
item.filename = util_strdup(line);
item.type = TYPE_QC;
vec_push(items, item);
} else if (!opts_output_wasset) {
OPTS_OPTION_STR(OPTION_OUTPUT) = util_strdup(line);
opts_output_free = true;
hasline = true;
}
}
srcdone:
fs_file_close(src);
mem_d(line);
}

1
opts.def
View file

@ -91,6 +91,7 @@
GMQCC_DEFINE_FLAG(DEPRECATED)
GMQCC_DEFINE_FLAG(PARENTHESIS)
GMQCC_DEFINE_FLAG(UNSAFE_TYPES)
GMQCC_DEFINE_FLAG(BREAKDEF)
#endif
#ifdef GMQCC_TYPE_OPTIMIZATIONS

12
parser.c
View file

@ -5887,8 +5887,16 @@ skipvar:
if (parser->tok != '{' || var->expression.vtype != TYPE_FUNCTION) {
if (parser->tok != '=') {
parseerror(parser, "missing semicolon or initializer, got: `%s`", parser_tokval(parser));
break;
if (!strcmp(parser_tokval(parser), "break")) {
if (!parser_next(parser)) {
parseerror(parser, "error parsing break definition");
break;
}
(void)!!parsewarning(parser, WARN_BREAKDEF, "break definition ignored (suggest removing it)");
} else {
parseerror(parser, "missing semicolon or initializer, got: `%s`", parser_tokval(parser));
break;
}
}
if (!parser_next(parser)) {