better constant handling for expr_cond

2011-07-11 00:00:47 -07:00
parent 38756b506f
commit cd3d1a45f3
2 changed files with 6 additions and 1 deletions
--- a/tccgen.c
+++ b/tccgen.c
@ -4036,6 +4036,10 @@ static void expr_cond(void)

    if (const_wanted) {
        expr_lor_const();
+    } else {
+        expr_lor();
+    }
+    if (const_wanted || ((vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST)) {
        if (tok == '?') {
            CType boolean;
            int c;
@ -4057,7 +4061,6 @@ static void expr_cond(void)
                vpop();
        }
    } else {
-        expr_lor();
        if (tok == '?') {
            next();
            if (vtop != vstack) {