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

diff --git a/ast.c b/ast.c
index c68ba9f065eecca940f1ef92c9b46e0989095613..c0c92fbe3ab122f7c15fa0b0a588b54f7f549c0a 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -2187,9 +2187,11 @@ bool ast_array_index_codegen(ast_array_index *self, ast_function *func, bool lva
 
     if (!lvalue && self->expression.outr) {
         *out = self->expression.outr;
+        return true;
     }
     if (lvalue && self->expression.outl) {
         *out = self->expression.outl;
+        return true;
     }
 
     if (!ast_istype(self->array, ast_value)) {

diff --git a/parser.c b/parser.c
index f589d63629361ddc6b48edd09d20299bb93227ef..d5f800cb7a6a94d095427e232ac0e76616df615c 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -1067,7 +1067,7 @@ static bool parser_sy_apply_operator(parser_t *parser, shunt *sy)
                 out = (ast_expression*)ast_ternary_new(ctx, exprs[0], exprs[1], exprs[2]);
             break;
 
-        case opid3('<', '=', '>'): /* -1, 0, or 1 */
+        case opid3('<','=','>'): /* -1, 0, or 1 */
             if (NotSameType(TYPE_FLOAT)) {
                 ast_type_to_string(exprs[0], ty1, sizeof(ty1));
                 ast_type_to_string(exprs[1], ty2, sizeof(ty2));