Changeset f92a39 in git for Singular/iplib.cc

Timestamp:

Oct 15, 2012, 7:44:58 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

d6b9d791f6efb67f432972147de4dfd0f4081862

Parents:

17874ed75ee295b8f839c9c6087da10a82e6ff2e

Message:

fix: implementation of return(..) improved

File:

• Singular/iplib.cc (modified) (11 diffs)

Singular/iplib.cc

@@ -380 +380 @@
 ring    *iiLocalRing;
 #endif
-sleftv  *iiRETURNEXPR;
+sleftv  iiRETURNEXPR;
 int     iiRETURNEXPR_len=0;
 
@@ -417 +417 @@
   if (myynest >= iiRETURNEXPR_len-1)
   {
-    iiRETURNEXPR=(sleftv *)omreallocSize(iiRETURNEXPR,
-                                   iiRETURNEXPR_len*sizeof(sleftv),
-                                   (iiRETURNEXPR_len+16)*sizeof(sleftv));
-    omMarkAsStaticAddr(iiRETURNEXPR);
-    memset(&(iiRETURNEXPR[iiRETURNEXPR_len]),0,16*sizeof(sleftv));
 #ifdef USE_IILOCALRING
     iiLocalRing=(ring *)omreallocSize(iiLocalRing,
@@ -446 +441 @@
   //Print("currRing(%d):%s(%x) in %s\n",myynest,IDID(currRingHdl),currRing,IDID(pn));
 #endif
-  iiRETURNEXPR[myynest+1].Init();
+  iiRETURNEXPR.Init();
   procstack->push(pi->procname);
   if ((traceit&TRACE_SHOW_PROC)
@@ -485 +480 @@
                  leftv res = (leftv)omAlloc0Bin(sleftv_bin);
                  err = (pi->data.o.function)(res, sl);
-                 iiRETURNEXPR[myynest+1].Copy(res);
+                 iiRETURNEXPR.Copy(res);
                  omFreeBin((ADDRESS)res,  sleftv_bin);
                  break;
@@ -503 +498 @@
   if (err)
   {
-    iiRETURNEXPR[myynest+1].CleanUp();
-    //iiRETURNEXPR[myynest+1].Init(); //done by CleanUp
+    iiRETURNEXPR.CleanUp();
+    //iiRETURNEXPR.Init(); //done by CleanUp
   }
 #ifdef USE_IILOCALRING
@@ -514 +509 @@
     if (currRing!=NULL)
     {
-      if (((iiRETURNEXPR[myynest+1].Typ()>BEGIN_RING)
-        && (iiRETURNEXPR[myynest+1].Typ()<END_RING))
-      || ((iiRETURNEXPR[myynest+1].Typ()==LIST_CMD)
-        && (lRingDependend((lists)iiRETURNEXPR[myynest+1].Data()))))
+      if (((iiRETURNEXPR.Typ()>BEGIN_RING)
+        && (iiRETURNEXPR.Typ()<END_RING))
+      || ((iiRETURNEXPR.Typ()==LIST_CMD)
+        && (lRingDependend((lists)iiRETURNEXPR.Data()))))
       {
         //idhdl hn;
@@ -532 +527 @@
         else                   n="none";
         Werror("ring change during procedure call: %s -> %s (level %d)",o,n,myynest);
-        iiRETURNEXPR[myynest+1].CleanUp();
+        iiRETURNEXPR.CleanUp();
         err=TRUE;
       }
@@ -557 +552 @@
     //Print(" curr:%s\n",IDID(currRingHdl));
     //Print("pr:%x, curr: %x\n",procstack->cRing,currRing);
-    if (((iiRETURNEXPR[myynest+1].Typ()>BEGIN_RING)
-      && (iiRETURNEXPR[myynest+1].Typ()<END_RING))
-    || ((iiRETURNEXPR[myynest+1].Typ()==LIST_CMD)
-      && (lRingDependend((lists)iiRETURNEXPR[myynest+1].Data()))))
+    if (((iiRETURNEXPR.Typ()>BEGIN_RING)
+      && (iiRETURNEXPR.Typ()<END_RING))
+    || ((iiRETURNEXPR.Typ()==LIST_CMD)
+      && (lRingDependend((lists)iiRETURNEXPR.Data()))))
     {
       //idhdl hn;
@@ -585 +580 @@
       {
         Werror("ring change during procedure call: %s -> %s",o,n);
-        iiRETURNEXPR[myynest+1].CleanUp();
+        iiRETURNEXPR.CleanUp();
         err=TRUE;
       }
@@ -607 +602 @@
   if (err)
     return NULL;
-  return &iiRETURNEXPR[myynest+1];
+  return &iiRETURNEXPR;
 }
 
@@ -630 +625 @@
   }
   myynest++;
-  iiRETURNEXPR[myynest].Init();
 
   err=iiAllStart(pi,example,BT_example,(pi != NULL ? pi->data.s.example_lineno: 0));