Changeset 0d008d in git

Timestamp:

Feb 24, 2012, 11:22:47 AM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

80c87acb77e03ca7f5306ad9570c84bf74f61cb9

Parents:

2bc7fb980b5f9f7f028270339eb802b8f506c01e

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-02-24 11:22:47+01:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-09-19 10:05:26+02:00

Message:

fix: allow assignment def=def (for "undefinig" list entries)
(cherry picked from commit ee5be4b44ef3710c997a64552e4bf48a604dd4b3)

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

File:

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

Singular/ipassign.cc

@@ -822 +822 @@
   return FALSE;
 }
+static BOOLEAN jiA_DEF(leftv res, leftv a, Subexpr e)
+{
+  res->data=(void *)0;
+  return FALSE;
+}
 /*=================== table =================*/
 #define IPASSIGN
@@ -858 +863 @@
   if (lt==DEF_CMD)
   {
-    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
+    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