Avoid "suggest explicit braces to avoid ambiguous 'else'" warnings.

diff --git a/src/integer/conv/cl_I_from_L.cc b/src/integer/conv/cl_I_from_L.cc
index bf1af070b65bf883110a59ff671b940d930ae4cf..f54ca9f2931d3d8c64bbdc1667abb0e1818e1ad9 100644 (file)
--- a/src/integer/conv/cl_I_from_L.cc
+++ b/src/integer/conv/cl_I_from_L.cc
@@ -45,10 +45,10 @@ cl_private_thing cl_I_constructor_from_L (sint32 wert)
        }
        if (wert >= 0) {
                #define IF_LENGTH(i)  \
-                 if ((bn_minlength <= i) && (i*intDsize <= 32))        \
-                   if (!((i+1)*intDsize <= 32)                         \
+                 if ((bn_minlength <= i) && (i*intDsize <= 32)         \
+                   && (!((i+1)*intDsize <= 32)                         \
                        || ((uint32)wert < (uint32)bitc(i*intDsize-1))  \
-                      )
+                    ) )
                #if (intDsize <= 32)
                IF_LENGTH(1)
                        bignum1:
@@ -88,10 +88,10 @@ cl_private_thing cl_I_constructor_from_L (sint32 wert)
                #undef IF_LENGTH
        } else {
                #define IF_LENGTH(i)  \
-                 if ((bn_minlength <= i) && (i*intDsize <= 32))        \
-                   if (!((i+1)*intDsize <= 32)                         \
+                 if ((bn_minlength <= i) && (i*intDsize <= 32)         \
+                   && (!((i+1)*intDsize <= 32)                         \
                        || ((uint32)wert >= (uint32)(-bitc(i*intDsize-1))) \
-                      )
+                    ) )
                #if (intDsize <= 32)
                IF_LENGTH(1)
                        goto bignum1;

diff --git a/src/integer/conv/cl_I_from_L2.cc b/src/integer/conv/cl_I_from_L2.cc
index be5a00da071716e6c5247f7d604f9e60e7f4b9fa..7e28cf6eb1e8e6c191ca3fef440eadedb49a0002 100644 (file)
--- a/src/integer/conv/cl_I_from_L2.cc
+++ b/src/integer/conv/cl_I_from_L2.cc
@@ -68,12 +68,12 @@ cl_private_thing cl_I_constructor_from_L2 (sint32 wert_hi, uint32 wert_lo)
        #endif
        if (wert_hi >= 0) {
                #define IF_LENGTH(i)  \
-                 if ((bn_minlength <= i) && (i*intDsize <= 64))        \
-                   if (!((i+1)*intDsize <= 64)                         \
+                 if ((bn_minlength <= i) && (i*intDsize <= 64)         \
+                   && (!((i+1)*intDsize <= 64)                         \
                        || (i*intDsize-1 < 32                           \
                            ? ((wert_hi == 0) && (wert_lo < (uint32)bitc(i*intDsize-1))) \
                            : ((uint32)wert_hi < (uint32)bitc(i*intDsize-1-32)) \
-                      )   )
+                    ) )   )
                #define ALLOC(i)  \
                  var cl_heap_bignum* ptr = allocate_bignum(i);
                #define OK  \
@@ -103,12 +103,12 @@ cl_private_thing cl_I_constructor_from_L2 (sint32 wert_hi, uint32 wert_lo)
                #undef IF_LENGTH
        } else {
                #define IF_LENGTH(i)  \
-                 if ((bn_minlength <= i) && (i*intDsize <= 64))        \
-                   if (!((i+1)*intDsize <= 64)                         \
+                 if ((bn_minlength <= i) && (i*intDsize <= 64)         \
+                   && (!((i+1)*intDsize <= 64)                         \
                        || (i*intDsize-1 < 32                           \
                            ? ((wert_hi == ~(sint32)0) && (wert_lo >= (uint32)(-bitc(i*intDsize-1)))) \
                            : ((uint32)wert_hi >= (uint32)(-bitc(i*intDsize-1-32))) \
-                      )   )
+                    ) )   )
                IF_LENGTH(1)
                        goto bignum1;
                #if (intDsize <= 32)

