From: Wolfgang Bumiller <blub@speed.at>
Date: Thu, 20 Dec 2012 18:04:56 +0000 (+0100)
Subject: unary not now uses NOT_F with -ftrue-empty-strings
X-Git-Tag: 0.2~53
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6b9eff19f189c9f07650944d383a1dddc61d0655;p=xonotic%2Fgmqcc.git

unary not now uses NOT_F with -ftrue-empty-strings
---

diff --git a/parser.c b/parser.c
index e8110bb..84832b8 100644
--- a/parser.c
+++ b/parser.c
@@ -648,10 +648,17 @@ static bool parser_sy_apply_operator(parser_t *parser, shunt *sy)
                         out = (ast_expression*)ast_unary_new(ctx, INSTR_NOT_V, exprs[0]);
                     break;
                 case TYPE_STRING:
-                    if (CanConstFold1(exprs[0]))
-                        out = (ast_expression*)parser_const_float(parser, !ConstS(0) || !*ConstS(0));
-                    else
-                        out = (ast_expression*)ast_unary_new(ctx, INSTR_NOT_S, exprs[0]);
+                    if (CanConstFold1(exprs[0])) {
+                        if (OPTS_FLAG(TRUE_EMPTY_STRINGS))
+                            out = (ast_expression*)parser_const_float(parser, !ConstS(0));
+                        else
+                            out = (ast_expression*)parser_const_float(parser, !ConstS(0) || !*ConstS(0));
+                    } else {
+                        if (OPTS_FLAG(TRUE_EMPTY_STRINGS))
+                            out = (ast_expression*)ast_unary_new(ctx, INSTR_NOT_F, exprs[0]);
+                        else
+                            out = (ast_expression*)ast_unary_new(ctx, INSTR_NOT_S, exprs[0]);
+                    }
                     break;
                 /* we don't constant-fold NOT for these types */
                 case TYPE_ENTITY: