Finalize CLN 1.3.7 release.

[cln.git] / src / integer / conv / cl_I_from_L.cc

diff --git a/src/integer/conv/cl_I_from_L.cc b/src/integer/conv/cl_I_from_L.cc
index aae380859fff8101301522f0545fa5108a46c4cc..f54ca9f2931d3d8c64bbdc1667abb0e1818e1ad9 100644 (file)
--- a/src/integer/conv/cl_I_from_L.cc
+++ b/src/integer/conv/cl_I_from_L.cc
@@ -1,24 +1,25 @@
 // L_to_I() helper.
 
 // General includes.
-#include "cl_sysdep.h"
+#include "base/cl_sysdep.h"
 
 // Specification.
-#include "cl_I.h"
+#include "integer/cl_I.h"
 
 
 // Implementation.
 
 #include "cln/number.h"
 
-#if (cl_value_len < 32)
+#if (cl_value_len < 32) || (long_bitsize==32)
 
-#include "cl_DS.h"
+#include "base/digitseq/cl_DS.h"
 
 namespace cln {
 
 cl_private_thing cl_I_constructor_from_L (sint32 wert)
 {
+#if (cl_value_len < 32)
        var uint32 test = wert & minus_bit(cl_value_len-1);
        // test enthält die Bits, die nicht in den Fixnum-Wert >= 0 reinpassen.
        if ((test == 0) || (test == (uint32)minus_bit(cl_value_len-1)))
@@ -44,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:
@@ -87,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;
@@ -109,6 +110,10 @@ cl_private_thing cl_I_constructor_from_L (sint32 wert)
        }
        #endif
        NOTREACHED
+#else // cl_value_len >= 32
+       // All bits fit in a fixnum value.
+       return (cl_private_thing)(cl_combine(cl_FN_tag,wert));
+#endif
 }
 
 }  // namespace cln