Changeset 91c0af in git

Timestamp:

Jun 20, 2014, 3:34:18 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

68f5d0048b22a105171d0b1bbd91967a3129cc13

Parents:

85d8e82781d0ff9a659021b880317d46083f09b5

Message:

fix: assign def,def=matrix

File:

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

Singular/ipassign.cc

@@ -743 +743 @@
 #ifdef HAVE_RINGS
   ideal id = (ideal)a->Data(); //?
-  const int cpos = idPosConstant(id);  
+  const int cpos = idPosConstant(id);
   if(rField_is_Ring(currRing))
     if (cpos >= 0)
@@ -756 +756 @@
   ring qr = rCopy(currRing);
   assume(qr->cf == currRing->cf);
-  
+
   if ( qr->cf != newcf )
   {
     nKillChar ( qr->cf ); // ???
     qr->cf = newcf;
-  }  
+  }
                  // we have to fill it, but the copy also allocates space
   idhdl h=(idhdl)res->data; // we have res->rtyp==IDHDL
   IDRING(h)=qr;
-  
+
   ideal qid;
 
@@ -773 +773 @@
       int i, j;
       int *perm = (int *)omAlloc0((qr->N+1)*sizeof(int));
-      
-      for(i=qr->N;i>0;i--) 
+
+      for(i=qr->N;i>0;i--)
         perm[i]=i;
 
@@ -786 +786 @@
 #endif
       qid = idrCopyR(id,currRing,qr);
-      
+
   idSkipZeroes(qid);
   //idPrint(qid);
@@ -1228 +1228 @@
     IDLIST((idhdl)l->data)=L;
     IDTYP((idhdl)l->data)=LIST_CMD; // was possibly DEF_CMD
-    ipMoveId((idhdl)l->data);
+    if (lRingDependend(L)) ipMoveId((idhdl)l->data);
   }
   else
@@ -1394 +1394 @@
       h=l->next;
       l->next=NULL;
+      idhdl hh=NULL;
+      if ((l->rtyp==IDHDL)&&(l->Typ()==DEF_CMD)) hh=(idhdl)l->data;
       nok=jiAssign_1(l,&t);
+      if (hh!=NULL) { ipMoveId(hh);hh=NULL;}
       l->next=h;
       if (nok)