Changeset 0492330 in git

Timestamp:

Nov 16, 2006, 5:07:49 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

8c68cd1d8f1630049e7aa6a73f991bd6ff47ff09

Parents:

84375a9ec076945718aaeff4eda7ff2df15f6cd9

Message:

*hannes: kill list in ring


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

File:

• Singular/ipid.cc (modified) (4 diffs)

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.75 2006-05-29 16:10:50 Singular Exp $ */
+/* $Id: ipid.cc,v 1.76 2006-11-16 16:07:49 Singular Exp $ */
 
 /*
@@ -435 +435 @@
 }
 
+#ifndef HAVE_NS
 void killhdl(idhdl h)
 {
   int t=IDTYP(h);
-  if ((BEGIN_RING<t) && (t<END_RING) && (t!=QRING_CMD))
+  if (((BEGIN_RING<t) && (t<END_RING) && (t!=QRING_CMD))
+  || ((t==LIST_CMD) && (lRingDependend((lists)IDDATA(h)))))
     killhdl2(h,&currRing->idroot,currRing);
   else
   {
-#ifdef HAVE_NS
-    if(t==PACKAGE_CMD)
-    {
-      killhdl2(h,&(basePack->idroot),NULL);
-    }
-    else
-    {
-      idhdl s=currPack->idroot;
-      while ((s!=h) && (s!=NULL)) s=s->next;
-      if (s!=NULL)
-        killhdl2(h,&(currPack->idroot),NULL);
-      else if (basePack!=currPack)
-      {
-        idhdl s=basePack->idroot;
-        while ((s!=h) && (s!=NULL)) s=s->next;
-        if (s!=NULL)
-          killhdl2(h,&(basePack->idroot),currRing);
-        else
-          killhdl2(h,&(currRing->idroot),currRing);
-       }
-    }
-#else /* HAVE_NS */
+//#ifdef HAVE_NS
+//    if(t==PACKAGE_CMD)
+//    {
+//      killhdl2(h,&(basePack->idroot),NULL);
+//    }
+//    else
+//    {
+//      idhdl s=currPack->idroot;
+//      while ((s!=h) && (s!=NULL)) s=s->next;
+//      if (s!=NULL)
+//        killhdl2(h,&(currPack->idroot),NULL);
+//      else if (basePack!=currPack)
+//      {
+//        idhdl s=basePack->idroot;
+//        while ((s!=h) && (s!=NULL)) s=s->next;
+//        if (s!=NULL)
+//          killhdl2(h,&(basePack->idroot),currRing);
+//        else
+//          killhdl2(h,&(currRing->idroot),currRing);
+//       }
+//    }
+//#else /* HAVE_NS */
     {
       idhdl s=IDROOT;
@@ -470 +472 @@
       else killhdl2(h,&IDROOT,currRing);
     }
-#endif /* HAVE_NS */
-  }
-}
+//#endif /* HAVE_NS */
+  }
+}
+#endif
 
 #ifdef HAVE_NS
@@ -478 +481 @@
 {
   int t=IDTYP(h);
-  if ((BEGIN_RING<t) && (t<END_RING) && (t!=QRING_CMD))
+  if (((BEGIN_RING<t) && (t<END_RING) && (t!=QRING_CMD))
+  || ((t==LIST_CMD) && (lRingDependend((lists)IDDATA(h)))))
     killhdl2(h,&currRing->idroot,currRing);
   else