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

This commit is contained in:
Dale Weiler 2013-02-05 17:16:09 +00:00
commit 52ffc6db10
2 changed files with 3 additions and 1 deletions

2
ast.c
View file

@ -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)) {

View file

@ -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));