diff --git a/src/integer/conv/cl_I_from_Q.cc b/src/integer/conv/cl_I_from_Q.cc
index 47c879a1fb1d1efcc809d38ceb43f89741829056..ca9f7351f0e4bc215bc0ee7207843833316c935f 100644 (file)
--- a/src/integer/conv/cl_I_from_Q.cc
+++ b/src/integer/conv/cl_I_from_Q.cc
@@ -27,10 +27,10 @@ cl_private_thing cl_I_constructor_from_Q (sint64 wert)
        // (dessen Länge  bn_minlength <= n <= ceiling(32/intDsize)  erfüllt)
        if (wert >= 0) {
                #define IF_LENGTH(i)  \
-                 if ((bn_minlength <= i) && (i*intDsize <= 64))        \
-                   if (!((i+1)*intDsize <= 64)                         \
+                 if ((bn_minlength <= i) && (i*intDsize <= 64)         \
+                   && (!((i+1)*intDsize <= 64)                         \
                        || ((uint64)wert < ((uint64)1 << (i*intDsize-1))) \
-                      )
+                    ) )
                IF_LENGTH(1)
                        bignum1:
                        { var cl_heap_bignum* ptr = allocate_bignum(1);
@@ -116,10 +116,10 @@ cl_private_thing cl_I_constructor_from_Q (sint64 wert)
                #undef IF_LENGTH
        } else {
                #define IF_LENGTH(i)  \
-                 if ((bn_minlength <= i) && (i*intDsize <= 64))        \
-                   if (!((i+1)*intDsize <= 64)                         \
+                 if ((bn_minlength <= i) && (i*intDsize <= 64)         \
+                   && (!((i+1)*intDsize <= 64)                         \
                        || ((uint64)wert >= ((uint64)(-1) << (i*intDsize-1))) \
-                      )
+                    ) )
                IF_LENGTH(1)
                        goto bignum1;
                #if (intDsize <= 32)

diff --git a/src/integer/conv/cl_I_from_Q2.cc b/src/integer/conv/cl_I_from_Q2.cc
index fe7ca0e721c72928e57a8eece1097bda9b0e5a0b..6535f363c1044e661972c847970b413d01f1db8a 100644 (file)
--- a/src/integer/conv/cl_I_from_Q2.cc
+++ b/src/integer/conv/cl_I_from_Q2.cc
@@ -92,12 +92,12 @@ cl_private_thing cl_I_constructor_from_Q2 (sint64 wert_hi, uint64 wert_lo)
        #endif
        if (wert_hi >= 0) {
                #define IF_LENGTH(i)  \
-                 if ((bn_minlength <= i) && (i*intDsize <= 128))       \
-                   if (!((i+1)*intDsize <= 128)                        \
+                 if ((bn_minlength <= i) && (i*intDsize <= 128)        \
+                   && (!((i+1)*intDsize <= 128)                        \
                        || (i*intDsize-1 < 64                           \
                            ? ((wert_hi == 0) && (wert_lo < (uint64)bitc(i*intDsize-1))) \
                            : ((uint64)wert_hi < (uint64)bitc(i*intDsize-1-64)) \
-                      )   )
+                    ) )   )
                #define ALLOC(i)  \
                  var cl_heap_bignum* ptr = allocate_bignum(i);
                #define OK  \
@@ -143,12 +143,12 @@ cl_private_thing cl_I_constructor_from_Q2 (sint64 wert_hi, uint64 wert_lo)
                #undef IF_LENGTH
        } else {
                #define IF_LENGTH(i)  \
-                 if ((bn_minlength <= i) && (i*intDsize <= 128))       \
-                   if (!((i+1)*intDsize <= 128)                        \
+                 if ((bn_minlength <= i) && (i*intDsize <= 128)        \
+                   && (!((i+1)*intDsize <= 128)                        \
                        || (i*intDsize-1 < 64                           \
                            ? ((wert_hi == ~(sint64)0) && (wert_lo >= (uint64)(-bitc(i*intDsize-1)))) \
                            : ((uint64)wert_hi >= (uint64)(-bitc(i*intDsize-1-64))) \
-                      )   )
+                    ) )   )
                IF_LENGTH(1)
                        goto bignum1;
                IF_LENGTH(2)

diff --git a/src/integer/conv/cl_I_from_UL.cc b/src/integer/conv/cl_I_from_UL.cc
index be95e46a7b5d55797e8b2d0861eb5f6147daeab6..e3a5bdd23e0a423addbf1b42562c8b09802a733c 100644 (file)
--- a/src/integer/conv/cl_I_from_UL.cc
+++ b/src/integer/conv/cl_I_from_UL.cc
@@ -27,10 +27,10 @@ cl_private_thing cl_I_constructor_from_UL (uint32 wert)
        // (dessen Länge  bn_minlength <= n <= ceiling((32+1)/intDsize)  erfüllt)
        #define UL_maxlength  ceiling(32+1,intDsize)
        #define IF_LENGTH(i)  \
-         if ((bn_minlength <= i) && (i <= UL_maxlength))       \
-           if (!(i+1 <= UL_maxlength)                          \
+         if ((bn_minlength <= i) && (i <= UL_maxlength)        \
+           && (!(i+1 <= UL_maxlength)                          \
                || ((uint32)wert < (uint32)bitc(i*intDsize-1))  \
-              )
+            ) )
        IF_LENGTH(1)
                { var cl_heap_bignum* ptr = allocate_bignum(1);
                  arrayLSref(ptr->data,1,0) = wert;

diff --git a/src/integer/conv/cl_I_from_UL2.cc b/src/integer/conv/cl_I_from_UL2.cc
index 3be44a1623c1838bc2db2ed2c733462db819e45d..fbf431f403b39abceb68245a8c11d007c8c7ff45 100644 (file)
--- a/src/integer/conv/cl_I_from_UL2.cc
+++ b/src/integer/conv/cl_I_from_UL2.cc
@@ -68,12 +68,12 @@ cl_private_thing cl_I_constructor_from_UL2 (uint32 wert_hi, uint32 wert_lo)
        #define FILL_9  FILL_1_DIGIT(9,8,0); FILL_4_DIGIT(9,4,wert_hi); FILL_4_DIGIT(9,0,wert_lo);
        #endif
        #define IF_LENGTH(i)  \
-         if ((bn_minlength <= i) && (i <= UL2_maxlength))      \
-           if (!(i+1 <= UL2_maxlength)                         \
+         if ((bn_minlength <= i) && (i <= UL2_maxlength)       \
+           && (!(i+1 <= UL2_maxlength)                         \
                || (i*intDsize-1 < 32                           \
                    ? ((wert_hi == 0) && (wert_lo < (uint32)bitc(i*intDsize-1))) \
                    : (wert_hi < (uint32)bitc(i*intDsize-1-32)) \
-              )   )
+            ) )   )
        #define ALLOC(i)  \
          var cl_heap_bignum* ptr = allocate_bignum(i);
        #define OK  \

diff --git a/src/integer/conv/cl_I_from_UQ.cc b/src/integer/conv/cl_I_from_UQ.cc
index d4b3091dd62b147fb47c8a339ca072035ac54d09..6eaf349a5cadb03203be371206f35576cf70bb55 100644 (file)
--- a/src/integer/conv/cl_I_from_UQ.cc
+++ b/src/integer/conv/cl_I_from_UQ.cc
@@ -26,10 +26,10 @@ cl_private_thing cl_I_constructor_from_UQ (uint64 wert)
        // (dessen Länge  bn_minlength <= n <= ceiling((32+1)/intDsize)  erfüllt)
        #define UQ_maxlength  ceiling(64+1,intDsize)
        #define IF_LENGTH(i)  \
-         if ((bn_minlength <= i) && (i <= UQ_maxlength))       \
-           if (!(i+1 <= UQ_maxlength)                          \
+         if ((bn_minlength <= i) && (i <= UQ_maxlength)        \
+           && (!(i+1 <= UQ_maxlength)                          \
                || ((uint64)wert < ((uint64)1 << (i*intDsize-1 < 64 ? i*intDsize-1 : 0))) \
-              )
+            ) )
        IF_LENGTH(1)
                { var cl_heap_bignum* ptr = allocate_bignum(1);
                  arrayLSref(ptr->data,1,0) = (uintD)wert;

diff --git a/src/integer/conv/cl_I_to_L.cc b/src/integer/conv/cl_I_to_L.cc
index d67e185083927bdc38cfb49060ea4924aa186cac..07b581b63d15352b765bb747883db8e315e23f01 100644 (file)
--- a/src/integer/conv/cl_I_to_L.cc
+++ b/src/integer/conv/cl_I_to_L.cc
@@ -35,15 +35,15 @@ sint32 cl_I_to_L (const cl_I& obj)
                if ((sintD)mspref(arrayMSDptr(bn->data,len),0) >= 0) {
                        // Bignum > 0
                        #define IF_LENGTH(i)  \
-                         if (bn_minlength <= i) /* genau i Digits überhaupt möglich? */\
-                           if (len == i) /* genau i Digits? */                         \
-                             /* 2^((i-1)*intDsize-1) <= obj < 2^(i*intDsize-1) */      \
-                             if ( (i*intDsize > 32)                                    \
-                                  && ( ((i-1)*intDsize >= 32)                          \
-                                       || (mspref(arrayMSDptr(bn->data,len),0) >= (uintD)bitc(31-(i-1)*intDsize)) \
-                                )    )                                                 \
-                               goto bad;                                               \
-                               else
+                         if ((bn_minlength <= i) /* genau i Digits überhaupt möglich? */     \
+                           && (len == i) /* genau i Digits? */                                 \
+                           /* 2^((i-1)*intDsize-1) <= obj < 2^(i*intDsize-1) */                \
+                           && ( (i*intDsize > 32)                                              \
+                                && ( ((i-1)*intDsize >= 32)                                    \
+                                     || (mspref(arrayMSDptr(bn->data,len),0) >= (uintD)bitc(31-(i-1)*intDsize)) \
+                            ) )    )                                                           \
+                           goto bad;                                                           \
+                           else
                        IF_LENGTH(1)
                                return get_uint1D_Dptr(arrayLSDptr(bn->data,1));
                        IF_LENGTH(2)
@@ -56,15 +56,15 @@ sint32 cl_I_to_L (const cl_I& obj)
                } else {
                        // Bignum < 0
                        #define IF_LENGTH(i)  \
-                         if (bn_minlength <= i) /* genau i Digits überhaupt möglich? */\
-                           if (len == i) /* genau i Digits? */                         \
-                             /* - 2^(i*intDsize-1) <= obj < - 2^((i-1)*intDsize-1) */  \
-                             if ( (i*intDsize > 32)                                    \
-                                  && ( ((i-1)*intDsize >= 32)                          \
-                                       || (mspref(arrayMSDptr(bn->data,len),0) < (uintD)(-bitc(31-(i-1)*intDsize))) \
-                                )    )                                                 \
-                               goto bad;                                               \
-                               else
+                         if ((bn_minlength <= i) /* genau i Digits überhaupt möglich? */     \
+                           && (len == i) /* genau i Digits? */                                 \
+                           /* - 2^(i*intDsize-1) <= obj < - 2^((i-1)*intDsize-1) */            \
+                           && ( (i*intDsize > 32)                                              \
+                                && ( ((i-1)*intDsize >= 32)                                    \
+                                     || (mspref(arrayMSDptr(bn->data,len),0) < (uintD)(-bitc(31-(i-1)*intDsize))) \
+                            ) )    )                                                           \
+                           goto bad;                                                           \
+                           else
                        IF_LENGTH(1)
                                return get_sint1D_Dptr(arrayLSDptr(bn->data,1));
                        IF_LENGTH(2)

diff --git a/src/integer/conv/cl_I_to_Q.cc b/src/integer/conv/cl_I_to_Q.cc
index 2d3a6e0496fc8e92823b178c625abf64862eec6d..40cec5c8316a6e73b1a592e2c1574c72ff18a1d4 100644 (file)
--- a/src/integer/conv/cl_I_to_Q.cc
+++ b/src/integer/conv/cl_I_to_Q.cc
@@ -31,15 +31,15 @@ sint64 cl_I_to_Q (const cl_I& obj)
        if ((sintD)mspref(arrayMSDptr(bn->data,len),0) >= 0) {
                // Bignum > 0
                #define IF_LENGTH(i)  \
-                 if (bn_minlength <= i) /* genau i Digits überhaupt möglich? */\
-                   if (len == i) /* genau i Digits? */                         \
-                     /* 2^((i-1)*intDsize-1) <= obj < 2^(i*intDsize-1) */      \
-                     if ( (i*intDsize > 64)                                    \
-                          && ( ((i-1)*intDsize >= 64)                          \
-                               || (mspref(arrayMSDptr(bn->data,len),0) >= (uintD)bitc(63-(i-1)*intDsize)) \
-                        )    )                                                 \
-                       goto bad;                                               \
-                       else
+                 if ((bn_minlength <= i) /* genau i Digits überhaupt möglich? */     \
+                   && (len == i) /* genau i Digits? */                                 \
+                   /* 2^((i-1)*intDsize-1) <= obj < 2^(i*intDsize-1) */                \
+                   && ( (i*intDsize > 64)                                              \
+                        && ( ((i-1)*intDsize >= 64)                                    \
+                             || (mspref(arrayMSDptr(bn->data,len),0) >= (uintD)bitc(63-(i-1)*intDsize)) \
+                    ) )    )                                                           \
+                   goto bad;                                                           \
+                   else
                #if (intDsize==64)
                IF_LENGTH(1)
                        return (uint64)arrayLSref(bn->data,1,0);
@@ -82,15 +82,15 @@ sint64 cl_I_to_Q (const cl_I& obj)
        } else {
                // Bignum < 0
                #define IF_LENGTH(i)  \
-                 if (bn_minlength <= i) /* genau i Digits überhaupt möglich? */\
-                   if (len == i) /* genau i Digits? */                         \
-                     /* - 2^(i*intDsize-1) <= obj < - 2^((i-1)*intDsize-1) */  \
-                     if ( (i*intDsize > 64)                                    \
-                          && ( ((i-1)*intDsize >= 64)                          \
-                               || (mspref(arrayMSDptr(bn->data,len),0) < (uintD)(-bitc(63-(i-1)*intDsize))) \
-                        )    )                                                 \
-                       goto bad;                                               \
-                       else
+                 if ((bn_minlength <= i) /* genau i Digits überhaupt möglich? */     \
+                   && (len == i) /* genau i Digits? */                                 \
+                   /* - 2^(i*intDsize-1) <= obj < - 2^((i-1)*intDsize-1) */            \
+                   && ( (i*intDsize > 64)                                              \
+                        && ( ((i-1)*intDsize >= 64)                                    \
+                             || (mspref(arrayMSDptr(bn->data,len),0) < (uintD)(-bitc(63-(i-1)*intDsize))) \
+                    ) )    )                                                           \
+                   goto bad;                                                           \
+                   else
                #if (intDsize==64)
                IF_LENGTH(1)
                        return (sint64)arrayLSref(bn->data,1,0);

diff --git a/src/integer/conv/cl_I_to_UL.cc b/src/integer/conv/cl_I_to_UL.cc
index b5d57063a08a214fe7aea68ca657f4624fb23bb7..cc43a7cef270fa03b926b9ef9fee700a7fe918d8 100644 (file)
--- a/src/integer/conv/cl_I_to_UL.cc
+++ b/src/integer/conv/cl_I_to_UL.cc
@@ -35,16 +35,16 @@ uint32 cl_I_to_UL (const cl_I& obj)
                var uintC len = bn->length;
                if ((sintD)mspref(arrayMSDptr(bn->data,len),0) < 0)
                        goto bad;
-               #define IF_LENGTH(i)  \
-                 if (bn_minlength <= i) /* genau i Digits überhaupt möglich? */\
-                   if (len == i) /* genau i Digits? */                         \
-                     /* 2^((i-1)*intDsize-1) <= obj < 2^(i*intDsize-1) */      \
-                     if ( (i*intDsize-1 > 32)                                  \
-                          && ( ((i-1)*intDsize-1 >= 32)                        \
-                               || (mspref(arrayMSDptr(bn->data,len),0) >= (uintD)bitc(32-(i-1)*intDsize)) \
-                        )    )                                                 \
-                       goto bad;                                               \
-                       else
+               #define IF_LENGTH(i)                                                    \
+                 if ((bn_minlength <= i) /* genau i Digits überhaupt möglich? */     \
+                   && (len == i) /* genau i Digits? */                                 \
+                   /* 2^((i-1)*intDsize-1) <= obj < 2^(i*intDsize-1) */                \
+                   && ( (i*intDsize-1 > 32)                                            \
+                        && ( ((i-1)*intDsize-1 >= 32)                                  \
+                             || (mspref(arrayMSDptr(bn->data,len),0) >= (uintD)bitc(32-(i-1)*intDsize)) \
+                    ) )    )                                                           \
+                   goto bad;                                                           \
+                   else
                IF_LENGTH(1)
                        return get_uint1D_Dptr(arrayLSDptr(bn->data,1));
                IF_LENGTH(2)

diff --git a/src/integer/conv/cl_I_to_UQ.cc b/src/integer/conv/cl_I_to_UQ.cc
index 8192a499d0161e576fbe63fb47f1b57542501508..19f0a526772233fb7da82b905fedcc0ed9c67634 100644 (file)
--- a/src/integer/conv/cl_I_to_UQ.cc
+++ b/src/integer/conv/cl_I_to_UQ.cc
@@ -34,15 +34,15 @@ uint64 cl_I_to_UQ (const cl_I& obj)
                if ((sintD)mspref(arrayMSDptr(bn->data,len),0) < 0)
                        goto bad;
                #define IF_LENGTH(i)  \
-                 if (bn_minlength <= i) /* genau i Digits überhaupt möglich? */\
-                   if (len == i) /* genau i Digits? */                         \
-                     /* 2^((i-1)*intDsize-1) <= obj < 2^(i*intDsize-1) */      \
-                     if ( (i*intDsize-1 > 64)                                  \
-                          && ( ((i-1)*intDsize-1 >= 64)                        \
-                               || (mspref(arrayMSDptr(bn->data,len),0) >= (uintD)bitc(64-(i-1)*intDsize)) \
-                        )    )                                                 \
-                       goto bad;                                               \
-                       else
+                 if ((bn_minlength <= i) /* genau i Digits überhaupt möglich? */     \
+                   && (len == i) /* genau i Digits? */                                 \
+                   /* 2^((i-1)*intDsize-1) <= obj < 2^(i*intDsize-1) */                \
+                   && ( (i*intDsize-1 > 64)                                            \
+                        && ( ((i-1)*intDsize-1 >= 64)                                  \
+                             || (mspref(arrayMSDptr(bn->data,len),0) >= (uintD)bitc(64-(i-1)*intDsize)) \
+                    ) )    )                                                           \
+                   goto bad;                                                           \
+                   else
                #if (intDsize==64)
                IF_LENGTH(1)
                        return (uint64)arrayLSref(bn->data,1,0);