Changeset 5edb77 in git

Timestamp:

Nov 20, 2012, 7:16:16 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

e3b071b7b8022789a70d9aeead7d9b8159679c57

Parents:

8e51caea071beef6e0f3c31472a9553c63c8df6d

Message:

fix: iiMake_proc (gcc 4.7)

Location:

Singular

Files:

• iparith.cc (modified) (2 diffs)
• iplib.cc (modified) (3 diffs)
• ipshell.h (modified) (1 diff)
• newstruct.cc (modified) (14 diffs)
• subexpr.cc (modified) (1 diff)

Singular/iparith.cc

@@ -1557 +1557 @@
   int typ;
   BOOLEAN t=FALSE;
+  idhdl tmp_proc=NULL;
   if ((u->rtyp!=IDHDL)||(u->e!=NULL))
   {
-    idrec tmp_proc;
-    tmp_proc.id="_auto";
-    tmp_proc.typ=PROC_CMD;
-    tmp_proc.data.pinf=(procinfo *)u->Data();
-    tmp_proc.ref=1;
-    d=u->data; u->data=(void *)&tmp_proc;
+    tmp_proc=(idhdl)omAlloc0(sizeof(idrec));
+    tmp_proc->id="_auto";
+    tmp_proc->typ=PROC_CMD;
+    tmp_proc->data.pinf=(procinfo *)u->Data();
+    tmp_proc->ref=1;
+    d=u->data; u->data=(void *)tmp_proc;
     e=u->e; u->e=NULL;
     t=TRUE;
     typ=u->rtyp; u->rtyp=IDHDL;
   }
-  leftv sl;
+  BOOLEAN sl;
   if (u->req_packhdl==currPack)
     sl = iiMake_proc((idhdl)u->data,NULL,v);
@@ -1579 +1580 @@
     u->data=d;
     u->e=e;
-  }
-  if (sl==NULL)
-  {
-    return TRUE;
-  }
-  else
-  {
-    memcpy(res,&iiRETURNEXPR,sizeof(sleftv));
-  }
+    omFreeSize(tmp_proc,sizeof(idrec));
+  }
+  if (sl) return TRUE;
+  memcpy(res,&iiRETURNEXPR,sizeof(sleftv));
   iiRETURNEXPR.Init();
   return FALSE;

Singular/iplib.cc

@@ -426 +426 @@
   }
 }
-sleftv * iiMake_proc(idhdl pn, package pack, sleftv* sl)
+BOOLEAN iiMake_proc(idhdl pn, package pack, sleftv* sl)
 {
   int err;
@@ -434 +434 @@
     Werror("'%s::%s()' is a local procedure and cannot be accessed by an user.",
            pi->libname, pi->procname);
-    return NULL;
+    return TRUE;
   }
   iiCheckNest();
@@ -601 +601 @@
   procstack->pop();
   if (err)
-    return NULL;
-  return &iiRETURNEXPR;
+    return TRUE;
+  return FALSE;
 }
 

Singular/ipshell.h

@@ -192 +192 @@
 int     iiDeclCommand(leftv sy, leftv name, int lev, int t, idhdl* root,
   BOOLEAN isring = FALSE, BOOLEAN init_b=TRUE);
-sleftv * iiMake_proc(idhdl pn, package pack, sleftv* sl);
+BOOLEAN iiMake_proc(idhdl pn, package pack, sleftv* sl);
 // from misc.cc:
 char *  showOption();

Singular/newstruct.cc

