Changeset 61c85ae in git

Timestamp:

Mar 8, 2017, 5:54:10 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

5cc0fd21d7f549ea951ad44d836a08bb7bc146e5

Parents:

43fb497b3647d8eb6ab43424608bb388555ff96e

Message:

fix: move CleanUp for converted stuff to iiConvert

Location:

Singular

Files:

• iparith.cc (modified) (3 diffs)
• ipconv.cc (modified) (4 diffs)

Singular/iparith.cc

@@ -7968 +7968 @@
                 omFreeBin((ADDRESS)an, sleftv_bin);
                 omFreeBin((ADDRESS)bn, sleftv_bin);
-                a->CleanUp();
-                b->CleanUp();
                 return FALSE;
               }
@@ -8198 +8196 @@
               an->CleanUp();
               omFreeBin((ADDRESS)an, sleftv_bin);
-              a->CleanUp();
               return failed;
             }
@@ -8384 +8381 @@
                   omFreeBin((ADDRESS)cn, sleftv_bin);
                   //Print("op: %d,result typ:%d\n",op,res->rtyp);
-                  a->CleanUp();
-                  b->CleanUp();
-                  c->CleanUp();
                   return FALSE;
                 }

Singular/ipconv.cc

@@ -454 +454 @@
             number n=(pGetCoeff((poly)input->data));
             n_Write(n, currRing->cf);
-            (pGetCoeff((poly)input->data))=n;
+            (pGetCoeff((poly)input->data))=n; // n_Write may have changed n
             output->name=StringEndS();
           }
@@ -464 +464 @@
         number n=(number)input->data;
         n_Write(n, currRing->cf);
-        input->data=(void*)n;
+        input->data=(void*)n; // n_Write may have changed n
         output->name=StringEndS();
       }
@@ -471 +471 @@
         /* no need to preserve name: use it */
         output->name=input->name;
-        memset(input,0,sizeof(*input));
+        input->name=NULL;
       }
     }
     output->next=input->next;
     input->next=NULL;
+    if (!errorreported) input->CleanUp();
     return errorreported;
   }
@@ -512 +513 @@
       output->next=input->next;
       input->next=NULL;
-  //if (outputType==MATRIX_CMD) Print("convert %d -> matrix\n",inputType);
+      if ((input->rtyp!=IDHDL) && (input->attribute!=NULL))
+      {
+        input->attribute->killAll(currRing);
+        input->attribute=NULL;
+      }
+      if (input->e!=NULL)
+      {
+        Subexpr h;
+        while (input->e!=NULL)
+        {
+          h=input->e->next;
+          omFreeBin((ADDRESS)input->e, sSubexpr_bin);
+          input->e=h;
+        }
+      }
+      //input->Init(); // seems that input (rtyp?) is still needed
       return FALSE;
     }