Changeset 9e79fc in git

Timestamp:

Jan 11, 2008, 11:56:45 AM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

9c6f160523432eef41813f0d4f8f9a8aafb16b12

Parents:

1d4fb86f60448d39f742d75967367631c7b45ee5

Message:

*hannes: clean up ring objects ->rKill


git-svn-id: file:///usr/local/Singular/svn/trunk@10502 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• ipid.cc (modified) (2 diffs)
• ipshell.cc (modified) (2 diffs)

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.81 2007-04-19 12:05:39 Singular Exp $ */
+/* $Id: ipid.cc,v 1.82 2008-01-11 10:56:45 Singular Exp $ */
 
 /*
@@ -551 +551 @@
   if ((IDTYP(h) == RING_CMD) || (IDTYP(h) == QRING_CMD))
   {
-    // any objects defined for this ring ?
-    // Hmm ... why only for rings and not for qrings??
-    // if (((IDTYP(h)==RING_CMD) && (IDRING(h)->ref<=0))
-    if ((IDRING(h)->ref<=0)  &&  (IDRING(h)->idroot!=NULL))
-    {
-      idhdl * hd = &IDRING(h)->idroot;
-      idhdl  hdh = IDNEXT(*hd);
-      idhdl  temp;
-      if (IDRING(h)==currRing) //we are not killing the base ring, so switch
-      {
-        // we are killing the basering, so: make sure that
-        // sLastPrinted is killed before this ring is destroyed
-        if (((sLastPrinted.rtyp>BEGIN_RING) && (sLastPrinted.rtyp<END_RING))
-        || ((sLastPrinted.rtyp==LIST_CMD)&&(lRingDependend((lists)sLastPrinted.data))))
-        {
-          sLastPrinted.CleanUp();
-        }
-      }
-      while (hdh!=NULL)
-      {
-        temp = IDNEXT(hdh);
-        killhdl2(hdh,&(IDRING(h)->idroot),IDRING(h));
-        hdh = temp;
-      }
-      killhdl2(*hd,hd,IDRING(h));
-    }
+    // any objects defined for this ring ? -> done by rKill
+    
     rKill(h);
   }

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.171 2007-11-16 18:37:30 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.172 2008-01-11 10:56:45 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -4734 +4734 @@
     }
 #endif /* USE_IILOCALRING */
+// any variables depending on r ?
+    while (r->idroot!=NULL)
+    {
+      killhdl2(r->idroot,&(r->idroot),r);
+    }
 
     /* nKillChar(r); will be called from inside of rDelete */