[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

Bernhard R. Link brlink at debian.org
Tue Apr 24 15:53:29 UTC 2012


The following commit has been merged in the cleanedupstream branch:
commit ce4bda0cd59142aadc1c73ef2139d72d1e3df125
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Fri Feb 24 11:22:47 2012 +0100

    fix: allow assignment def=def (for "undefinig" list entries)

diff --git a/Singular/ipassign.cc b/Singular/ipassign.cc
index 5eb8351..a98d1e9 100644
--- a/Singular/ipassign.cc
+++ b/Singular/ipassign.cc
@@ -682,6 +682,11 @@ static BOOLEAN jiA_PACKAGE(leftv res, leftv a, Subexpr e)
   jiAssignAttr(res,a);
   return FALSE;
 }
+static BOOLEAN jiA_DEF(leftv res, leftv a, Subexpr e)
+{
+  res->data=(void *)0;
+  return FALSE;
+}
 /*=================== table =================*/
 #define IPASSIGN
 #define D(A) A
@@ -719,25 +724,21 @@ static BOOLEAN jiAssign_1(leftv l, leftv r)
 
   if (lt==DEF_CMD)
   {
-    if (rt!=DEF_CMD)
+    if (l->rtyp==IDHDL)
     {
-      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;
+      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;
     }
-    // else: def=def: silently ignored
+    lt=rt;
   }
   else
   {

-- 
an open source computer algebra system



More information about the debian-science-commits mailing list