Merge branch 'master' into cooking

[xonotic/gmqcc.git] / ast.c

diff --git a/ast.c b/ast.c
index 3fb27d30f917d687bbe2e43738f107e0bef976b5..e1f86a65e9b5558d1d4a71989b79e60ab85c973d 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -515,25 +515,35 @@ ast_unary* ast_unary_new(lex_ctx_t ctx, int op,
     ast_instantiate(ast_unary, ctx, ast_unary_delete);
     ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_unary_codegen);
 
-    self->op = op;
+    self->op      = op;
     self->operand = expr;
 
-    if (ast_istype(expr, ast_unary)) {
-        ast_expression *prev = (ast_expression*)((ast_unary*)expr)->operand;
+
+    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_istype(prev, ast_unary)) {
             ast_expression_delete((ast_expression*)self);
             mem_d(self);
             ++opts_optimizationcount[OPTIM_PEEPHOLE];
-            return (ast_unary*)prev;
+            return prev;
         }
     }
 
     ast_propagate_effects(self, expr);
 
-    if (op >= INSTR_NOT_F && op <= INSTR_NOT_FNC) {
+    if (op >= INSTR_NOT_F  && op <= INSTR_NOT_FNC) {
         self->expression.vtype = TYPE_FLOAT;
-    } else
+    } else if (op >= VINSTR_NEG_F && op <= VINSTR_NEG_V) {
+        self->expression.vtype = TYPE_FLOAT;
+    } else {
         compile_error(ctx, "cannot determine type of unary operation %s", util_instr_str[op]);
+    }
 
     return self;
 }