[gnumeric] Conditional formats: code cleanup.

[Morten Welinder <mortenw src gnome org>]

commit 7c8d697ca916f328d0e4f7ecb91acdf92d6259a6
Author: Morten Welinder <terra gnome org>
Date:   Fri Mar 14 11:25:49 2014 -0400

    Conditional formats: code cleanup.

 src/style-conditions.c |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/src/style-conditions.c b/src/style-conditions.c
index 5ada7d3..bdbe9f6 100644
--- a/src/style-conditions.c
+++ b/src/style-conditions.c
@@ -539,9 +539,20 @@ gnm_style_cond_eval (GnmStyleCond const *cond, GnmValue const *cv,
        GnmValue *val0 = NULL;
        GnmValue *val1 = NULL;
 
-       if (gnm_style_cond_op_operands (cond->op) > 0)
+       switch (gnm_style_cond_op_operands (cond->op)) {
+       case 2:
+               val1 = gnm_expr_top_eval (cond->deps[1].texpr, ep,
+                                         GNM_EXPR_EVAL_SCALAR_NON_EMPTY);
+               /* Fall through */
+       case 1:
                val0 = gnm_expr_top_eval (cond->deps[0].texpr, ep,
                                          GNM_EXPR_EVAL_SCALAR_NON_EMPTY);
+               /* Fall through */
+       case 0:
+               break;
+       default:
+               g_assert_not_reached ();
+       }
 
        switch (cond->op) {
        case GNM_STYLE_COND_NOT_EQUAL:
@@ -565,8 +576,6 @@ gnm_style_cond_eval (GnmStyleCond const *cond, GnmValue const *cv,
        case GNM_STYLE_COND_NOT_BETWEEN:
                negate = TRUE;  /* ...and fall through */
        case GNM_STYLE_COND_BETWEEN:
-               val1 = gnm_expr_top_eval (cond->deps[1].texpr, ep,
-                                         GNM_EXPR_EVAL_SCALAR_NON_EMPTY);
                res = !(value_compare (cv, val0, FALSE) == IS_LESS ||
                        value_compare (cv, val1, FALSE) == IS_GREATER);
                break;