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

diff --git a/ast.c b/ast.c
index e1f86a65e9b5558d1d4a71989b79e60ab85c973d..dc90019c71e714dc1d8e38f6bb9fb18ea5bd885f 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -521,11 +521,12 @@ ast_unary* ast_unary_new(lex_ctx_t ctx, int op,
 
     if (ast_istype(expr, ast_unary) && OPTS_OPTIMIZATION(OPTIM_PEEPHOLE)) {
         ast_unary *prev = (ast_unary*)((ast_unary*)expr)->operand;
-        ast_unary *cur  = (ast_unary*)expr;
 
         /* Handle for double negation */
-        if (cur->op == op && (op >= VINSTR_NEG_F && op <= VINSTR_NEG_V))
-            prev = cur;
+        if ((((ast_unary*)expr)->op == VINSTR_NEG_V && op == VINSTR_NEG_V) ||
+            (((ast_unary*)expr)->op == VINSTR_NEG_F && op == VINSTR_NEG_F)) {
+            prev = (ast_unary*)((ast_unary*)expr)->operand;
+        }
 
         if (ast_istype(prev, ast_unary)) {
             ast_expression_delete((ast_expression*)self);
@@ -537,10 +538,10 @@ ast_unary* ast_unary_new(lex_ctx_t ctx, int op,
 
     ast_propagate_effects(self, expr);
 
-    if (op >= INSTR_NOT_F  && op <= INSTR_NOT_FNC) {
-        self->expression.vtype = TYPE_FLOAT;
-    } else if (op >= VINSTR_NEG_F && op <= VINSTR_NEG_V) {
+    if ((op >= INSTR_NOT_F && op <= INSTR_NOT_FNC) || op == VINSTR_NEG_F) {
         self->expression.vtype = TYPE_FLOAT;
+    } else if (op == VINSTR_NEG_V) {
+        self->expression.vtype = TYPE_VECTOR;
     } else {
         compile_error(ctx, "cannot determine type of unary operation %s", util_instr_str[op]);
     }