Changeset 3877fe in git

Timestamp:

Aug 1, 2012, 11:37:25 PM (11 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

c6909feb8b8906ced71bef772f72f8bd461d7f4c

Parents:

9165865409bb43ba082670375c4a04e78f8b76e1

Message:

fix: newstruct's string operator may be overloaded

Files:

• Singular/newstruct.cc (modified) (1 diff)
• Tst/Short/bug_newstruct3.res.gz.uu (added)
• Tst/Short/bug_newstruct3.stat (added)
• Tst/Short/bug_newstruct3.tst (added)

Singular/newstruct.cc

@@ -50 +50 @@
   {
     newstruct_desc ad=(newstruct_desc)(b->data);
+
+    newstruct_proc p=ad->procs;
+    while((p!=NULL)&&(p->t!=STRING_CMD))
+      p=p->next;
+
+    if (p!=NULL)
+    {
+      leftv sl;
+      sleftv tmp;
+      memset(&tmp,0,sizeof(tmp));
+      tmp.rtyp=ad->id;
+      void * newstruct_Copy(blackbox*, void *); //forward declaration
+      tmp.data=(void*)newstruct_Copy(b,d);
+      idrec hh;
+      memset(&hh,0,sizeof(hh));
+      hh.id=Tok2Cmdname(p->t);
+      hh.typ=PROC_CMD;
+      hh.data.pinf=p->p;
+      sl=iiMake_proc(&hh,NULL,&tmp);
+
+      if (sl->Typ() == STRING_CMD)
+      {
+        char *res = omStrDup((char*)sl->Data());
+        sl->CleanUp();
+        return res;
+      }
+      else
+        sl->CleanUp();      
+    }
+
     lists l=(lists)d;
     newstruct_member a=ad->member;