Changeset 39e423 in git

Timestamp:

May 1, 2009, 5:09:32 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

e3b5ed00f856ec2d7eda1f54c39e55fce4aa7930

Parents:

0661d420fbd0c4909468e67e60c2b21895686e9d

Message:

*hannes: qring=


git-svn-id: file:///usr/local/Singular/svn/trunk@11763 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

Singular/ipassign.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipassign.cc,v 1.103 2009-03-19 11:04:56 Singular Exp $ */
+/* $Id: ipassign.cc,v 1.104 2009-05-01 15:09:32 Singular Exp $ */
 
 /*
@@ -551 +551 @@
 
   ring qr=(ring)res->Data(); // the declaration allocated space
+  omFreeBin((ADDRESS)qr, ip_sring_bin);
   ring qrr=rCopy(currRing);
                  // we have to fill it, but the copy also allocates space
-  memcpy4(qr,qrr,sizeof(ip_sring));
-  omFreeBin((ADDRESS)qrr, ip_sring_bin);
+  idhdl h=(idhdl)res->data; // we have res->rtyp==IDHDL
+  IDRING(h)=qrr;
+  qr=qrr;
 
 #ifdef HAVE_PLURAL
@@ -564 +566 @@
 #endif
 
-  // delete the qr copy of quotient ideal!!!
-  if (qr->qideal!=NULL) idDelete(&qr->qideal); 
 
   ideal id=(ideal)a->CopyD(IDEAL_CMD);
 
-  if ((idElem(id)>1) || rIsSCA(currRing) || (currRing->qideal!=NULL)) 
+  if ((idElem(id)>1) || rIsSCA(currRing) || (currRing->qideal!=NULL))
     assumeStdFlag(a);
 
@@ -578 +578 @@
     idDelete(&id);
     id=tmp;
-  }
-  qr->qideal = id;
+     // delete the qr copy of quotient ideal!!!
+    idDelete(&qr->qideal);
+  }
+  qrr->qideal = id;
 
   // qr is a copy of currRing with the new qideal!
@@ -592 +594 @@
     if( nc_SetupQuotient(qr, currRing) )
     {
-//      WarnS("error in nc_SetupQuotient"); 
+//      WarnS("error in nc_SetupQuotient");
     }
   }