Changeset f92a39 in git

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

d6b9d791f6efb67f432972147de4dfd0f4081862

Parents:

17874ed75ee295b8f839c9c6087da10a82e6ff2e

Message:

fix: implementation of return(..) improved

Location:

Singular

Files:

• grammar.cc (modified) (2 diffs)
• grammar.y (modified) (2 diffs)
• iparith.cc (modified) (1 diff)
• iplib.cc (modified) (11 diffs)
• ipshell.cc (modified) (4 diffs)
• ipshell.h (modified) (1 diff)
• newstruct.cc (modified) (7 diffs)

Singular/grammar.cc

@@ -4038 +4038 @@
 #line 1605 "grammar.y"
     {
-            if(iiRETURNEXPR==NULL) YYERROR;
-            iiRETURNEXPR[myynest].Copy(&(yyvsp[(3) - (4)].lv));
+            iiRETURNEXPR.Copy(&(yyvsp[(3) - (4)].lv));
             (yyvsp[(3) - (4)].lv).CleanUp();
             if (exitBuffer(BT_proc)) YYERROR;
@@ -4052 +4051 @@
             if ((yyvsp[(1) - (3)].i)==RETURN)
             {
-              if(iiRETURNEXPR==NULL) YYERROR;
-              iiRETURNEXPR[myynest].Init();
-              iiRETURNEXPR[myynest].rtyp=NONE;
+              iiRETURNEXPR.Init();
+              iiRETURNEXPR.rtyp=NONE;
               if (exitBuffer(BT_proc)) YYERROR;
             }

Singular/grammar.y

@@ -1605 +1605 @@
         RETURN '(' exprlist ')'
           {
-            if(iiRETURNEXPR==NULL) YYERROR;
-            iiRETURNEXPR[myynest].Copy(&$3);
+            iiRETURNEXPR.Copy(&$3);
             $3.CleanUp();
             if (exitBuffer(BT_proc)) YYERROR;
@@ -1614 +1613 @@
             if ($1==RETURN)
             {
-              if(iiRETURNEXPR==NULL) YYERROR;
-              iiRETURNEXPR[myynest].Init();
-              iiRETURNEXPR[myynest].rtyp=NONE;
+              iiRETURNEXPR.Init();
+              iiRETURNEXPR.rtyp=NONE;
               if (exitBuffer(BT_proc)) YYERROR;
             }

Singular/iparith.cc

@@ -1588 +1588 @@
     memcpy(res,sl,sizeof(sleftv));
   }
+  iiRETURNEXPR.Init();
   return FALSE;
 }

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));

Singular/ipshell.cc

@@ -393 +393 @@
   if (iiRETURNEXPR_len > myynest)
   {
-    int t=iiRETURNEXPR[myynest].Typ();
-    if ((/*iiRETURNEXPR[myynest].Typ()*/ t==RING_CMD)
-    || (/*iiRETURNEXPR[myynest].Typ()*/ t==QRING_CMD))
-    {
-      leftv h=&iiRETURNEXPR[myynest];
+    int t=iiRETURNEXPR.Typ();
+    if ((/*iiRETURNEXPR.Typ()*/ t==RING_CMD)
+    || (/*iiRETURNEXPR.Typ()*/ t==QRING_CMD))
+    {
+      leftv h=&iiRETURNEXPR;
       if (((ring)h->data)->idroot!=NULL)
         killlocals0(v,&(((ring)h->data)->idroot),(ring)h->data);
     }
-    else if (/*iiRETURNEXPR[myynest].Typ()*/ t==LIST_CMD)
-    {
-      leftv h=&iiRETURNEXPR[myynest];
+    else if (/*iiRETURNEXPR.Typ()*/ t==LIST_CMD)
+    {
+      leftv h=&iiRETURNEXPR;
       changed |=killlocals_list(v,(lists)h->data);
     }
@@ -2147 +2147 @@
   // 5: D
 
-  ring R = (ring) omAlloc0Bin(sip_sring_bin); // why
-
-
-  //assume( R->cf == NULL );
+  ring R = (ring) omAlloc0Bin(sip_sring_bin);
+
 
   // ------------------------------------------------------------------
@@ -2486 +2484 @@
 
 #ifdef HAVE_RINGS
-  // This was a BUG IN SINGULAR: There is no HABE_RINGS!!!
-
 // currently, coefficients which are ring elements require a global ordering:
   if (rField_is_Ring(R) && (R->OrdSgn==-1))
@@ -5584 +5580 @@
         sLastPrinted.CleanUp();
       }
-      if ((myynest>0) && (iiRETURNEXPR[myynest].RingDependend()))
+      if ((myynest>0) && (iiRETURNEXPR.RingDependend()))
       {
         WerrorS("return value depends on local ring variable (export missing ?)");
-        iiRETURNEXPR[myynest].CleanUp();
+        iiRETURNEXPR.CleanUp();
       }
       currRing=NULL;

Singular/ipshell.h

@@ -27 +27 @@
 extern const char *  currid;
 extern int     iiRETURNEXPR_len;
-extern sleftv *iiRETURNEXPR;
+extern sleftv  iiRETURNEXPR;
 #ifdef USE_IILOCALRING
 extern ring   *iiLocalRing;

Singular/newstruct.cc

@@ -74 +74 @@
         char *res = omStrDup((char*)sl->Data());
         sl->CleanUp();
+        iiRETURNEXPR.Init();
         return res;
       }
-      else
-        sl->CleanUp();      
+      sl->CleanUp();
+      iiRETURNEXPR.Init();
     }
 
@@ -171 +172 @@
   newstruct_desc nt=(newstruct_desc)ll->data;
   newstruct_proc p=nt->procs;
-  
+
   while( (p!=NULL) && ((p->t!='=')||(p->args!=1)) ) p=p->next;
 
@@ -187 +188 @@
     if (sl != NULL)
     {
-      if (sl->Typ() == op) { l->Copy(sl); return FALSE;}
-      else sl->CleanUp();
+      if (sl->Typ() == op)
+      {
+        l->Copy(sl);
+        iiRETURNEXPR.Init();
+        return FALSE;
+      }
+      sl->CleanUp();
+      iiRETURNEXPR.Init();
     }
   }
@@ -287 +294 @@
     {
       res->Copy(sl);
+      iiRETURNEXPR.Init();
       return FALSE;
     }
@@ -417 +425 @@
     {
       res->Copy(sl);
+      iiRETURNEXPR.Init();
       return FALSE;
     }
@@ -460 +469 @@
     {
       res->Copy(sl);
+      iiRETURNEXPR.Init();
       return FALSE;
     }
@@ -594 +604 @@
     hh.data.pinf=p->p;
     sl=iiMake_proc(&hh,NULL,&tmp);
+    if (sl!=NULL) sl->CleanUp();
+    iiRETURNEXPR.Init();
   }
   else