Changeset 4a74cc in git for Singular/ipassign.cc

Timestamp:

Feb 5, 2015, 12:10:11 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

f5125c661ffed4886fe8c7ca685ccd0c38cbaa80

Parents:

aca790a522d4e3aedfed1659704188800436fcee

Message:

add: check (for lvalue) in assignment

File:

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

Singular/ipassign.cc

@@ -950 +950 @@
 * assign a = b
 */
-static BOOLEAN jiAssign_1(leftv l, leftv r)
+static BOOLEAN jiAssign_1(leftv l, leftv r, BOOLEAN toplevel)
 {
   int rt=r->Typ();
@@ -960 +960 @@
 
   int lt=l->Typ();
-  if (/*(*/ lt==0 /*)*/) /*&&(l->name!=NULL)*/
+  if (lt==0)
   {
     if (!errorreported) Werror("left side `%s` is undefined",l->Fullname());
@@ -1009 +1009 @@
   }
   leftv ld=l;
-  if ((l->rtyp==IDHDL)&&(lt!=QRING_CMD)&&(lt!=RING_CMD))
-    ld=(leftv)l->data;
+  if (l->rtyp==IDHDL)
+  {
+    if ((lt!=QRING_CMD)&&(lt!=RING_CMD))
+      ld=(leftv)l->data;
+  }
+  else if (toplevel)
+  {
+    WerrorS("error in assign: left side is not an l-value");
+    return TRUE;
+  }
   if (lt>MAX_TOK)
   {
@@ -1193 +1201 @@
     h=l->next;
     l->next=NULL;
-    nok=jiAssign_1(l,&t);
+    nok=jiAssign_1(l,&t,TRUE);
     l->next=h;
     if (nok) return TRUE;
@@ -1227 +1235 @@
     h=l->next;
     l->next=NULL;
-    nok=jiAssign_1(l,&t);
+    nok=jiAssign_1(l,&t,TRUE);
     l->next=h;
     t.CleanUp();
@@ -1465 +1473 @@
       idhdl hh=NULL;
       if ((l->rtyp==IDHDL)&&(l->Typ()==DEF_CMD)) hh=(idhdl)l->data;
-      nok=jiAssign_1(l,&t);
+      nok=jiAssign_1(l,&t,TRUE);
       if (hh!=NULL) { ipMoveId(hh);hh=NULL;}
       l->next=h;
@@ -1541 +1549 @@
     h=l->next;
     l->next=NULL;
-    nok=jiAssign_1(l,&t);
+    nok=jiAssign_1(l,&t,TRUE);
     if (nok)
     {
@@ -1599 +1607 @@
     memset(&tmp,0,sizeof(sleftv));
     tmp.rtyp=DEF_CMD;
-    b=iiAssign(&tmp,r);
+    b=iiAssign(&tmp,r,FALSE);
     ld->CleanUp();
     memcpy(ld,&tmp,sizeof(sleftv));
@@ -1611 +1619 @@
     tmp.rtyp=r->Typ();
     tmp.data=(char*)idrecDataInit(r->Typ());
-    b=iiAssign(&tmp,r);
+    b=iiAssign(&tmp,r,FALSE);
     ld->CleanUp();
     memcpy(ld,&tmp,sizeof(sleftv));
@@ -1617 +1625 @@
   else
   {
-    b=iiAssign(ld,r);
+    b=iiAssign(ld,r,FALSE);
     if (l->e!=NULL) l->e->next=ld->e;
     ld->e=NULL;
@@ -1646 +1654 @@
   return b;
 }
-BOOLEAN iiAssign(leftv l, leftv r)
+BOOLEAN iiAssign(leftv l, leftv r, BOOLEAN toplevel)
 {
   if (errorreported) return TRUE;
@@ -1664 +1672 @@
     IDFLAG((idhdl)l->data)=0;
     l->attribute=NULL;
+    toplevel=FALSE;
   }
   else if (l->attribute!=NULL)
@@ -1746 +1755 @@
       &&((lt==rt)||(lt!=LIST_CMD)))
       {
-        b=jiAssign_1(l,r);
+        b=jiAssign_1(l,r,toplevel);
         if (l->rtyp==IDHDL)
         {
@@ -1771 +1780 @@
       )
       {
-        b=jiAssign_1(l,r);
+        b=jiAssign_1(l,r,toplevel);
         if((l->rtyp==IDHDL)&&(l->data!=NULL))
         {
@@ -1858 +1867 @@
       }
       if ((hh->next==NULL)&&(hh->Typ()==IDEAL_CMD))
-        return jiAssign_1(l,hh); /* map-assign: map f=r,i; */
+        return jiAssign_1(l,hh,toplevel); /* map-assign: map f=r,i; */
       //no break, handle the rest like an ideal:
       map_assign=TRUE;