From: Dale Weiler Date: Tue, 5 Feb 2013 16:34:55 +0000 (+0000) Subject: Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking X-Git-Tag: before-library~152 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=8e87082e1df9b2860284aa383801bfd4f3d0ce8c;hp=fed0f8b6b42f11740d673131edecdff1764053a9 Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking Conflicts: parser.c --- diff --git a/parser.c b/parser.c index e2bb6ee..1adab69 100644 --- a/parser.c +++ b/parser.c @@ -1942,12 +1942,8 @@ static ast_expression* parse_expression_leave(parser_t *parser, bool stopatcomma } } 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)); goto onerr; - - /*Are there any expressions which actually end with an operator?*/ - /*break;*/ } /* found an operator */ op = &operators[o];