Changeset 860475 in git

Timestamp:

Apr 25, 2005, 11:19:31 AM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

6fe3a0c91dd5200c93586ade842a529bdc3bbd6e

Parents:

d5bd816e7a2f244105274429818a7d2c90398eee

Message:

*hannes: kill ring dep, variables in correct ring


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

File:

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

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.101 2005-04-22 17:57:01 levandov Exp $ */
+/* $Id: ipshell.cc,v 1.102 2005-04-25 09:19:31 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -241 +241 @@
 }
 
-static void killlocals0(int v, idhdl * localhdl)
+static void killlocals0(int v, idhdl * localhdl, const ring r)
 {
   idhdl h = *localhdl;
@@ -263 +263 @@
       {
         idhdl nexth = IDNEXT(h);
-        killhdl2(h,localhdl,currRing);
+        killhdl2(h,localhdl,r);
         h = nexth;
         //PrintS("kill\n");
@@ -278 +278 @@
 void killlocals(int v)
 {
-  killlocals0(v,&IDROOT);
+  killlocals0(v,&IDROOT,currRing);
 
   if ((iiRETURNEXPR_len > myynest)
@@ -285 +285 @@
   {
     leftv h=&iiRETURNEXPR[myynest];
-    killlocals0(v,&(((ring)h->data)->idroot));
+    killlocals0(v,&(((ring)h->data)->idroot),(ring)h->data);
   }
 
@@ -300 +300 @@
     {
       if (IDRING(h)!=currRing) {changed=TRUE;rSetHdl(h);}
-      killlocals0(v,&(IDRING(h)->idroot));
+      killlocals0(v,&(IDRING(h)->idroot),IDRING(h));
     }
     else if (IDTYP(h) == PACKAGE_CMD)
     {
-      killlocals0(v,&(IDPACKAGE(h)->idroot));
+      killlocals0(v,&(IDPACKAGE(h)->idroot),IDRING(h));
     }
     h = IDNEXT(h);
@@ -375 +375 @@
     {
       if (d!=currRing) {changed=TRUE;rChangeCurrRing((ring)d);}
-      killlocals0(v,&(((ring)h->data)->idroot));
+      killlocals0(v,&(((ring)h->data)->idroot),(ring)h->data);
     }
     else if (h->rtyp==LIST_CMD)
@@ -400 +400 @@
       leftv h=&iiRETURNEXPR[myynest];
       if (((ring)h->data)->idroot!=NULL)
-        killlocals0(v,&(((ring)h->data)->idroot));
+        killlocals0(v,&(((ring)h->data)->idroot),(ring)h->data);
     }
     else if (/*iiRETURNEXPR[myynest].Typ()*/ t==LIST_CMD)