FIX: libpolys and kernel should use rDelete instead of rKill!

Oleksandr Motsak · mohamed-barakat · commit 5fe8340bb506 · 2011-11-09T16:12:28.000+01:00
diff --git a/kernel/ideals.cc b/kernel/ideals.cc
@@ -280,7 +280,7 @@ ideal idSectWithElim (ideal h1,ideal h2)
   idDelete(&h);
   res=idrMoveR(res,r,origRing);
   rChangeCurrRing(origRing);
-  rKill(r);
+  rDelete(r);
   return res;
 }
 /*2
@@ -400,7 +400,7 @@ ideal idSect (ideal h1,ideal h2)
     rChangeCurrRing(syz_ring);
     idDelete(&temp1);
     rChangeCurrRing(orig_ring);
-    rKill(syz_ring);
+    rDelete(syz_ring);
   }
   else
   {
@@ -529,7 +529,7 @@ ideal idMultSect(resolvente arg, int length)
   if(syz_ring!=orig_ring)
   {
     rChangeCurrRing(orig_ring);
-    rKill(syz_ring);
+    rDelete(syz_ring);
   }
   idSkipZeroes(result);
   return result;
@@ -707,7 +707,7 @@ ideal idSyzygies (ideal  h1, tHomog h,intvec **w, BOOLEAN setSyzComp,
     s_h3->rank -= k;
     rChangeCurrRing(orig_ring);
     s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
-    rKill(syz_ring);
+    rDelete(syz_ring);
     #ifdef HAVE_PLURAL
     if (rIsPluralRing(currRing))
     {
@@ -765,7 +765,7 @@ ideal idSyzygies (ideal  h1, tHomog h,intvec **w, BOOLEAN setSyzComp,
     if (dp_C_ring != syz_ring)
     {
       rChangeCurrRing(syz_ring);
-      rKill(dp_C_ring);
+      rDelete(dp_C_ring);
     }
   }
   else
@@ -818,7 +818,7 @@ ideal idXXX (ideal  h1, int k)
     idSkipZeroes(s_h3);
     rChangeCurrRing(orig_ring);
     s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
-    rKill(syz_ring);
+    rDelete(syz_ring);
     idTest(s_h3);
     return s_h3;
   }
@@ -981,7 +981,7 @@ ideal idLiftStd (ideal  h1, matrix* ma, tHomog hi, ideal * syz)
     }
   }
 
-  if (syz_ring!=orig_ring) rKill(syz_ring);
+  if (syz_ring!=orig_ring) rDelete(syz_ring);
   verbose = save_verbose;
   return s_h3;
 }
@@ -1184,7 +1184,7 @@ ideal idLift(ideal mod, ideal submod,ideal *rest, BOOLEAN goodShape,
     rChangeCurrRing(orig_ring);
     s_result = idrMoveR_NoSort(s_result, syz_ring, orig_ring);
     s_rest = idrMoveR_NoSort(s_rest, syz_ring, orig_ring);
-    rKill(syz_ring);
+    rDelete(syz_ring);
   }
   if (rest!=NULL)
     *rest = s_rest;
@@ -1488,7 +1488,7 @@ ideal idQuot (ideal  h1, ideal h2, BOOLEAN h1IsStb, BOOLEAN resultIsIdeal)
   {
     rChangeCurrRing(orig_ring);
     s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
-    rKill(syz_ring);
+    rDelete(syz_ring);
   }
   idSkipZeroes(s_h3);
   idTest(s_h3);
@@ -2092,7 +2092,7 @@ static ideal idHandleIdealOp(ideal arg,int syzcomp,int isIdeal=FALSE)
     rChangeCurrRing(syz_ring);
     idDelete(&s_temp1);
     rChangeCurrRing(orig_ring);
-    rKill(syz_ring);
+    rDelete(syz_ring);
   }
 
   for (i=0;i<IDELEMS(temp1);i++)
@@ -2235,7 +2235,7 @@ ideal idModulo (ideal h2,ideal h1, tHomog hom, intvec ** w)
   {
     rChangeCurrRing(orig_ring);
     s_temp1 = idrMoveR_NoSort(s_temp1, syz_ring, orig_ring);
-    rKill(syz_ring);
+    rDelete(syz_ring);
     // Hmm ... here seems to be a memory leak
     // However, simply deleting it causes memory trouble
     // idDelete(&s_temp);
diff --git a/kernel/nc.cc b/kernel/nc.cc
@@ -358,7 +358,7 @@ ideal Approx_Step(ideal L)
         rChangeCurrRing(orig_ring);
         //  s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
         s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
-        rKill(syz_ring);
+        rDelete(syz_ring);
       }
       idTest(s_h3);
       S[syzcnt]=kStd(s_h3,currQuotient,(tHomog)FALSE,NULL,NULL);
diff --git a/kernel/preimage.cc b/kernel/preimage.cc
@@ -165,7 +165,7 @@ ideal maGetPreimage(ring theImageRing, map theMap, ideal id, const ring dst_r)
   }
   id_Delete(&temp2, tmpR);
   idSkipZeroes(temp1);
-  rKill(tmpR);
+  rDelete(tmpR);
   return temp1;
 }
 
diff --git a/kernel/syz.cc b/kernel/syz.cc
@@ -610,7 +610,7 @@ resolvente syResolvente(ideal arg, int maxlength, int * length,
     {
       res[i] = idrMoveR_NoSort(res[i], syz_ring, origR);
     }
-    rKill(syz_ring);
+    rDelete(syz_ring);
   }
   return res;
 }
diff --git a/kernel/syz0.cc b/kernel/syz0.cc
@@ -975,7 +975,7 @@ resolvente sySchreyerResolvente(ideal arg, int maxlength, int * length,
       syzIndex++;
     }
 //    j = 0; while (currRing->order[j]!=0) j++; // What was this for???!
-    rKill(syRing);
+    rDelete(syRing);
   }
   else
   {
diff --git a/kernel/syz1.cc b/kernel/syz1.cc
@@ -1646,7 +1646,7 @@ void syKillComputation(syStrategy syzstr, ring r)
       if(syzstr->syRing->typ[1].ord_typ == ro_syzcomp)
         rChangeSComps(NULL, NULL, 0, syzstr->syRing);
 
-      rKill(syzstr->syRing);
+      rDelete(syzstr->syRing);
     }
     omFreeSize((ADDRESS)syzstr, sizeof(ssyStrategy));
   }
diff --git a/kernel/syz3.cc b/kernel/syz3.cc
@@ -1891,7 +1891,7 @@ syStrategy syKosz(ideal arg,int * length)
           omFreeSize((ADDRESS)res,len*sizeof(ideal));
           idDelete(&initial);
           rChangeCurrRing(syzstr->syRing);
-          rKill(dp_C_ring);
+          rDelete(dp_C_ring);
         }
 #endif
 #endif
@@ -2021,7 +2021,7 @@ syStrategy syKosz(ideal arg,int * length)
   }
   delete syzstr->Tl;
   syzstr->Tl = NULL;
-  rKill(syzstr->syRing);
+  rDelete(syzstr->syRing);
   syzstr->syRing = NULL;
   omFreeSize((ADDRESS)totake,(*length+1)*sizeof(ideal));
   omFreeSize((ADDRESS)syzstr->orderedRes,(*length+1)*sizeof(ideal));
diff --git a/kernel/tgb.cc b/kernel/tgb.cc
@@ -3611,7 +3611,7 @@ ideal t_rep_gb (ring r, ideal arg_I, int syz_comp, BOOLEAN F4_mode)
 
     idTest (result);
     //rChangeCurrRing(new_ring);
-    rKill (new_ring);
+    rDelete(new_ring);
     //rChangeCurrRing(orig_ring);
   }
   else
diff --git a/kernel/walkMain.cc b/kernel/walkMain.cc
@@ -184,7 +184,7 @@ WalkState walkStep64(ideal & G,int64vec* currw64, int step){
     //PrintS("  lift for initial forms done\n");
 
   ideal nextG=idrMoveR(G,oldRing,currRing);
-  rKill(oldRing);
+  rDelete(oldRing);
 
   matrix nextGmat=(matrix)nextG;
 
diff --git a/libpolys/polys/monomials/ring.h b/libpolys/polys/monomials/ring.h
@@ -344,8 +344,8 @@ ring   rDefault(const coeffs cf, int N, char **n,int ord_size, int *ord, int *bl
 // #define rIsRingVar(A) r_IsRingVar(A,currRing)
 int    r_IsRingVar(const char *n, ring r);
 void   rWrite(ring r);
-//void   rKill(idhdl h);
-void   rKill(ring r);
+// void   rKill(idhdl h);
+// void   rKill(ring r);
 ring   rCopy(ring r);
 ring   rCopy0(const ring r, BOOLEAN copy_qideal = TRUE, BOOLEAN copy_ordering = TRUE);
 ring rCopy0AndAddA(ring r, int64vec *wv64, BOOLEAN copy_qideal = TRUE,
@@ -740,7 +740,8 @@ BOOLEAN rSetISReference(const ring r, const ideal F, const int i = 0, const int
 
 BOOLEAN rCheckIV(intvec *iv);
 int rTypeOfMatrixOrder(intvec * order);
-void rDelete(ring r);
+
+void rDelete(ring r); // To be used instead of rKill!
 
 extern omBin sip_sring_bin;
 #endif

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ ideal idSectWithElim (ideal h1,ideal h2)`
`280`	`280`	`idDelete(&h);`
`281`	`281`	`res=idrMoveR(res,r,origRing);`
`282`	`282`	`rChangeCurrRing(origRing);`
`283`		`- rKill(r);`
	`283`	`+ rDelete(r);`
`284`	`284`	`return res;`
`285`	`285`	`}`
`286`	`286`	`/*2`
`@@ -400,7 +400,7 @@ ideal idSect (ideal h1,ideal h2)`
`400`	`400`	`rChangeCurrRing(syz_ring);`
`401`	`401`	`idDelete(&temp1);`
`402`	`402`	`rChangeCurrRing(orig_ring);`
`403`		`- rKill(syz_ring);`
	`403`	`+ rDelete(syz_ring);`
`404`	`404`	`}`
`405`	`405`	`else`
`406`	`406`	`{`
`@@ -529,7 +529,7 @@ ideal idMultSect(resolvente arg, int length)`
`529`	`529`	`if(syz_ring!=orig_ring)`
`530`	`530`	`{`
`531`	`531`	`rChangeCurrRing(orig_ring);`
`532`		`- rKill(syz_ring);`
	`532`	`+ rDelete(syz_ring);`
`533`	`533`	`}`
`534`	`534`	`idSkipZeroes(result);`
`535`	`535`	`return result;`
`@@ -707,7 +707,7 @@ ideal idSyzygies (ideal h1, tHomog h,intvec **w, BOOLEAN setSyzComp,`
`707`	`707`	`s_h3->rank -= k;`
`708`	`708`	`rChangeCurrRing(orig_ring);`
`709`	`709`	`s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);`
`710`		`- rKill(syz_ring);`
	`710`	`+ rDelete(syz_ring);`
`711`	`711`	`#ifdef HAVE_PLURAL`
`712`	`712`	`if (rIsPluralRing(currRing))`
`713`	`713`	`{`
`@@ -765,7 +765,7 @@ ideal idSyzygies (ideal h1, tHomog h,intvec **w, BOOLEAN setSyzComp,`
`765`	`765`	`if (dp_C_ring != syz_ring)`
`766`	`766`	`{`
`767`	`767`	`rChangeCurrRing(syz_ring);`
`768`		`- rKill(dp_C_ring);`
	`768`	`+ rDelete(dp_C_ring);`
`769`	`769`	`}`
`770`	`770`	`}`
`771`	`771`	`else`
`@@ -818,7 +818,7 @@ ideal idXXX (ideal h1, int k)`
`818`	`818`	`idSkipZeroes(s_h3);`
`819`	`819`	`rChangeCurrRing(orig_ring);`
`820`	`820`	`s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);`
`821`		`- rKill(syz_ring);`
	`821`	`+ rDelete(syz_ring);`
`822`	`822`	`idTest(s_h3);`
`823`	`823`	`return s_h3;`
`824`	`824`	`}`
`@@ -981,7 +981,7 @@ ideal idLiftStd (ideal h1, matrix* ma, tHomog hi, ideal * syz)`
`981`	`981`	`}`
`982`	`982`	`}`
`983`	`983`
`984`		`- if (syz_ring!=orig_ring) rKill(syz_ring);`
	`984`	`+ if (syz_ring!=orig_ring) rDelete(syz_ring);`
`985`	`985`	`verbose = save_verbose;`
`986`	`986`	`return s_h3;`
`987`	`987`	`}`
`@@ -1184,7 +1184,7 @@ ideal idLift(ideal mod, ideal submod,ideal *rest, BOOLEAN goodShape,`
`1184`	`1184`	`rChangeCurrRing(orig_ring);`
`1185`	`1185`	`s_result = idrMoveR_NoSort(s_result, syz_ring, orig_ring);`
`1186`	`1186`	`s_rest = idrMoveR_NoSort(s_rest, syz_ring, orig_ring);`
`1187`		`- rKill(syz_ring);`
	`1187`	`+ rDelete(syz_ring);`
`1188`	`1188`	`}`
`1189`	`1189`	`if (rest!=NULL)`
`1190`	`1190`	`*rest = s_rest;`
`@@ -1488,7 +1488,7 @@ ideal idQuot (ideal h1, ideal h2, BOOLEAN h1IsStb, BOOLEAN resultIsIdeal)`
`1488`	`1488`	`{`
`1489`	`1489`	`rChangeCurrRing(orig_ring);`
`1490`	`1490`	`s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);`
`1491`		`- rKill(syz_ring);`
	`1491`	`+ rDelete(syz_ring);`
`1492`	`1492`	`}`
`1493`	`1493`	`idSkipZeroes(s_h3);`
`1494`	`1494`	`idTest(s_h3);`
`@@ -2092,7 +2092,7 @@ static ideal idHandleIdealOp(ideal arg,int syzcomp,int isIdeal=FALSE)`
`2092`	`2092`	`rChangeCurrRing(syz_ring);`
`2093`	`2093`	`idDelete(&s_temp1);`
`2094`	`2094`	`rChangeCurrRing(orig_ring);`
`2095`		`- rKill(syz_ring);`
	`2095`	`+ rDelete(syz_ring);`
`2096`	`2096`	`}`
`2097`	`2097`
`2098`	`2098`	`for (i=0;i<IDELEMS(temp1);i++)`
`@@ -2235,7 +2235,7 @@ ideal idModulo (ideal h2,ideal h1, tHomog hom, intvec ** w)`
`2235`	`2235`	`{`
`2236`	`2236`	`rChangeCurrRing(orig_ring);`
`2237`	`2237`	`s_temp1 = idrMoveR_NoSort(s_temp1, syz_ring, orig_ring);`
`2238`		`- rKill(syz_ring);`
	`2238`	`+ rDelete(syz_ring);`
`2239`	`2239`	`// Hmm ... here seems to be a memory leak`
`2240`	`2240`	`// However, simply deleting it causes memory trouble`
`2241`	`2241`	`// idDelete(&s_temp);`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ ideal Approx_Step(ideal L)`
`358`	`358`	`rChangeCurrRing(orig_ring);`
`359`	`359`	`// s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);`
`360`	`360`	`s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);`
`361`		`- rKill(syz_ring);`
	`361`	`+ rDelete(syz_ring);`
`362`	`362`	`}`
`363`	`363`	`idTest(s_h3);`
`364`	`364`	`S[syzcnt]=kStd(s_h3,currQuotient,(tHomog)FALSE,NULL,NULL);`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ ideal maGetPreimage(ring theImageRing, map theMap, ideal id, const ring dst_r)`
`165`	`165`	`}`
`166`	`166`	`id_Delete(&temp2, tmpR);`
`167`	`167`	`idSkipZeroes(temp1);`
`168`		`- rKill(tmpR);`
	`168`	`+ rDelete(tmpR);`
`169`	`169`	`return temp1;`
`170`	`170`	`}`
`171`	`171`
Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,7 @@ resolvente syResolvente(ideal arg, int maxlength, int * length,`
`610`	`610`	`{`
`611`	`611`	`res[i] = idrMoveR_NoSort(res[i], syz_ring, origR);`
`612`	`612`	`}`
`613`		`- rKill(syz_ring);`
	`613`	`+ rDelete(syz_ring);`
`614`	`614`	`}`
`615`	`615`	`return res;`
`616`	`616`	`}`
Original file line number	Diff line number	Diff line change
`@@ -975,7 +975,7 @@ resolvente sySchreyerResolvente(ideal arg, int maxlength, int * length,`
`975`	`975`	`syzIndex++;`
`976`	`976`	`}`
`977`	`977`	`// j = 0; while (currRing->order[j]!=0) j++; // What was this for???!`
`978`		`- rKill(syRing);`
	`978`	`+ rDelete(syRing);`
`979`	`979`	`}`
`980`	`980`	`else`
`981`	`981`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1646,7 +1646,7 @@ void syKillComputation(syStrategy syzstr, ring r)`
`1646`	`1646`	`if(syzstr->syRing->typ[1].ord_typ == ro_syzcomp)`
`1647`	`1647`	`rChangeSComps(NULL, NULL, 0, syzstr->syRing);`
`1648`	`1648`
`1649`		`- rKill(syzstr->syRing);`
	`1649`	`+ rDelete(syzstr->syRing);`
`1650`	`1650`	`}`
`1651`	`1651`	`omFreeSize((ADDRESS)syzstr, sizeof(ssyStrategy));`
`1652`	`1652`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3611,7 +3611,7 @@ ideal t_rep_gb (ring r, ideal arg_I, int syz_comp, BOOLEAN F4_mode)`
`3611`	`3611`
`3612`	`3612`	`idTest (result);`
`3613`	`3613`	`//rChangeCurrRing(new_ring);`
`3614`		`- rKill (new_ring);`
	`3614`	`+ rDelete(new_ring);`
`3615`	`3615`	`//rChangeCurrRing(orig_ring);`
`3616`	`3616`	`}`
`3617`	`3617`	`else`