Replace CL_REQUIRE/CL_PROVIDE(cl_I_ring) with portable code.

[cln.git] / include / cln / modinteger.h

diff --git a/include/cln/modinteger.h b/include/cln/modinteger.h
index 90647caeea4ab9bd03e011680a5ea186fe5d177f..877e7e9db640f6dfc64bb42ed6a55feb359bc391 100644 (file)
--- a/include/cln/modinteger.h
+++ b/include/cln/modinteger.h
@@ -11,7 +11,7 @@
 #include "cln/io.h"
 #include "cln/proplist.h"
 #include "cln/condition.h"
-#include "cln/abort.h"
+#include "cln/exception.h"
 #undef random // Linux defines random() as a macro!
 
 namespace cln {
@@ -141,9 +141,9 @@ public:
        cl_MI_x (cl_composite_condition* c) : value (), condition (c) {}
        cl_MI_x (const cl_MI& x) : value (x), condition (NULL) {}
        // Cast operators.
-       //operator cl_MI& () { if (condition) cl_abort(); return value; }
-       //operator const cl_MI& () const { if (condition) cl_abort(); return value; }
-       operator cl_MI () const { if (condition) cl_abort(); return value; }
+       //operator cl_MI& () { if (condition) throw runtime_exception(); return value; }
+       //operator const cl_MI& () const { if (condition) throw runtime_exception(); return value; }
+       operator cl_MI () const { if (condition) throw runtime_exception(); return value; }
 };
 
 
