[BACK]Return to parif.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / builtin

Diff for /OpenXM_contrib2/asir2000/builtin/parif.c between version 1.15 and 1.16

version 1.15, 2009/03/16 16:43:02 version 1.16, 2009/03/27 14:42:29
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/builtin/parif.c,v 1.14 2003/02/14 22:29:07 ohara Exp $   * $OpenXM: OpenXM_contrib2/asir2000/builtin/parif.c,v 1.15 2009/03/16 16:43:02 ohara Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
   
 #if defined(PARI)  #if defined(PARI)
 #include "genpari.h"  #include "genpari.h"
   // PARI_VERSION(2,2,8) == 131592
   #if PARI_VERSION_CODE >= 131592
   #define mppgcd(a,b)  (gcdii((a),(b)))
   #endif
   
 extern long prec;  long get_pariprec();
   void set_pariprec(long p);
   
 void patori(GEN,Obj *);  void patori(GEN,Obj *);
 void patori_i(GEN,N *);  void patori_i(GEN,N *);
Line 78  struct ftab pari_tab[] = {
Line 83  struct ftab pari_tab[] = {
         {0,0,0},          {0,0,0},
 };  };
   
 #define MKPREC(a,i,b) (argc(a)==(i)?mkprec(QTOS((Q)(b))):prec)  #define MKPREC(a,i,b) (argc(a)==(i)?mkprec(QTOS((Q)(b))):get_pariprec())
   
 #define CALLPARI1(f,a,p,r)\  #define CALLPARI1(f,a,p,r)\
 ritopa((Obj)a,&_pt1_); _pt2_ = f(_pt1_,p); patori(_pt2_,r); asir_cgiv(_pt2_); asir_cgiv(_pt1_)  ritopa((Obj)a,&_pt1_); _pt2_ = f(_pt1_,p); patori(_pt2_,r); asir_cgiv(_pt2_); asir_cgiv(_pt1_)
Line 168  Obj *rp;
Line 173  Obj *rp;
 {  {
         int p;          int p;
         Q q;          Q q;
           long prec = get_pariprec();
   
 #if defined(INTERVAL) || 1  #if defined(INTERVAL) || 1
         p = (int)((prec-2)/PREC_CONV); STOQ(p,q); *rp = (Obj)q;          p = (int)((prec-2)/PREC_CONV); STOQ(p,q); *rp = (Obj)q;
Line 184  Obj *rp;
Line 190  Obj *rp;
                 prec = mkprec(QTOS((Q)ARG0(arg)));                  prec = mkprec(QTOS((Q)ARG0(arg)));
         }          }
 #endif  #endif
           set_pariprec(prec);
 }  }
   
 #if defined(INTERVAL) || 1  #if defined(INTERVAL) || 1
Line 193  Obj *rp;
Line 200  Obj *rp;
 {  {
         int p;          int p;
         Q q;          Q q;
           long prec = get_pariprec();
   
         p = (int)((prec-2)); STOQ(p,q); *rp = (Obj)q;          p = (int)((prec-2)); STOQ(p,q); *rp = (Obj)q;
         if ( arg ) {          if ( arg ) {
Line 202  Obj *rp;
Line 210  Obj *rp;
                         prec = p + 2;                          prec = p + 2;
                 }                  }
         }          }
           set_pariprec(prec);
 }  }
 #endif  #endif
   

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>