Changeset a3bc95e in git for Singular/ipshell.cc

Timestamp:

Oct 9, 2001, 6:36:27 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

7497ef3773fc1afff892546445b1d82b1cf0fb05

Parents:

e58c4abd91b68d128331a23f3f9dd76dff924048

Message:

*hannes: namespaces ->ns


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

File:

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

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.67 2001-09-27 13:13:03 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.68 2001-10-09 16:36:06 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -244 +244 @@
       {
         idhdl nexth = IDNEXT(h);
-        killhdl(h,localhdl);
+        killhdl2(h,localhdl);
         h = nexth;
         //PrintS("kill\n");
@@ -259 +259 @@
 void killlocals(int v)
 {
+#ifndef HAVE_NS
   killlocals0(v,&IDROOT);
+#else
+  killlocals0(v,&(currPack->idroot));
+  if (currPack!=basePack)
+  {
+    //PrintS("killlocals in Top\n");
+    killlocals0(v,&(basePack->idroot));
+  }
+#endif
 
   if ((iiRETURNEXPR_len > myynest)
@@ -270 +279 @@
 
   idhdl sh=currRingHdl;
+  ring sr=currRing;
   BOOLEAN changed=FALSE;
 #ifndef HAVE_NAMESPACES
+#ifdef HAVE_NS
+  idhdl h = currPack->idroot;
+#else
   idhdl h = IDROOT;
-
+#endif
+
+//  Print("killlocals in %s\n",IDID(currPackHdl));
   while (h!=NULL)
   {
@@ -279 +294 @@
     && (IDRING(h)->idroot!=NULL))
     {
-      if (h!=currRingHdl) {changed=TRUE;rSetHdl(h);}
+      if (IDRING(h)!=currRing) {changed=TRUE;rSetHdl(h);}
       killlocals0(v,&(IDRING(h)->idroot));
     }
     h = IDNEXT(h);
   }
+#ifdef HAVE_NS
+  if (currPack!=basePack)
+  {
+    //PrintS("killlocals in Top\n");
+    h=basePack->idroot;
+    while (h!=NULL)
+    {
+      if (((IDTYP(h)==QRING_CMD) || (IDTYP(h) == RING_CMD))
+      && (IDRING(h)->idroot!=NULL))
+      {
+        //Print("go to %s\n",IDID(h));
+        if (IDRING(h)!=currRing) {changed=TRUE;rSetHdl(h);}
+        killlocals0(v,&(IDRING(h)->idroot));
+      }
+      h = IDNEXT(h);
+    }
+  }
+#endif
 #else
   idhdl h = NSROOT(namespaceroot->root);
@@ -322 +355 @@
     currRingHdl=NULL;
     if (sh!=NULL) rSetHdl(sh);
+    else if (sr!=NULL)
+    {
+      sh=rFindHdl(sr,NULL,NULL);
+      rSetHdl(sh);
+    }
   }
 
   if (myynest<=1) iiNoKeepRing=TRUE;
+  //Print("end killlocals  >= %d\n",v);
+  //listall();
 }
 
@@ -613 +653 @@
 #else
   r=IDROOT->get(theMap->preimage,myynest);
+#ifdef HAVE_NS
+  if ((currPack!=basePack)
+  &&((r==NULL) || ((r->typ != RING_CMD) && (r->typ != QRING_CMD))))
+    r=basePack->idroot->get(theMap->preimage,myynest);
+#endif /* HAVE_NS */
 #endif /* HAVE_NAMESPACES */
   if ((r!=NULL) && ((r->typ == RING_CMD) || (r->typ== QRING_CMD)))
@@ -887 +932 @@
 #endif /* HAVE_NAMESPACES */
     {
+      if (name->rtyp==IDHDL) { id=omStrDup(id); }
       sy->data = (char *)enterid(id,lev,t,root,init_b);
     }
@@ -959 +1005 @@
             if (iiLocalRing[0]==IDRING(h)) iiLocalRing[0]=NULL;
 #else
+#endif
             proclevel *p=procstack;
             while (p->next!=NULL) p=p->next;
@@ -966 +1013 @@
               p->currRingHdl=NULL;
             }
-#endif
-        killhdl(h,root);
+//#endif
+        killhdl2(h,root);
       }
       else
@@ -1094 +1141 @@
 BOOLEAN iiExport (leftv v, int toLev)
 {
+  checkall();
   BOOLEAN nok=FALSE;
   leftv r=v;
@@ -1114 +1162 @@
   }
   r->CleanUp();
+  checkall();
   return nok;
 }
@@ -1142 +1191 @@
             Warn("redefining %s",IDID(old));
           }
-          killhdl(old,&root);
+          killhdl2(old,&root);
         }
         else
@@ -1165 +1214 @@
 BOOLEAN iiExport (leftv v, int toLev, idhdl root)
 {
+  checkall();
   BOOLEAN nok=FALSE;
   leftv rv=v;
@@ -1186 +1236 @@
             Warn("redefining %s",IDID(old));
           }
-          killhdl(old,&root);
+          killhdl2(old,&root);
         }
         else
@@ -1203 +1253 @@
   }
   rv->CleanUp();
+  checkall();
   return nok;
 }