Changeset d3e630 in git for Singular/ipid.cc

Timestamp:

Jul 28, 2009, 4:19:05 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a07e45cfc61927c5711cee673474fb891d4574ac

Parents:

01cda73e965c4d5da3e4d30eb09639f00d9fbe4d

Message:

*hannes: code cleanup (see ChangeLog)


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

File:

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

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.86 2009-05-05 09:54:38 Singular Exp $ */
+/* $Id: ipid.cc,v 1.87 2009-07-28 14:18:34 Singular Exp $ */
 
 /*
@@ -43 +43 @@
 idhdl idroot = NULL;
 
-#ifdef HAVE_NS
 idhdl currPackHdl = NULL;
 idhdl basePackHdl = NULL;
 package currPack =NULL;
 package basePack =NULL;
-#endif /* HAVE_NS */
 idhdl currRingHdl = NULL;
 ring  currRing = NULL;
@@ -437 +435 @@
   }
   *root = (*root)->set(s, lev, t, init);
-#ifdef HAVE_NS
 #ifndef NDEBUG
   checkall();
-#endif
 #endif
   return *root;
@@ -447 +443 @@
     //Werror("identifier `%s` in use(lev h=%d,typ=%d,t=%d, curr=%d)",s,IDLEV(h),IDTYP(h),t,lev);
     Werror("identifier `%s` in use",s);
-#ifdef HAVE_NS
     //listall();
-#endif
     omFree((ADDRESS)s);
     return NULL;
@@ -481 +475 @@
 }
 
-#ifndef HAVE_NS
-void killhdl(idhdl h)
-{
-  int t=IDTYP(h);
-  if (((BEGIN_RING<t) && (t<END_RING) && (t!=QRING_CMD))
-  || ((t==LIST_CMD) && (lRingDependend((lists)IDDATA(h)))))
-    killhdl2(h,&currRing->idroot,currRing);
-  else
-  {
-    {
-      idhdl s=IDROOT;
-      while ((s!=h) && (s!=NULL)) s=s->next;
-      if (s==NULL) killhdl2(h,&(currRing->idroot),currRing);
-      else killhdl2(h,&IDROOT,currRing);
-    }
-  }
-}
-#else 
-//#ifdef HAVE_NS
 void killhdl(idhdl h, package proot)
 {
@@ -530 +505 @@
   }
 }
-#endif /* HAVE_NS */
 
 void killhdl2(idhdl h, idhdl * ih, ring r)
@@ -554 +528 @@
     rKill(h);
   }
-#ifdef HAVE_NS
   // package -------------------------------------------------------------
   else if (IDTYP(h) == PACKAGE_CMD)
@@ -582 +555 @@
     iiCheckPack(currPack);
   }
-#endif /* HAVE_NS */
   // poly / vector -------------------------------------------------------
   else if ((IDTYP(h) == POLY_CMD) || (IDTYP(h) == VECTOR_CMD))
@@ -718 +690 @@
   if (h2!=NULL) return h2;
   if (h!=NULL) return h;
-#ifdef HAVE_NS
   if (basePack!=currPack)
     return basePack->idroot->get(n,myynest);
-#endif
   return NULL;
 }
@@ -792 +762 @@
     {
       /*move 'tomove' to ring id's*/
-#ifdef HAVE_NS
       if (ipSwapId(tomove,IDROOT,currRing->idroot))
       ipSwapId(tomove,basePack->idroot,currRing->idroot);
-#else
-      ipSwapId(tomove,IDROOT,currRing->idroot);
-#endif
     }
     else
@@ -949 +915 @@
   p->cRingHdl=currRingHdl;
   p->name=n;
-  #ifdef HAVE_NS
   p->cPackHdl=currPackHdl;
   p->cPack=currPack;
-  #endif
   p->next=this;
   procstack=p;
@@ -965 +929 @@
   //if((::currRingHdl==NULL)||(IDRING(::currRingHdl)!=(::currRing)))
   //  ::currRingHdl=rFindHdl(::currRing,NULL,NULL);
-  #ifdef HAVE_NS
   //Print("restore pack=%s,1.obj=%s\n",IDID(currPackHdl),IDID(currPack->idroot));
   currPackHdl=this->cPackHdl;
   currPack=this->cPack;
   iiCheckPack(currPack);
-  #endif
   proclevel *p=this;
   procstack=next;
@@ -976 +938 @@
 }
 
-#ifdef HAVE_NS
 idhdl packFindHdl(package r)
 {
@@ -989 +950 @@
   return NULL;
 }
-#endif