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

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit 6f9dcfaa6bc157e945a8d3ab6f4389f1887fa3d0
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Thu Feb 23 13:25:54 2012 +0100

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

diff --git a/Singular/ipassign.cc b/Singular/ipassign.cc
index 2d55355..5eb8351 100644
--- a/Singular/ipassign.cc
+++ b/Singular/ipassign.cc
@@ -1,7 +1,6 @@
 /****************************************
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
 
 /*
 * ABSTRACT: interpreter:
@@ -706,7 +705,7 @@ static BOOLEAN jiAssign_1(leftv l, leftv r)
     if (!errorreported) Werror("left side `%s` is undefined",l->Fullname());
     return TRUE;
   }
-  if((rt==DEF_CMD)||(rt==NONE))
+  if(rt==NONE)
   {
     WarnS("right side is not a datum, assignment ignored");
     // if (!errorreported)
@@ -720,21 +719,25 @@ static BOOLEAN jiAssign_1(leftv l, leftv r)
 
   if (lt==DEF_CMD)
   {
-    if (l->rtyp==IDHDL)
+    if (rt!=DEF_CMD)
     {
-      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;
+      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;
     }
-    lt=rt;
+    // else: def=def: silently ignored
   }
   else
   {
@@ -1665,7 +1668,7 @@ void jjNormalizeQRingId(leftv I)
       switch (I->Typ())
       {
         case IDEAL_CMD:
-	case MODUL_CMD:
+        case MODUL_CMD:
         {
           ideal F=idInit(1,1);
           ideal II=kNF(F,currQuotient,I0);

-- 
an open source computer algebra system