Changeset 2bc7fb in git


Ignore:
Timestamp:
Feb 23, 2012, 1:25:54 PM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c7af8613769b29c741d6c338945669719f1fc4f8')
Children:
0d008df8dfa1be001d06ef204f72682813192e9c
Parents:
b417134dc595d20da8372ad2f585d434c48e7a28
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-02-23 13:25:54+01:00
git-committer:
Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-09-19 10:04:34+02:00
Message:
chg: allow assignment def=def (for "undefinig" list entries)
(cherry picked from commit a5281ab5104ed2cc0fc7a91c462921c5ebe96bbe)

Signed-off-by: Andreas Steenpass <steenpass@mathematik.uni-kl.de>

Conflicts:
	Singular/ipassign.cc
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/ipassign.cc

    rb41713 r2bc7fb  
    846846    return TRUE;
    847847  }
    848   if((rt==DEF_CMD)||(rt==NONE))
     848  if(rt==NONE)
    849849  {
    850850    WarnS("right side is not a datum, assignment ignored");
     
    858858  if (lt==DEF_CMD)
    859859  {
    860     if (l->rtyp==IDHDL)
    861     {
    862       IDTYP((idhdl)l->data)=rt;
    863     }
    864     else if (l->name!=NULL)
    865     {
    866       sleftv ll;
    867       iiDeclCommand(&ll,l,myynest,rt,&IDROOT);
    868       memcpy(l,&ll,sizeof(sleftv));
    869     }
    870     else
    871     {
    872       l->rtyp=rt;
    873     }
    874     lt=rt;
     860    if (rt!=DEF_CMD)
     861    {
     862      if (l->rtyp==IDHDL)
     863      {
     864        IDTYP((idhdl)l->data)=rt;
     865      }
     866      else if (l->name!=NULL)
     867      {
     868        sleftv ll;
     869        iiDeclCommand(&ll,l,myynest,rt,&IDROOT);
     870        memcpy(l,&ll,sizeof(sleftv));
     871      }
     872      else
     873      {
     874        l->rtyp=rt;
     875      }
     876      lt=rt;
     877    }
     878    // else: def=def: silently ignored
    875879  }
    876880  else
Note: See TracChangeset for help on using the changeset viewer.