Changeset e40145 in git for Singular/ipassign.cc

Timestamp:

Nov 20, 2013, 3:57:53 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a9c2986e020e2efafd15932b4d1b2b2fa77407e4

Parents:

9aa61ab499a2001f8d1e5112b9908742b2f69659

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-20 15:57:53+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-20 16:54:42+01:00

Message:

fix: assign expr_list to list elements: l[1]=1:2;l[1]=l[1],2;

File:

• Singular/ipassign.cc (modified) (2 diffs)

Singular/ipassign.cc

@@ -1222 +1222 @@
     hh = hh->next;
   }
-  if (IDINTVEC((idhdl)l->data)!=NULL) delete IDINTVEC((idhdl)l->data);
-  IDINTVEC((idhdl)l->data)=iv;
+  if (l->rtyp==IDHDL)
+  {
+    if (IDINTVEC((idhdl)l->data)!=NULL) delete IDINTVEC((idhdl)l->data);
+    IDINTVEC((idhdl)l->data)=iv;
+  }
+  else
+  {
+    if (l->data!=NULL) delete ((intvec*)l->data);
+    l->data=(char*)iv;
+  }
   return FALSE;
 }
@@ -1455 +1463 @@
   if (/*(ld->rtyp!=LIST_CMD)
   &&*/(ld->e==NULL)
-  &&(ld->Typ()!=r->Typ()))
+  && (ld->Typ()!=r->Typ()))
   {
     sleftv tmp;
     memset(&tmp,0,sizeof(sleftv));
     tmp.rtyp=DEF_CMD;
+    b=iiAssign(&tmp,r);
+    ld->CleanUp();
+    memcpy(ld,&tmp,sizeof(sleftv));
+  }
+  else if ((ld->e==NULL)
+  && (ld->Typ()==r->Typ())
+  && (ld->Typ()<MAX_TOK))
+  {
+    sleftv tmp;
+    memset(&tmp,0,sizeof(sleftv));
+    tmp.rtyp=r->Typ();
+    tmp.data=(char*)idrecDataInit(r->Typ());
     b=iiAssign(&tmp,r);
     ld->CleanUp();