Changeset 2b8fab in git for libpolys/polys/monomials/p_polys.h

Timestamp:

Feb 26, 2018, 12:58:10 PM (6 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

45fa962b8938643ace5cdc03f189d4457e4c7408

Parents:

1af34f3a9d6f48f7bc59d937c310ee496a6c72585c2b81e417a8c56e4aeebc480d5586e971b5fb5b

Message:

Merge branch 'spielwiese' into develop

File:

• libpolys/polys/monomials/p_polys.h (modified) (10 diffs)

libpolys/polys/monomials/p_polys.h

@@ -213 +213 @@
 // currently only used by Singular/janet
 void      p_SimpleContent(poly p, int s, const ring r);
+number    p_InitContent(poly ph, const ring r);
 #endif
 
@@ -798 +799 @@
 static inline poly p_Copy_noCheck(poly p, const ring r)
 {
-  assume(r != NULL); assume(r->p_Procs != NULL); assume(r->p_Procs->p_Copy != NULL);
+  /*assume(p!=NULL);*/
+  assume(r != NULL);
+  assume(r->p_Procs != NULL);
+  assume(r->p_Procs->p_Copy != NULL);
   return r->p_Procs->p_Copy(p, r);
 }
@@ -805 +809 @@
 static inline poly p_Copy(poly p, const ring r)
 {
-  p_Test(p,r);
-  const poly pp = p_Copy_noCheck(p, r);
-  p_Test(pp,r);
-  return pp;
+  if (p!=NULL)
+  {
+    p_Test(p,r);
+    const poly pp = p_Copy_noCheck(p, r);
+    p_Test(pp,r);
+    return pp;
+  }
+  else
+    return NULL;
 }
 
@@ -824 +833 @@
 }
 
-static inline poly p_LmHead(poly p, const ring r)
-{
-  p_LmCheckPolyRing1(p, r);
-  poly np;
-  omTypeAllocBin(poly, np, r->PolyBin);
-  p_SetRingOfLm(np, r);
-  memcpy(np->exp, p->exp, r->ExpL_Size*sizeof(long));
-  pNext(np) = NULL;
-  pSetCoeff0(np, NULL);
-  return np;
-}
-
 // returns a copy of p with Lm(p) from lmRing and Tail(p) from tailRing
 static inline poly p_Copy(poly p, const ring lmRing, const ring tailRing)
@@ -846 +843 @@
 #endif
     poly pres = p_Head(p, lmRing);
-    pNext(pres) = p_Copy_noCheck(pNext(p), tailRing);
+    if (pNext(p)!=NULL)
+      pNext(pres) = p_Copy_noCheck(pNext(p), tailRing);
     return pres;
   }
@@ -858 +856 @@
   assume( p!= NULL );
   assume( r!= NULL );
-  r->p_Procs->p_Delete(p, r);
+  if ((*p)!=NULL) r->p_Procs->p_Delete(p, r);
 }
 
@@ -918 +916 @@
   else if (n_IsZero(n, r->cf))
   {
-    r->p_Procs->p_Delete(&p, r); // NOTE: without p_Delete - memory leak!
+    p_Delete(&p, r); // NOTE: without p_Delete - memory leak!
     return NULL;
   }
@@ -1053 +1051 @@
   if (p == NULL)
   {
-    r->p_Procs->p_Delete(&q, r);
+    p_Delete(&q, r);
     return NULL;
   }
   if (q == NULL)
   {
-    r->p_Procs->p_Delete(&p, r);
+    p_Delete(&p, r);
     return NULL;
   }
@@ -1071 +1069 @@
       q = r->p_Procs->p_Mult_mm(q, p, r);
 
-    r->p_Procs->p_Delete(&p, r);
+    p_LmDelete(&p, r);
     return q;
   }
@@ -1078 +1076 @@
   {
     p = r->p_Procs->p_Mult_mm(p, q, r);
-    r->p_Procs->p_Delete(&q, r);
+    p_LmDelete(&q, r);
     return p;
   }