From 17aeb43e18ca679617511c442cd7a74c363e40b9 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Thu, 27 Feb 2020 12:35:44 +1100
Subject: [PATCH] py: Un-nest configuration #if/#endif's for selection of
 complex code.

Because un-nested #if's are simpler to handle with formatting tools.
---
 py/objint_mpz.c | 2 +-
 py/runtime.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/objint_mpz.c b/py/objint_mpz.c
index 834e9a9bda..5c014ac23e 100644
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -184,10 +184,10 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
 #if MICROPY_PY_BUILTINS_FLOAT
     } else if (mp_obj_is_float(rhs_in)) {
         return mp_obj_float_binary_op(op, mpz_as_float(zlhs), rhs_in);
+#endif
 #if MICROPY_PY_BUILTINS_COMPLEX
     } else if (mp_obj_is_type(rhs_in, &mp_type_complex)) {
         return mp_obj_complex_binary_op(op, mpz_as_float(zlhs), 0, rhs_in);
-#endif
 #endif
     } else {
         // delegate to generic function to check for extra cases
diff --git a/py/runtime.c b/py/runtime.c
index 9b5527d728..906d07b604 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -527,6 +527,7 @@ mp_obj_t mp_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
             } else {
                 return res;
             }
+#endif
 #if MICROPY_PY_BUILTINS_COMPLEX
         } else if (mp_obj_is_type(rhs, &mp_type_complex)) {
             mp_obj_t res = mp_obj_complex_binary_op(op, lhs_val, 0, rhs);
@@ -535,7 +536,6 @@ mp_obj_t mp_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
             } else {
                 return res;
             }
-#endif
 #endif
         }
     }