Rename MP_IS* to MP_*P, for consistency's sake. Use these macros more often.

[u/mdw/catacomb] / mp-sqrt.c

diff --git a/mp-sqrt.c b/mp-sqrt.c
index 98741e8..d18d183 100644 (file)
--- a/mp-sqrt.c
+++ b/mp-sqrt.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mp-sqrt.c,v 1.1 2000/06/22 19:01:44 mdw Exp $
+ * $Id$
  *
  * Compute integer square roots
  *
@@ -27,14 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: mp-sqrt.c,v $
- * Revision 1.1  2000/06/22 19:01:44  mdw
- * Compute (approximations to) integer square roots.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "mp.h"
@@ -62,14 +54,13 @@ mp *mp_sqrt(mp *d, mp *a)
 
   /* --- Sanity preservation --- */
 
-  assert(((void)"imaginary root in mp_sqrt", !(a->f & MP_NEG)));
+  assert(!MP_NEGP(a));
 
   /* --- Deal with trivial cases --- */
 
   MP_SHRINK(a);
   if (a->v == a->vl) {
-    if (d)
-      mp_drop(d);
+    mp_drop(d);
     return (MP_ZERO);
   }
 
@@ -79,7 +70,6 @@ mp *mp_sqrt(mp *d, mp *a)
   z >>= 1;
   mp_copy(a);
   d = mp_lsr(d, a, z);
-  mp_drop(a);
 
   /* --- Main approximation --- *
    *
@@ -96,7 +86,7 @@ mp *mp_sqrt(mp *d, mp *a)
     q = mp_sub(q, q, a);
     if (q->v == q->vl)
       break;
-    if (q->f & MP_NEG) {
+    if (MP_NEGP(q)) {
       r = mp_lsl(r, d, 1);
       r->f |= MP_NEG;
       if (MP_CMP(q, <=, r))
@@ -112,9 +102,9 @@ mp *mp_sqrt(mp *d, mp *a)
 
   /* --- Finished, at last --- */
 
+  mp_drop(a);
   mp_drop(q);
-  if (r)
-    mp_drop(r);
+  mp_drop(r);
   return (d);
 }
 
@@ -131,7 +121,7 @@ static int verify(dstr *v)
   mp *q = mp_sqrt(MP_NEW, a);
   int ok = 1;
 
-  if (MP_CMP(q, !=, qq)) {
+  if (!MP_EQ(q, qq)) {
     ok = 0;
     fputs("\n*** sqrt failed", stderr);
     fputs("\n*** a      = ", stderr); mp_writefile(a, stderr, 10);