Changeset 2bc7fb in git

Timestamp:

Feb 23, 2012, 1:25:54 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

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:

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

Singular/ipassign.cc

@@ -846 +846 @@
     return TRUE;
   }
-  if((rt==DEF_CMD)||(rt==NONE))
+  if(rt==NONE)
   {
     WarnS("right side is not a datum, assignment ignored");
@@ -858 +858 @@
   if (lt==DEF_CMD)
   {
-    if (l->rtyp==IDHDL)
-    {
-      IDTYP((idhdl)l->data)=rt;
-    }
-    else if (l->name!=NULL)
-    {
-      sleftv ll;
-      iiDeclCommand(&ll,l,myynest,rt,&IDROOT);
-      memcpy(l,&ll,sizeof(sleftv));
-    }
-    else
-    {
-      l->rtyp=rt;
-    }
-    lt=rt;
+    if (rt!=DEF_CMD)
+    {
+      if (l->rtyp==IDHDL)
+      {
+        IDTYP((idhdl)l->data)=rt;
+      }
+      else if (l->name!=NULL)
+      {
+        sleftv ll;
+        iiDeclCommand(&ll,l,myynest,rt,&IDROOT);
+        memcpy(l,&ll,sizeof(sleftv));
+      }
+      else
+      {
+        l->rtyp=rt;
+      }
+      lt=rt;
+    }
+    // else: def=def: silently ignored
   }
   else