Replace unused macro with cl_unused.

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

diff --git a/src/numtheory/cl_nt_sqrtmodp.cc b/src/numtheory/cl_nt_sqrtmodp.cc
index 6a74c5f26805af6bcb4dd89f11004cf453120816..5f804edc929da1a90ec5db70c9e23c4e02a1dee6 100644 (file)
--- a/src/numtheory/cl_nt_sqrtmodp.cc
+++ b/src/numtheory/cl_nt_sqrtmodp.cc
@@ -1,7 +1,7 @@
 // sqrt_mod_p().
 
 // General includes.
-#include "cl_sysdep.h"
+#include "base/cl_sysdep.h"
 
 // Specification.
 #include "cln/numtheory.h"
@@ -9,13 +9,16 @@
 
 // Implementation.
 
-#include "cl_I.h"
-#include "cln/abort.h"
+#include "integer/cl_I.h"
+#include "cln/exception.h"
 
 #undef floor
 #include <cmath>
 #define floor cln_floor
 
+// MacOS X does "#define _R 0x00040000L".  Grr...
+#undef _R
+
 namespace cln {
 
 // Algorithm 1 (for very small p only):
@@ -110,12 +113,13 @@ static const sqrt_mod_p_t cantor_zassenhaus_sqrt (const cl_modint_ring& R, const
                };
                const gcd_result gcd (const pol2& u)
                {
-                       if (zerop(u.c1))
+                       if (zerop(u.c1)) {
                                // constant polynomial u(X)
                                if (zerop(u.c0))
                                        return gcd_result(2);
                                else
                                        return gcd_result(0);
+                       }
                        // u(X) = c0 + c1*X has zero -c0/c1.
                        var cl_MI_x c1inv = R->recip(u.c1);
                        if (c1inv.condition)
@@ -196,11 +200,11 @@ static const sqrt_mod_p_t tonelli_shanks_sqrt (const cl_modint_ring& R, const cl
        // take h in G_(j+1) \ G_j, so that h^2 in G_j \ G_(j-1), and
        // a^-1*b^2*h^2 is in G_(j-1). So multiply b with h.
        var cl_I& p = R->modulus;
-       var uintL e = ord2(p-1);
+       var uintC e = ord2(p-1);
        var cl_I m = (p-1) >> e;
        // p-1 = 2^e*m, m odd.
        // We will have the invariant c = a^-1*b^2 in G/G_j.
-       var uintL j = e;
+       var uintC j = e;
        // Initialize b = a^((m+1)/2), c = a^m, but avoid to divide by a.
        var cl_MI c = R->expt_pos(a,(m-1)>>1);
        var cl_MI b = R->mul(a,c);
@@ -233,7 +237,7 @@ static const sqrt_mod_p_t tonelli_shanks_sqrt (const cl_modint_ring& R, const cl
        do {
                // Now c = a^-1*b^2 in G_j, h in G_j \ G_(j-1).
                // Determine the smallest i such that c in G_i.
-               var uintL i = 0;
+               var uintC i = 0;
                var cl_MI ci = c; // c_i = c^(2^i)
                for ( ; i < j; i++, ci = R->square(ci))
                        if (ci == R->one())
@@ -244,7 +248,7 @@ static const sqrt_mod_p_t tonelli_shanks_sqrt (const cl_modint_ring& R, const cl
                        // Indicates that p is not prime.
                        return new cl_composite_condition(p);
                // OK, i < j.
-               for (var uintL count = j-i-1; count > 0; count--)
+               for (var uintC count = j-i-1; count > 0; count--)
                        h = R->square(h);
                // Now h in G_(i+1) \ G_i.
                b = R->mul(b,h);
@@ -272,7 +276,7 @@ static const sqrt_mod_p_t tonelli_shanks_sqrt (const cl_modint_ring& R, const cl
 
 const sqrt_mod_p_t sqrt_mod_p (const cl_modint_ring& R, const cl_MI& a)
 {
-       if (!(a.ring() == R)) cl_abort();
+       if (!(a.ring() == R)) throw runtime_exception();
        var cl_I& p = R->modulus;
        var cl_I aa = R->retract(a);
        switch (jacobi(aa,p)) {
@@ -297,9 +301,9 @@ const sqrt_mod_p_t sqrt_mod_p (const cl_modint_ring& R, const cl_MI& a)
                else
                        return sqrt_mod_p_t(2,R->canonhom(x1),R->canonhom(x2));
        }
-       var uintL l = integer_length(p);
-       var uintL e = ord2(p-1);
-       //if (e > 30 && e > l/(log((double)l)*0.72-1))
+       var uintC l = integer_length(p);
+       var uintC e = ord2(p-1);
+       //if (e > 30 && e > l/(::log((double)l)*0.72-1))
        if (e > 30 && e > l/(::log((double)l)*0.92-2.41))
                // Algorithm 2.
                return cantor_zassenhaus_sqrt(R,a);