Changeset 9e79fc in git


Ignore:
Timestamp:
Jan 11, 2008, 11:56:45 AM (16 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
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:
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/ipid.cc

    r1d4fb8 r9e79fc  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ipid.cc,v 1.81 2007-04-19 12:05:39 Singular Exp $ */
     4/* $Id: ipid.cc,v 1.82 2008-01-11 10:56:45 Singular Exp $ */
    55
    66/*
     
    551551  if ((IDTYP(h) == RING_CMD) || (IDTYP(h) == QRING_CMD))
    552552  {
    553     // any objects defined for this ring ?
    554     // Hmm ... why only for rings and not for qrings??
    555     // if (((IDTYP(h)==RING_CMD) && (IDRING(h)->ref<=0))
    556     if ((IDRING(h)->ref<=0)  &&  (IDRING(h)->idroot!=NULL))
    557     {
    558       idhdl * hd = &IDRING(h)->idroot;
    559       idhdl  hdh = IDNEXT(*hd);
    560       idhdl  temp;
    561       if (IDRING(h)==currRing) //we are not killing the base ring, so switch
    562       {
    563         // we are killing the basering, so: make sure that
    564         // sLastPrinted is killed before this ring is destroyed
    565         if (((sLastPrinted.rtyp>BEGIN_RING) && (sLastPrinted.rtyp<END_RING))
    566         || ((sLastPrinted.rtyp==LIST_CMD)&&(lRingDependend((lists)sLastPrinted.data))))
    567         {
    568           sLastPrinted.CleanUp();
    569         }
    570       }
    571       while (hdh!=NULL)
    572       {
    573         temp = IDNEXT(hdh);
    574         killhdl2(hdh,&(IDRING(h)->idroot),IDRING(h));
    575         hdh = temp;
    576       }
    577       killhdl2(*hd,hd,IDRING(h));
    578     }
     553    // any objects defined for this ring ? -> done by rKill
     554   
    579555    rKill(h);
    580556  }
  • Singular/ipshell.cc

    r1d4fb8 r9e79fc  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ipshell.cc,v 1.171 2007-11-16 18:37:30 Singular Exp $ */
     4/* $Id: ipshell.cc,v 1.172 2008-01-11 10:56:45 Singular Exp $ */
    55/*
    66* ABSTRACT:
     
    47344734    }
    47354735#endif /* USE_IILOCALRING */
     4736// any variables depending on r ?
     4737    while (r->idroot!=NULL)
     4738    {
     4739      killhdl2(r->idroot,&(r->idroot),r);
     4740    }
    47364741
    47374742    /* nKillChar(r); will be called from inside of rDelete */
Note: See TracChangeset for help on using the changeset viewer.