Changeset 1d46f5 in git

Timestamp:

Apr 17, 2000, 3:58:38 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

c78e8bf1856fddae986219c7747c226eb90cb1c7

Parents:

8e153e5516cee595e5037ab243fc9a0d54dad39e

Message:

* hannes: kill local vars also in returned rings


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

Location:

Singular

Files:

• iplib.cc (modified) (2 diffs)
• ipshell.cc (modified) (3 diffs)

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.71 1999-12-20 16:38:21 krueger Exp $ */
+/* $Id: iplib.cc,v 1.72 2000-04-17 13:58:38 Singular Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -285 +285 @@
   myynest++;
   err=yyparse();
+  //Print("kill locals for %s (level %d)\n",IDID(pn),myynest);
   killlocals(myynest);
+  //Print("end kill locals for %s (%d)\n",IDID(pn),myynest);
   myynest--;
   si_echo=old_echo;

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.53 1999-12-21 15:10:47 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.54 2000-04-17 13:58:38 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -253 +253 @@
 void killlocals(int v)
 {
-#ifndef HAVE_NAMESPACES
   killlocals0(v,&IDROOT);
 
-  idhdl h = IDROOT;
+  if ((iiRETURNEXPR_len > myynest)
+  && ((iiRETURNEXPR[myynest].Typ()==RING_CMD)
+    || (iiRETURNEXPR[myynest].Typ()==QRING_CMD)))
+  {
+    leftv h=&iiRETURNEXPR[myynest];
+    killlocals0(v,&(((ring)h->data)->idroot));
+  }
+
   idhdl sh=currRingHdl;
   BOOLEAN changed=FALSE;
+#ifndef HAVE_NAMESPACES
+  idhdl h = IDROOT;
 
   while (h!=NULL)
@@ -271 +279 @@
   }
 #else
-  killlocals0(v,&IDROOT);
-
   idhdl h = NSROOT(namespaceroot->root);
-  idhdl sh=currRingHdl;
-  BOOLEAN changed=FALSE;
 
   while (h!=NULL)