Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking

Conflicts:
	parser.c
This commit is contained in:
Dale Weiler 2013-02-05 16:34:55 +00:00
commit 8e87082e1d

View file

@ -1942,12 +1942,8 @@ static ast_expression* parse_expression_leave(parser_t *parser, bool stopatcomma
} }
} }
if (o == operator_count) { if (o == operator_count) {
/* no operator found... must be the end of the statement */
compile_error(parser_ctx(parser), "unknown operator: %s", parser_tokval(parser)); compile_error(parser_ctx(parser), "unknown operator: %s", parser_tokval(parser));
goto onerr; goto onerr;
/*Are there any expressions which actually end with an operator?*/
/*break;*/
} }
/* found an operator */ /* found an operator */
op = &operators[o]; op = &operators[o];