Changeset 42de40f in git

Timestamp:

Jun 13, 2016, 5:46:01 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4811126f4f83e53adaae9f7a482ce75cecd9ce48

Parents:

bceb6396397f37319656d25f7bd1d97e4d07cc66

Message:

removed USE_IILOCALRING

Location:

Singular

Files:

• grammar.cc (modified) (1 diff)
• grammar.y (modified) (1 diff)
• iplib.cc (modified) (11 diffs)
• ipshell.cc (modified) (5 diffs)
• ipshell.h (modified) (1 diff)
• tok.h (modified) (1 diff)

Singular/grammar.cc

@@ -3957 +3957 @@
 #endif
                   }
-#ifdef USE_IILOCALRING
                   iiLocalRing[myynest-1]=IDRING(h);
-#endif
                   procstack->cRing=IDRING(h);
                   procstack->cRingHdl=h;

Singular/grammar.y

@@ -1379 +1379 @@
 #endif
                   }
-#ifdef USE_IILOCALRING
                   iiLocalRing[myynest-1]=IDRING(h);
-#endif
                   procstack->cRing=IDRING(h);
                   procstack->cRingHdl=h;

Singular/iplib.cc

@@ -419 +419 @@
     err=iiAllStart(pi,pi->data.s.body,BT_proc,pi->data.s.body_lineno-(v!=NULL));
 
-#ifdef USE_IILOCALRING
 #if 0
   if(procstack->cRing != iiLocalRing[myynest]) Print("iiMake_proc: 1 ring not saved procs:%x, iiLocal:%x\n",procstack->cRing, iiLocalRing[myynest]);
@@ -456 +455 @@
       iiLocalRing[myynest-1]=NULL;
     }
-#else /* USE_IILOCALRING */
-    if (procstack->cRing != currRing)
-    {
-      //if (procstack->cRingHdl!=NULL)
-      //Print("procstack:%s,",IDID(procstack->cRingHdl));
-      //if (currRingHdl!=NULL)
-      //Print(" curr:%s\n",IDID(currRingHdl));
-      //Print("pr:%x, curr: %x\n",procstack->cRing,currRing);
-      if (iiRETURNEXPR.RingDependend())
-      {
-        //idhdl hn;
-        const char *n;
-        const char *o;
-        if (procstack->cRing!=NULL)
-        {
-          //PrintS("reset ring\n");
-          procstack->cRingHdl=rFindHdl(procstack->cRing,NULL);
-          o=IDID(procstack->cRingHdl);
-          currRing=procstack->cRing;
-          currRingHdl=procstack->cRingHdl;
-        }
-        else                            o="none";
-        if (currRing!=NULL)             n=IDID(currRingHdl);
-        else                            n="none";
-        if (currRing==NULL)
-        {
-          Werror("ring change during procedure call: %s -> %s (level %d)",o,n,myynest);
-          iiRETURNEXPR.CleanUp();
-          err=TRUE;
-        }
-      }
-      if (procstack->cRingHdl!=NULL)
-      {
-        rSetHdl(procstack->cRingHdl);
-      }
-      else
-      { currRingHdl=NULL; currRing=NULL; }
-    }
-#endif /* USE_IILOCALRING */
     //Print("kill locals for %s (level %d)\n",IDID(pn),myynest);
     killlocals(myynest);
@@ -512 +472 @@
 }
 
-#ifdef USE_IILOCALRING
 ring    *iiLocalRing;
-#endif
 sleftv  iiRETURNEXPR;
 int     iiRETURNEXPR_len=0;
@@ -522 +480 @@
 {
   int i;
-#ifdef USE_IILOCALRING
   for (i=0;i<=myynest;i++)
   {
@@ -530 +487 @@
     PrintLn();
   }
-#endif
 #if  0
   i=myynest;
@@ -552 +508 @@
   if (myynest >= iiRETURNEXPR_len-1)
   {
-#ifdef USE_IILOCALRING
     iiLocalRing=(ring *)omreallocSize(iiLocalRing,
                                    iiRETURNEXPR_len*sizeof(ring),
                                    (iiRETURNEXPR_len+16)*sizeof(ring));
     memset(&(iiLocalRing[iiRETURNEXPR_len]),0,16*sizeof(ring));
-#endif
     iiRETURNEXPR_len+=16;
   }
@@ -572 +526 @@
   }
   iiCheckNest();
