From: Dale Weiler <killfieldengine@gmail.com>
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.rm.cloudns.org/?a=commitdiff_plain;h=8e87082e1df9b2860284aa383801bfd4f3d0ce8c;p=xonotic%2Fgmqcc.git

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

Conflicts:
	parser.c
---

8e87082e1df9b2860284aa383801bfd4f3d0ce8c
diff --cc parser.c
index e2bb6ee,25c9c8c..1adab69
--- a/parser.c
+++ b/parser.c
@@@ -1942,12 -1898,13 +1942,8 @@@ static ast_expression* parse_expression
                  }
              }
              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;*/
 -#if 0
 -/* Are there any expressions which actually end with an operator? */
 -                /* no operator found... must be the end of the statement */
 -                break;
 -#endif
              }
              /* found an operator */
              op = &operators[o];