Changeset f12c611 in git

Timestamp:

Feb 22, 2011, 1:30:29 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

a88046d27c938a1910afa9a5e740f5506f074de3

Parents:

186b4dfdc9f37d1755a016dd270b88c8f6300ef4

Message:

tr 315: work-around for PLURAL

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

Location:

kernel

Files:

• ideals.cc (modified) (1 diff)
• longrat0.cc (modified) (4 diffs)

kernel/ideals.cc

@@ -1520 +1520 @@
     s_h3 = idrMoveR_NoSort(s_h3, syz_ring);
     rKill(syz_ring);
+    #ifdef HAVE_PLURAL
+    if (rIsPluralRing(currRing))
+    {
+      idDelMultiples(s_h3);
+      idSkipZeroes(s_h3);
+    }
+    #endif
     idTest(s_h3);
     return s_h3;

kernel/longrat0.cc

@@ -19 +19 @@
 #define SR_HDL(A) ((long)(A))
 //#define SR_INT    1 // already in longrat.h
-#define INT_TO_SR(INT)  ((number) (((long)INT << 2) + SR_INT))
+//#define INT_TO_SR(INT)  ((number) (((long)INT << 2) + SR_INT))
 #define SR_TO_INT(SR)   (((long)SR) >> 2)
 
@@ -85 +85 @@
     if (mpz_cmp_si(z,(long)0)==0)
     {
+      mpz_clear(z);
+      omFreeBin(*a,rnumber_bin);
       *a=INT_TO_SR(0);
     }
@@ -90 +92 @@
     if ((*a)->s==3)
     {
-      int ui=(int)mpz_get_si((*a)->z);
-      if ((((ui<<3)>>3)==ui)
-      && (mpz_cmp_si((*a)->z,(long)ui)==0))
-      {
-        mpz_clear((*a)->z);
-        omFreeBin((ADDRESS)(*a), rnumber_bin);
-        (*a)=INT_TO_SR(ui);
-      }
+      number nlShort3_noinline(number x);
+      *a=nlShort3_noinline(*a);
     }
     else
@@ -113 +109 @@
   if (SR_HDL(a) & SR_INT)
   {
-    StringAppend("%d",SR_TO_INT(a));
+    StringAppend("%ld",SR_TO_INT(a));
   }
   else if (a==NULL)