Changeset daeb6d in git for Singular/ipid.cc

Timestamp:

Oct 22, 1998, 2:26:17 PM (26 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

c6217051c24f5239a0f05fbcbf54346d4765c2e5

Parents:

f78e2660572d74fc77f51e15288a9f225a21bd10

Message:

 	tesths.cc subexpr.h subexpr.cc ipshell.h ipshell.cc iplib.cc
 	ipid.h ipid.cc ipassign.cc iparith.cc ChangeLog
	  - Added assignment <package>=<package> via ref-counter
	    rewriten killhdl for packages
	  - Added libname,language to packages
	  - exportto(Up,...) 'Up' defined in syMake
	  - listvar() shows toplevel-packages too.


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

File:

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

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.20 1998-10-21 15:56:05 Singular Exp $ */
+/* $Id: ipid.cc,v 1.21 1998-10-22 12:26:14 krueger Exp $ */
 
 /*
@@ -37 +37 @@
 char* iiNoName="_";
 
+void paCleanUp(package pack);
+BOOLEAN paKill(package pack, BOOLEAN force_top=FALSE);
+
 /*0 implementation*/
 
@@ -173 +176 @@
       IDPROC(h)->language=LANG_NONE;
     }
+    else if (t == PACKAGE_CMD)
+    {
+      IDPACKAGE(h)->language=LANG_NONE;
+    }
+
   }
   // --------------------------------------------------------
@@ -208 +216 @@
 #endif
 #ifdef HAVE_NAMESPACES
-        if(strcmp(s,"Top")==0) {
-        Warn("identifier `%s` in use",s);
-        return(h);
-      }
+        if(t==PACKAGE_CMD && strcmp(s,"Top")==0) {
+          Warn("identifier `%s` in use",s);
+          return(h);
+        }
 #endif /* HAVE_NAMESPACES */
         if (s==IDID(h))
@@ -350 +358 @@
   }
   // ring / qring  --------------------------------------------------------
-  // package  -------------------------------------------------------------
   if ((IDTYP(h) == RING_CMD) || (IDTYP(h) == QRING_CMD))
   {
@@ -394 +401 @@
   // package -------------------------------------------------------------
   else if (IDTYP(h) == PACKAGE_CMD) {
-    package pack = IDPACKAGE(h);
-    if(!checkPackage(pack)) return;
-    idhdl hdh = pack->idroot;
-    //idhdl  hdh = IDNEXT(*hd);
-    idhdl  temp;
-    //Print(">>>>>>Free package\n");
-    while (hdh!=NULL)
-    {
-      temp = IDNEXT(hdh);
-      //Print("killing %s\n", IDID(hdh));
-      killhdl(hdh,&(IDPACKAGE(h)->idroot));
-      hdh = temp;
-    }
-    //Print("killing last %s\n", IDID(*hd));
-    //killhdl(*hd,hd);
-    //Print(">>>>>>Free package... done\n");
+    if(IDPACKAGE(h)->language!=LANG_TOP) {
+      if(!paKill(IDPACKAGE(h))) return;
+    } else {
+      if(strcmp(IDID(h), "Top")!=0) {
+        if(!paKill(IDPACKAGE(h))) return;
+      }
+      else {
+        if(!paKill(IDPACKAGE(h), TRUE)) return;
+      }
+    }
   }
   // pointer -------------------------------------------------------------
@@ -690 +691 @@
   if (pi->ref <= 0)
     Free((ADDRESS)pi, sizeof(procinfo));
+}
+
+void paCleanUp(package pack)
+{
+  (pack->ref)--;
+  if (pack->ref < 0)
+  {
+    if( pack->language == LANG_C)
+    {
+      Print("//dclose(%s)\n",pack->libname);
+      
+    }
+    FreeL((ADDRESS)pack->libname);
+    memset((void *) pack, 0, sizeof(package));
+    pack->language=LANG_NONE;
+  }
+}
+
+BOOLEAN paKill(package pack, BOOLEAN force_top)
+{
+  if (pack->ref <= 0 || force_top) {
+    idhdl hdh = pack->idroot;
+    idhdl temp;
+    while (hdh!=NULL)
+    {
+      temp = IDNEXT(hdh);
+      if((IDTYP(hdh)!=PACKAGE_CMD) ||
+         (IDTYP(hdh)==PACKAGE_CMD && IDPACKAGE(hdh)->language!=LANG_TOP) ||
+         (IDTYP(hdh)==PACKAGE_CMD && IDPACKAGE(hdh)->language==LANG_TOP &&
+         IDPACKAGE(hdh)->ref>0 ))
+        killhdl(hdh,&(pack->idroot));
+      hdh = temp;
+    }
+    if(checkPackage(pack)) {
+      paCleanUp(pack);
+      Free((ADDRESS)pack, sizeof(package));
+    } else return FALSE;
+  } else paCleanUp(pack);
+  return TRUE;
 }
 
@@ -857 +897 @@
   }
   if (nshdl->pack==pack) {
+    //Print("NSstack: %s:%d, nesting=%d\n", nshdl->name, nshdl->lev, nshdl->myynest);
     Warn("package '%s' still in use on level %d",nshdl->name, nshdl->lev);
     return FALSE;