Changeset 6f3743 in git for Singular/ipshell.cc

Timestamp:

Jan 7, 2002, 6:19:01 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

692689de70864c2fce92fb4c9b577701c0b415d4

Parents:

a78f216ad977180b2aa143c9f91e2f120df62774

Message:

*hannes: killlocals_rec


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

File:

• Singular/ipshell.cc (modified) (10 diffs)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.69 2001-10-23 14:04:23 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.70 2002-01-07 17:19:01 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -341 +341 @@
 #endif
 #ifdef HAVE_NS
-void killlocals_rec(idhdl *root,BOOLEAN &changed,int v)
+void killlocals_rec(idhdl *root,int v)
 {
   idhdl h=*root;
@@ -350 +350 @@
 //      Print("kill %s, lev %d for lev %d\n",IDID(h),IDLEV(h),v);
       idhdl n=IDNEXT(h);
-      if (((IDTYP(h)==RING_CMD)||(IDTYP(h)==QRING_CMD))
-      && (IDRING(h)==currRing))
-        changed=TRUE;
       killhdl2(h,root);
       h=n;
@@ -360 +357 @@
  //     Print("into pack %s, lev %d for lev %d\n",IDID(h),IDLEV(h),v);
       if (IDPACKAGE(h)!=basePack)
-        killlocals_rec(&(IDRING(h)->idroot),changed,v);
+        killlocals_rec(&(IDRING(h)->idroot),v);
       h=IDNEXT(h);
     }
@@ -371 +368 @@
         if (currRing!=IDRING(h))
         {
-          changed=TRUE;
           ring sr=currRing;
           rChangeCurrRing(IDRING(h)); 
-          killlocals_rec(&(IDRING(h)->idroot),changed,v);
+          killlocals_rec(&(IDRING(h)->idroot),v);
           rChangeCurrRing(sr);
         }
         else
         {
-          killlocals_rec(&(IDRING(h)->idroot),changed,v);
+          killlocals_rec(&(IDRING(h)->idroot),v);
         }
       }
@@ -395 +391 @@
   BOOLEAN changed=FALSE;
   idhdl sh=currRingHdl;
-  if (sh!=NULL) changed=(IDLEV(sh)>=v);
+  if (sh!=NULL) changed=((IDLEV(sh)<v) || (IDRING(sh)->ref>0));
+  //if (changed) Print("currRing=%s(%x), lev=%d,ref=%d\n",IDID(sh),IDRING(sh),IDLEV(sh),IDRING(sh)->ref);
   ring sr=currRing;
 
-  killlocals_rec(&(basePack->idroot),changed,v);
+  killlocals_rec(&(basePack->idroot),v);
 
   if ((iiRETURNEXPR_len > myynest)
@@ -415 +412 @@
     {
       sh=rFindHdl(sr,NULL,NULL);
-      rSetHdl(sh);
+      //if (sh==NULL) { Print("could not find ring %x\n",sr); listall(); }
+      if (sh!=NULL) rSetHdl(sh);
     }
   }
@@ -1080 +1078 @@
     IDLEV(h)=toLev;
     iiNoKeepRing=FALSE;
+    //Print("export %s\n",IDID(h));
   }
   return FALSE;
@@ -1167 +1166 @@
   {
     //Print("// ==> Ringdependent set nesting to 0\n");
-    if(iiInternalExport(v, toLev)) return TRUE;
+    return (iiInternalExport(v, toLev));
   }
   else
@@ -1178 +1177 @@
     {
       idhdl hh=IDROOT;
-      while ((hh->next!=h)&&(hh->next!=NULL))
+      while ((hh!=NULL) && (hh->next!=h))
         hh=hh->next;
-      if (hh->next==h)
+      if ((hh!=NULL) && (hh->next==h))
         hh->next=h->next;
       else