Changeset 12e275 in git for Singular/ipshell.cc

Timestamp:

Dec 4, 2014, 5:51:33 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

f19aa6812e6421a0bbd161f43b974557d7f6b874

Parents:

fe6b623ec279088e48111ca37e0592c7d7a54822

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-12-04 17:51:33+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-12-15 18:49:40+01:00

Message:

Mark deprecated BIGINT handling + related bugs / side effects

FIXMEs: nlGMP -> n_MPZ. Check for side effects and nlMapGMP
Fix: bug in BIGINT deletion
Fix: a possible bug due to sideeffect!?

File:

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

Singular/ipshell.cc

@@ -21 +21 @@
 
 #include <coeffs/rmodulon.h>
+#include <coeffs/longrat.h>
 
 #include <polys/monomials/ring.h>
@@ -1307 +1308 @@
          break;
       case BIGINT_CMD:
-         n_Delete(&IDNUMBER(pp),currRing->cf);
+         n_Delete(&IDNUMBER(pp),coeffs_BIGINT);
          break;
       case MAP_CMD:
@@ -1806 +1807 @@
   LL->Init(2);
   LL->m[0].rtyp=BIGINT_CMD;
-  LL->m[0].data=nlMapGMP((number) R->cf->modBase, R->cf, R->cf);
+  LL->m[0].data=nlMapGMP((number) R->cf->modBase, R->cf, R->cf); // TODO: what is this?? // extern number nlMapGMP(number from, const coeffs src, const coeffs dst); // FIXME: replace with n_InitMPZ(R->cf->modBase, coeffs_BIGINT); ?
   LL->m[1].rtyp=INT_CMD;
   LL->m[1].data=(void *) R->cf->modExponent;
@@ -2090 +2091 @@
     if ((LL->nr >= 0) && LL->m[0].rtyp == BIGINT_CMD)
     {
-      number tmp= (number) LL->m[0].data;
-      n_MPZ (modBase, tmp, coeffs_BIGINT);
+      number tmp= (number) LL->m[0].data; // .CopyD()? see below
+      n_MPZ (modBase, tmp, coeffs_BIGINT); // FIXME: deletes tmp: previous CopyD() should NOT be necessary! 
     }
     else if (LL->nr >= 0 && LL->m[0].rtyp == INT_CMD)
@@ -5266 +5267 @@
   else if ((pn->name != NULL) && (strcmp(pn->name, "integer") == 0))
   {
+    // TODO: change to use coeffs_BIGINT!? 
     modBase = (mpz_ptr) omAlloc(sizeof(mpz_t));
     mpz_init_set_si(modBase, 0);
@@ -5287 +5289 @@
       else if (pn->next->Typ()==BIGINT_CMD)
       {
-        number p=(number)pn->next->CopyD();
-        nlGMP(p,(number)modBase,coeffs_BIGINT);
-        nlDelete(&p,coeffs_BIGINT);
+        number p=(number)pn->next->CopyD(); // FIXME: why CopyD() here if nlGMP should not overtake p!?
+        nlGMP(p,(number)modBase,coeffs_BIGINT); // TODO? // extern void   nlGMP(number &i, number n, const coeffs r); // FIXME: n_MPZ( modBase, p, coeffs_BIGINT); ?
+        n_Delete(&p,coeffs_BIGINT);
       }
     }