@@ -153,14 +153,14 @@ struct _cl_modint_setops /* cf. _cl_ring_setops */ {
        // print
        void (* fprint) (cl_heap_modint_ring* R, std::ostream& stream, const _cl_MI& x);
        // equality
-       cl_boolean (* equal) (cl_heap_modint_ring* R, const _cl_MI& x, const _cl_MI& y);
+       bool (* equal) (cl_heap_modint_ring* R, const _cl_MI& x, const _cl_MI& y);
        // random number
        const _cl_MI (* random) (cl_heap_modint_ring* R, random_state& randomstate);
 };
 struct _cl_modint_addops /* cf. _cl_ring_addops */ {
        // 0
        const _cl_MI (* zero) (cl_heap_modint_ring* R);
-       cl_boolean (* zerop) (cl_heap_modint_ring* R, const _cl_MI& x);
+       bool (* zerop) (cl_heap_modint_ring* R, const _cl_MI& x);
        // x+y
        const _cl_MI (* plus) (cl_heap_modint_ring* R, const _cl_MI& x, const _cl_MI& y);
        // x-y
@@ -216,13 +216,13 @@ public:
        // Low-level operations.
        void _fprint (std::ostream& stream, const _cl_MI& x)
                { setops->fprint(this,stream,x); }
-       cl_boolean _equal (const _cl_MI& x, const _cl_MI& y)
+       bool _equal (const _cl_MI& x, const _cl_MI& y)
                { return setops->equal(this,x,y); }
        const _cl_MI _random (random_state& randomstate)
                { return setops->random(this,randomstate); }
        const _cl_MI _zero ()
                { return addops->zero(this); }
-       cl_boolean _zerop (const _cl_MI& x)
+       bool _zerop (const _cl_MI& x)
                { return addops->zerop(this,x); }
        const _cl_MI _plus (const _cl_MI& x, const _cl_MI& y)
                { return addops->plus(this,x,y); }
@@ -253,13 +253,13 @@ public:
        // High-level operations.
        void fprint (std::ostream& stream, const cl_MI& x)
        {
-               if (!(x.ring() == this)) cl_abort();
+               if (!(x.ring() == this)) throw runtime_exception();
                _fprint(stream,x);
        }
-       cl_boolean equal (const cl_MI& x, const cl_MI& y)
+       bool equal (const cl_MI& x, const cl_MI& y)
        {
-               if (!(x.ring() == this)) cl_abort();
-               if (!(y.ring() == this)) cl_abort();
+               if (!(x.ring() == this)) throw runtime_exception();
+               if (!(y.ring() == this)) throw runtime_exception();
                return _equal(x,y);
        }
        const cl_MI random (random_state& randomstate = default_random_state)
@@ -270,26 +270,26 @@ public:
        {
                return cl_MI(this,_zero());
        }
-       cl_boolean zerop (const cl_MI& x)
+       bool zerop (const cl_MI& x)
        {
-               if (!(x.ring() == this)) cl_abort();
+               if (!(x.ring() == this)) throw runtime_exception();
                return _zerop(x);
        }
        const cl_MI plus (const cl_MI& x, const cl_MI& y)
        {
-               if (!(x.ring() == this)) cl_abort();
-               if (!(y.ring() == this)) cl_abort();
+               if (!(x.ring() == this)) throw runtime_exception();
+               if (!(y.ring() == this)) throw runtime_exception();
                return cl_MI(this,_plus(x,y));
        }
        const cl_MI minus (const cl_MI& x, const cl_MI& y)
        {
-               if (!(x.ring() == this)) cl_abort();
-               if (!(y.ring() == this)) cl_abort();
+               if (!(x.ring() == this)) throw runtime_exception();
+               if (!(y.ring() == this)) throw runtime_exception();
                return cl_MI(this,_minus(x,y));
        }
        const cl_MI uminus (const cl_MI& x)
        {
-               if (!(x.ring() == this)) cl_abort();
+               if (!(x.ring() == this)) throw runtime_exception();
                return cl_MI(this,_uminus(x));
        }
        const cl_MI one ()
@@ -302,34 +302,34 @@ public:
        }
        const cl_MI mul (const cl_MI& x, const cl_MI& y)
        {
-               if (!(x.ring() == this)) cl_abort();
-               if (!(y.ring() == this)) cl_abort();
+               if (!(x.ring() == this)) throw runtime_exception();
+               if (!(y.ring() == this)) throw runtime_exception();
                return cl_MI(this,_mul(x,y));
        }
        const cl_MI square (const cl_MI& x)
        {
-               if (!(x.ring() == this)) cl_abort();
+               if (!(x.ring() == this)) throw runtime_exception();
                return cl_MI(this,_square(x));
        }
        const cl_MI expt_pos (const cl_MI& x, const cl_I& y)
        {
-               if (!(x.ring() == this)) cl_abort();
+               if (!(x.ring() == this)) throw runtime_exception();
                return cl_MI(this,_expt_pos(x,y));
        }
        const cl_MI_x recip (const cl_MI& x)
        {
-               if (!(x.ring() == this)) cl_abort();
+               if (!(x.ring() == this)) throw runtime_exception();
                return _recip(x);
        }
        const cl_MI_x div (const cl_MI& x, const cl_MI& y)
        {
-               if (!(x.ring() == this)) cl_abort();
-               if (!(y.ring() == this)) cl_abort();
+               if (!(x.ring() == this)) throw runtime_exception();
+               if (!(y.ring() == this)) throw runtime_exception();
                return _div(x,y);
        }
        const cl_MI_x expt (const cl_MI& x, const cl_I& y)
        {
-               if (!(x.ring() == this)) cl_abort();
+               if (!(x.ring() == this)) throw runtime_exception();
                return _expt(x,y);
        }
        const cl_I reduce_modulo (const cl_I& x)
@@ -338,7 +338,7 @@ public:
        }
        const cl_I retract (const cl_MI& x)
        {
-               if (!(x.ring() == this)) cl_abort();
+               if (!(x.ring() == this)) throw runtime_exception();
                return _retract(x);
        }
        // Miscellaneous.
@@ -407,7 +407,7 @@ inline bool operator!= (const cl_I& x, const cl_MI& y)
        { return !y.ring()->equal(y.ring()->canonhom(x),y); }
 
 // Compare against 0.
-inline cl_boolean zerop (const cl_MI& x)
+inline bool zerop (const cl_MI& x)
        { return x.ring()->zerop(x); }
 
 // Multiply.