Changeset a604c3 in git for kernel/longrat0.cc

Timestamp:

Apr 16, 2010, 12:15:43 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0f7301e691bd462913428c33f8962015a37bb532

Parents:

603aebf126f77cf0b8c041b0833934960300078a

Message:

gmp stuff

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

File:

• kernel/longrat0.cc (modified) (4 diffs)

kernel/longrat0.cc

@@ -26 +26 @@
 * extracts a long integer from s, returns the rest
 */
-static const char * nlEatLong(char *s, MP_INT *i)
+static const char * nlEatLong(char *s, mpz_ptr i)
 {
   const char * start=s;
@@ -61 +61 @@
     (*a)->debug=123456;
 #endif
-    MP_INT *z=&((*a)->z);
-    MP_INT *n=&((*a)->n);
+    mpz_ptr z=(*a)->z;
+    mpz_ptr n=(*a)->n;
     mpz_init(z);
     s = nlEatLong((char *)s, z);
@@ -90 +90 @@
     if ((*a)->s==3)
     {
-      int ui=(int)mpz_get_si(&(*a)->z);
+      int ui=(int)mpz_get_si((*a)->z);
       if ((((ui<<3)>>3)==ui)
-      && (mpz_cmp_si(&(*a)->z,(long)ui)==0))
+      && (mpz_cmp_si((*a)->z,(long)ui)==0))
       {
-        mpz_clear(&(*a)->z);
+        mpz_clear((*a)->z);
         omFreeBin((ADDRESS)(*a), rnumber_bin);
         (*a)=INT_TO_SR(ui);
@@ -127 +127 @@
       return;
     }
-    int l=mpz_sizeinbase(&a->z,10);
-    if (a->s<2) l=si_max(l,mpz_sizeinbase(&a->n,10));
+    int l=mpz_sizeinbase(a->z,10);
+    if (a->s<2) l=si_max(l,mpz_sizeinbase(a->n,10));
     l+=2;
     s=(char*)omAlloc(l);
-    z=mpz_get_str(s,10,&a->z);
+    z=mpz_get_str(s,10,a->z);
     StringAppendS(z);
     if (a->s!=3)
     {
       StringAppendS("/");
-      z=mpz_get_str(s,10,&a->n);
+      z=mpz_get_str(s,10,a->n);
       StringAppendS(z);
     }