Fix bug in converting cl_LF to float, double.

[cln.git] / src / numtheory / cl_nt_jacobi.cc

diff --git a/src/numtheory/cl_nt_jacobi.cc b/src/numtheory/cl_nt_jacobi.cc
index 04b4303ae27af28806d7d758951b5664710012ee..edc93bd36ea9350485ab0f256f44b2b4f303e451 100644 (file)
--- a/src/numtheory/cl_nt_jacobi.cc
+++ b/src/numtheory/cl_nt_jacobi.cc
@@ -1,7 +1,7 @@
 // jacobi().
 
 // General includes.
-#include "cl_sysdep.h"
+#include "base/cl_sysdep.h"
 
 // Specification.
 #include "cln/numtheory.h"
@@ -10,9 +10,9 @@
 // Implementation.
 
 #include "cln/integer.h"
-#include "cl_I.h"
-#include "cln/abort.h"
-#include "cl_xmacros.h"
+#include "integer/cl_I.h"
+#include "cln/exception.h"
+#include "base/cl_xmacros.h"
 
 namespace cln {
 
@@ -20,16 +20,16 @@ int jacobi (const cl_I& a, const cl_I& b)
 {
        // Check b > 0, b odd.
        if (!(b > 0))
-               cl_abort();
+               throw runtime_exception();
        if (!oddp(b))
-               cl_abort();
+               throw runtime_exception();
  {     Mutable(cl_I,a);
        Mutable(cl_I,b);
        // Ensure 0 <= a < b.
        a = mod(a,b);
        // If a and b are fixnums, choose faster routine.
        if (fixnump(b))
-               return jacobi(FN_to_L(a),FN_to_L(b));
+               return jacobi(FN_to_V(a),FN_to_V(b));
        var int v = 1;
        for (;;) {
                // (a/b) * v is invariant.
@@ -43,7 +43,7 @@ int jacobi (const cl_I& a, const cl_I& b)
                        // a > b/2, so (a/b) = (-1/b) * ((b-a)/b),
                        // and (-1/b) = -1 if b==3 mod 4.
                        a = b-a;
-                       if (FN_to_L(logand(b,3)) == 3)
+                       if (FN_to_V(logand(b,3)) == 3)
                                v = -v;
                        continue;
                }
@@ -51,14 +51,14 @@ int jacobi (const cl_I& a, const cl_I& b)
                        // b>1 and a=2a', so (a/b) = (2/b) * (a'/b),
                        // and (2/b) = -1 if b==3,5 mod 8.
                        a = a>>1;
-                       switch (FN_to_L(logand(b,7))) {
+                       switch (FN_to_V(logand(b,7))) {
                                case 3: case 5: v = -v; break;
                        }
                        continue;
                }
                // a and b odd, 0 < a < b/2 < b, so apply quadratic reciprocity
                // law  (a/b) = (-1)^((a-1)/2)((b-1)/2) * (b/a).
-               if (FN_to_L(logand(logand(a,b),3)) == 3)
+               if (FN_to_V(logand(logand(a,b),3)) == 3)
                        v = -v;
                swap(cl_I, a,b);
                // Now a > 2*b, set a := a mod b.