Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking
authorDale Weiler <killfieldengine@gmail.com>
Tue, 5 Feb 2013 16:34:55 +0000 (16:34 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Tue, 5 Feb 2013 16:34:55 +0000 (16:34 +0000)
Conflicts:
parser.c

1  2 
parser.c

diff --cc parser.c
index e2bb6eeee6c6286ff984113ba90d1b48ffad67d0,25c9c8c6fd279a6a40d8df6397c076cafd36f6d2..1adab691326b9ea844e2d0cf82b65a8355ea0a08
+++ 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];