Changeset f92a39 in git for Singular/newstruct.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/newstruct.cc (modified) (7 diffs)

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