-#ifdef USE_IILOCALRING
   iiLocalRing[myynest]=currRing;
   //Print("currRing(%d):%s(%x) in %s\n",myynest,IDID(currRingHdl),currRing,IDID(pn));
-#endif
   iiRETURNEXPR.Init();
   procstack->push(pi->procname);
@@ -660 +612 @@
   iiCheckNest();
   procstack->push(example);
-#ifdef USE_IILOCALRING
   iiLocalRing[myynest]=currRing;
-#endif
   if (traceit&TRACE_SHOW_PROC)
   {
@@ -680 +630 @@
     printf("leaving  -example- (level %d)\n",myynest);
   }
-#ifdef USE_IILOCALRING
   if (iiLocalRing[myynest] != currRing)
   {
@@ -694 +643 @@
     }
   }
-#else /* USE_IILOCALRING */
-#endif /* USE_IILOCALRING */
   if (NS_LRING != currRing)
   {
@@ -711 +658 @@
     }
   }
-//#endif /* USE_IILOCALRING */
   procstack->pop();
   return err;

Singular/ipshell.cc

@@ -1326 +1326 @@
           Warn("redefining %s (%s)",IDID(h),my_yylinebuf);
         }
-#ifdef USE_IILOCALRING
         if (iiLocalRing[0]==IDRING(h) && (!keepring)) iiLocalRing[0]=NULL;
-#else
-        proclevel *p=procstack;
-        while (p->next!=NULL) p=p->next;
-        if ((p->cRing==IDRING(h)) && (!keepring))
-        {
-          p->cRing=NULL;
-          p->cRingHdl=NULL;
-        }
-#endif
         killhdl2(h,root,currRing);
       }
@@ -6074 +6064 @@
     }
     int j;
-#ifdef USE_IILOCALRING
     for (j=0;j<myynest;j++)
     {
@@ -6083 +6072 @@
       }
     }
-#else /* USE_IILOCALRING */
-//#endif /* USE_IILOCALRING */
-    {
-      proclevel * nshdl = procstack;
-      int lev=myynest-1;
-
-      for(; nshdl != NULL; nshdl = nshdl->next)
-      {
-        if (nshdl->cRing==r)
-        {
-          Warn("killing the basering for level %d",lev);
-          nshdl->cRing=NULL;
-          nshdl->cRingHdl=NULL;
-        }
-      }
-    }
-#endif /* USE_IILOCALRING */
 // any variables depending on r ?
     while (r->idroot!=NULL)
@@ -6158 +6130 @@
 idhdl rSimpleFindHdl(ring r, idhdl root, idhdl n)
 {
-  //idhdl next_best=NULL;
   idhdl h=root;
   while (h!=NULL)
@@ -6167 +6138 @@
     )
     {
-   //   if (IDLEV(h)==myynest)
-   //     return h;
-   //   if ((IDLEV(h)==0) || (next_best==NULL))
-   //     next_best=h;
-   //   else if (IDLEV(next_best)<IDLEV(h))
-   //     next_best=h;
       return h;
     }
     h=IDNEXT(h);
   }
-  //return next_best;
   return NULL;
 }

Singular/ipshell.h

@@ -33 +33 @@
 extern int     iiRETURNEXPR_len;
 extern sleftv  iiRETURNEXPR;
-#ifdef USE_IILOCALRING
 extern ring   *iiLocalRing;
-#endif
 //extern cmdnames cmds[];
 extern const char *lastreserved;

Singular/tok.h

@@ -18 +18 @@
 extern int  yyparse(void);
 #endif
-
-/* Define to use old mechanismen for saving currRing with procedures
- */
-#define USE_IILOCALRING 1
-
 
 /* the follwing defines for infix operators should not be changed: *