Changeset bf7dfc in git

Timestamp:

Dec 7, 2012, 4:33:00 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

98bf9ba410cd86cf36196a85fad65238d81947e9

Parents:

ec1006cbd9971c4271d05aefada775ef29d762a6

Message:

fix: newstruct-cleanup without a ring (from master)

Files:

• Singular/newstruct.cc (modified) (3 diffs)
• libpolys/polys/simpleideals.cc (modified) (4 diffs)

Singular/newstruct.cc

@@ -202 +202 @@
 }
 
+void lClean_newstruct(lists l)
+{
+  if (l->nr>=0)
+  {
+    int i;
+    ring r=NULL;
+    for(i=l->nr;i>=0;i--)
+    {
+      if ((i>0) && (l->m[i-1].rtyp==RING_CMD))
+        r=(ring)(l->m[i-1].data);
+      else
+        r=NULL;
+      l->m[i].CleanUp(r);
+    }
+    omFreeSize((ADDRESS)l->m, (l->nr+1)*sizeof(sleftv));
+    l->nr=-1;
+  }
+  omFreeBin((ADDRESS)l,slists_bin);
+}
+
 BOOLEAN newstruct_Assign(leftv l, leftv r)
 {
@@ -243 +263 @@
       {
         lists n1=(lists)l->Data();
-        n1->Clean(); n1=NULL;
+        lClean_newstruct(n1);
       }
       lists n2=(lists)r->Data();
@@ -477 +497 @@
 }
 
-void lClean_newstruct(lists l)
-{
-  if (l->nr>=0)
-  {
-    int i;
-    ring r=NULL;
-    for(i=l->nr;i>=0;i--)
-    {
-      if ((i>0) && (l->m[i-1].rtyp==RING_CMD))
-        r=(ring)(l->m[i-1].data);
-      else
-        r=NULL;
-      l->m[i].CleanUp(r);
-    }
-    omFreeSize((ADDRESS)l->m, (l->nr+1)*sizeof(sleftv));
-    l->nr=-1;
-  }
-  omFreeBin((ADDRESS)l,slists_bin);
-}
-
 void newstruct_destroy(blackbox *b, void *d)
 {

libpolys/polys/simpleideals.cc

@@ -18 +18 @@
 // #include <coeffs/longrat.h>
 #include "matpol.h"
- 
+
 #include "monomials/p_polys.h"
 #include "weight.h"
@@ -121 +121 @@
     do
     {
-      p_Delete(&((*h)->m[--j]), r);
+      j--;
+      poly pp=((*h)->m[j]);
+      if (pp!=NULL) p_Delete(&pp, r);
     }
     while (j>0);
@@ -262 +264 @@
 #else
           if (p_ComparePolys(id->m[i], id->m[j],r)) p_Delete(&id->m[j],r);
-#endif    
+#endif
         }
       }
@@ -364 +366 @@
 #ifdef HAVE_RINGS
           }
-#endif    
+#endif
         }
       }