Changeset 5a9405 in git

Timestamp:

Apr 16, 2010, 7:17:56 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

f5071ec27a184f35ac683643fbcb1eb088007333

Parents:

18640237cc3e76a4bdf4279f3fc1ac7fb9cdb4c3

Message:

gmp stuff/factory

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

File:

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

kernel/clapconv.cc

@@ -24 +24 @@
 #include "ffields.h"
 
+typedef __mpz_struct lint;
+
 void out_cf(char *s1,const CanonicalForm &f,char *s2);
 
@@ -56 +58 @@
       if ( n->s == 3 )
       {
-        term = make_cf( n->z );
+        lint dummy;
+        mpz_init_set( &dummy,n->z );
+        term = make_cf( dummy );
       }
       else
       {
         // assume s==0 or s==1
+        lint num, den;
         On(SW_RATIONAL);
-        term = make_cf(  n->z,  n->n, ( n->s != 1 ));
+        mpz_init_set( &num, n->z );
+        mpz_init_set( &den, n->n );
+        term = make_cf( num, den, ( n->s != 1 ));
       }
     }
@@ -179 +186 @@
         if ( pGetCoeff( p )->s == 3 )
         {
-          term = make_cf( pGetCoeff( p )->z );
+          lint dummy;
+          mpz_init_set( &dummy, (pGetCoeff( p )->z) );
+          term = make_cf( dummy );
         }
         else
         {
           // assume s==0 or s==1
+          lint num, den;
           On(SW_RATIONAL);
-          term = make_cf( pGetCoeff( p )->z, pGetCoeff( p )->n,
-                          ( pGetCoeff( p )->s != 1 ));
+          mpz_init_set( &num, (pGetCoeff( p )->z) );
+          mpz_init_set( &den, (pGetCoeff( p )->n) );
+          term = make_cf( num, den, ( pGetCoeff( p )->s != 1 ));
         }
       }
@@ -311 +322 @@
         if ( napGetCoeff( p )->s == 3 )
         {
-          term = make_cf( napGetCoeff( p )->z );
+          lint dummy;
+          mpz_init_set( &dummy, (napGetCoeff( p )->z) );
+          term = make_cf( dummy );
         }
         else
         {
           // assume s==0 or s==1
+          lint num, den;
           On(SW_RATIONAL);
-          term = make_cf( napGetCoeff( p )->z, napGetCoeff( p )->n,
-                          (napGetCoeff( p )->s != 1 ));
+          mpz_init_set( &num, (napGetCoeff( p )->z) );
+          mpz_init_set( &den, (napGetCoeff( p )->n) );
+          term = make_cf( num, den, ( napGetCoeff( p )->s != 1 ));
         }
       }