Changeset 54bb6b in git for libpolys/coeffs/rintegers.cc

Timestamp:

Jul 3, 2018, 5:23:27 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

acb07ec581d8593b7eb367dd1cbd785808f4ae86

Parents:

417a91a95b5bf03f8ca333971553909c72f2568f

Message:

opt: Z/n, Z: always !=NULL (except in Copy/Delete)

File:

• libpolys/coeffs/rintegers.cc (modified) (8 diffs)

libpolys/coeffs/rintegers.cc

@@ -135 +135 @@
 static void nrzDelete(number *a, const coeffs)
 {
-  if (*a == NULL) return;
-  mpz_clear((mpz_ptr) *a);
-  omFreeBin((ADDRESS) *a, gmp_nrz_bin);
-  *a = NULL;
+  if (*a != NULL)
+  {
+    mpz_clear((mpz_ptr) *a);
+    omFreeBin((ADDRESS) *a, gmp_nrz_bin);
+    *a = NULL;
+  }
 }
 
@@ -158 +160 @@
 static int nrzSize(number a, const coeffs)
 {
-  if (a == NULL) return 0;
-  return (((mpz_ptr)a)->_mp_alloc);
+  mpz_ptr p=(mpz_ptr)a;
+  int s=p->_mp_alloc;
+  if (s==1) s=(mpz_cmp_ui(p,0)!=0);
+  return s;
+
 }
 
@@ -203 +208 @@
 static BOOLEAN nrzIsOne (number a, const coeffs)
 {
-  return (a!=NULL) && (0 == mpz_cmp_ui((mpz_ptr) a, 1));
+  return (0 == mpz_cmp_ui((mpz_ptr) a, 1));
 }
 
 static BOOLEAN nrzIsMOne (number a, const coeffs)
 {
-  return (a!=NULL) && (0 == mpz_cmp_si((mpz_ptr) a, -1));
+  return (0 == mpz_cmp_si((mpz_ptr) a, -1));
 }
 
@@ -303 +308 @@
   {
     WerrorS("Non invertible element.");
-    return (number)0; //TODO
+    return (number)NULL;
   }
   return nrzCopy(c,r);
@@ -685 +690 @@
 static int nrzSize(number a, const coeffs)
 {
-  if (a == NULL) return 0;
   if (a==INT_TO_SR(0)) return 0;
   if (n_Z_IS_SMALL(a)) return 1;
@@ -717 +721 @@
 #endif
 {
-  if (n_Z_IS_SMALL(a) && n_Z_IS_SMALL(b)) {
+  if (n_Z_IS_SMALL(a) && n_Z_IS_SMALL(b))
+  {
   //from longrat.cc
     if (SR_TO_INT(a)==0)
@@ -1315 +1320 @@
 static BOOLEAN nrzIsZero (number  a, const coeffs)
 {
-  return (a==NULL) || (a==INT_TO_SR(0));
+  return (a==INT_TO_SR(0));
 }
 
@@ -1483 +1488 @@
   {
     WerrorS("Non invertible element.");
-    return (number)0; //TODO
+    return (number)NULL;
   }
   return c; // has to be 1 or -1....