@@ -57 +57 @@
     if (p!=NULL)
     {
-      leftv sl;
+      BOOLEAN sl;
       sleftv tmp;
       memset(&tmp,0,sizeof(tmp));
@@ -70 +70 @@
       sl=iiMake_proc(&hh,NULL,&tmp);
 
-      if (sl->Typ() == STRING_CMD)
-      {
-        char *res = omStrDup((char*)sl->Data());
-        sl->CleanUp();
+      if (sl&& (iiRETURNEXPR.Typ() == STRING_CMD))
+      {
+        char *res = omStrDup((char*)iiRETURNEXPR.Data());
+        iiRETURNEXPR.CleanUp();
         iiRETURNEXPR.Init();
         return res;
       }
-      sl->CleanUp();
+      iiRETURNEXPR.CleanUp();
       iiRETURNEXPR.Init();
     }
@@ -177 +177 @@
   if (p!=NULL)
   {
+    BOOLEAN sl;
     idrec hh;
     memset(&hh,0,sizeof(hh));
@@ -185 +186 @@
     memset(&tmp,0,sizeof(sleftv));
     tmp.Copy(r);
-    leftv sl = iiMake_proc(&hh, NULL, &tmp);
-    if (sl != NULL)
-    {
-      if (sl->Typ() == op)
-      {
-        l->Copy(sl);
+    sl = iiMake_proc(&hh, NULL, &tmp);
+    if (!sl)
+    {
+      if (iiRETURNEXPR.Typ() == op)
+      {
+        l->Copy(&iiRETURNEXPR);
         iiRETURNEXPR.Init();
         return FALSE;
       }
-      sl->CleanUp();
+      iiRETURNEXPR.CleanUp();
       iiRETURNEXPR.Init();
     }
@@ -258 +259 @@
   }
 
-  else if(l->Typ() > MAX_TOK)
+  else
   {
     assume(l->Typ() > MAX_TOK);
@@ -280 +281 @@
   if (p!=NULL)
   {
-    leftv sl;
+    BOOLEAN sl;
     sleftv tmp;
     memset(&tmp,0,sizeof(sleftv));
@@ -290 +291 @@
     hh.data.pinf=p->p;
     sl=iiMake_proc(&hh,NULL,&tmp);
-    if (sl==NULL) return TRUE;
+    if (sl) return TRUE;
     else
     {
-      res->Copy(sl);
+      res->Copy(&iiRETURNEXPR);
       iiRETURNEXPR.Init();
       return FALSE;
@@ -409 +410 @@
   if (p!=NULL)
   {
-    leftv sl;
+    BOOLEAN sl;
     sleftv tmp;
     memset(&tmp,0,sizeof(sleftv));
@@ -421 +422 @@
     hh.data.pinf=p->p;
     sl=iiMake_proc(&hh,NULL,&tmp);
-    if (sl==NULL) return TRUE;
+    if (sl) return TRUE;
     else
     {
-      res->Copy(sl);
+      res->Copy(&iiRETURNEXPR);
       iiRETURNEXPR.Init();
       return FALSE;
@@ -455 +456 @@
   if (p!=NULL)
   {
-    leftv sl;
+    BOOLEAN sl;
     sleftv tmp;
     memset(&tmp,0,sizeof(sleftv));
@@ -465 +466 @@
     hh.data.pinf=p->p;
     sl=iiMake_proc(&hh,NULL,&tmp);
-    if (sl==NULL) return TRUE;
+    if (sl) return TRUE;
     else
     {
-      res->Copy(sl);
+      res->Copy(&iiRETURNEXPR);
       iiRETURNEXPR.Init();
       return FALSE;
@@ -593 +594 @@
   if (p!=NULL)
   {
-    leftv sl;
+    BOOLEAN sl;
     sleftv tmp;
     memset(&tmp,0,sizeof(tmp));
@@ -604 +605 @@
     hh.data.pinf=p->p;
     sl=iiMake_proc(&hh,NULL,&tmp);
-    if (sl!=NULL) sl->CleanUp();
+    if (!sl) iiRETURNEXPR.CleanUp();
     iiRETURNEXPR.Init();
   }
@@ -745 +746 @@
   return scanNewstructFromString(s,res);
 }
-
 void newstructShow(newstruct_desc d)
 {

Singular/subexpr.cc

@@ -1647 +1647 @@
         if(!nok)
         {
-          leftv r=iiMake_proc(h,req_packhdl,&d->arg2);
-          if (r!=NULL)
-            memcpy(this,r,sizeof(sleftv));
-          else
-            nok=TRUE;
+          nok=iiMake_proc(h,req_packhdl,&d->arg2);
+          if (!nok)
+            memcpy(this,&iiRETURNEXPR,sizeof(sleftv));
         }
       }