[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.4 and 1.5

version 1.4, 2000/08/22 05:03:59 version 1.5, 2000/11/15 00:07:20
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.3 2000/08/21 08:31:20 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/builtin/parif.c,v 1.4 2000/08/22 05:03:59 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 68  void ritopa_i();
Line 68  void ritopa_i();
 #endif  #endif
   
 void Peval(),Psetprec(),p_pi(),p_e(),p_mul(),p_gcd();  void Peval(),Psetprec(),p_pi(),p_e(),p_mul(),p_gcd();
   void asir_cgiv(GEN);
   
 struct ftab pari_tab[] = {  struct ftab pari_tab[] = {
         {"eval",Peval,-2}, {"setprec",Psetprec,-1}, {0,0,0},          {"eval",Peval,-2}, {"setprec",Psetprec,-1}, {0,0,0},
Line 76  struct ftab pari_tab[] = {
Line 77  struct ftab pari_tab[] = {
 #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))):prec)
   
 #define CALLPARI1(f,a,p,r)\  #define CALLPARI1(f,a,p,r)\
 ritopa((Obj)a,&_pt1_); _pt2_ = f(_pt1_,p); patori(_pt2_,r); cgiv(_pt2_); cgiv(_pt1_)  ritopa((Obj)a,&_pt1_); _pt2_ = f(_pt1_,p); patori(_pt2_,r); asir_cgiv(_pt2_); asir_cgiv(_pt1_)
 #define CALLPARI2(f,a,b,p,r)\  #define CALLPARI2(f,a,b,p,r)\
 ritopa((Obj)a,&_pt1_); ritopa((Obj)b,&_pt2_); _pt3_ = f(_pt1_,_pt2_,p); patori(_pt3_,r); cgiv(_pt3_); cgiv(_pt2_); cgiv(_pt1_)  ritopa((Obj)a,&_pt1_); ritopa((Obj)b,&_pt2_); _pt3_ = f(_pt1_,_pt2_,p); patori(_pt3_,r); asir_cgiv(_pt3_); asir_cgiv(_pt2_); asir_cgiv(_pt1_)
   
 #define PARIF1P(f,pf)\  #define PARIF1P(f,pf)\
 void f(NODE,Obj *);\  void f(NODE,Obj *);\
Line 96  void f(ar,rp) NODE ar; Obj *rp;\
Line 97  void f(ar,rp) NODE ar; Obj *rp;\
 #define PREC_CONV               0.051905126  #define PREC_CONV               0.051905126
 #endif  #endif
   
   /* XXX : we should be more careful when we free PARI pointers. */
   
   void asir_cgiv(ptr)
   GEN ptr;
   {
           if ( ptr != gzero && ptr != gun
           && ptr != gdeux && ptr != ghalf
           && ptr != polvar && ptr != gi )
                   cgiv(ptr);
   }
   
 mkprec(p)  mkprec(p)
 int p;  int p;
 {  {
Line 132  Obj *rp;
Line 144  Obj *rp;
         GEN x;          GEN x;
   
         x = mppi(MKPREC(arg,1,ARG0(arg)));          x = mppi(MKPREC(arg,1,ARG0(arg)));
         patori(x,rp); cgiv(x);          patori(x,rp); asir_cgiv(x);
 }  }
   
 void p_e(arg,rp)  void p_e(arg,rp)
Line 141  Obj *rp;
Line 153  Obj *rp;
 {  {
         GEN x;          GEN x;
   
         x = gexp(gun,MKPREC(arg,1,ARG0(arg))); patori(x,rp); cgiv(x);          x = gexp(gun,MKPREC(arg,1,ARG0(arg))); patori(x,rp); asir_cgiv(x);
 }  }
   
 void p_mul(a,b,r)  void p_mul(a,b,r)
Line 151  Obj a,b,*r;
Line 163  Obj a,b,*r;
   
         ritopa((Obj)a,&p1); ritopa((Obj)b,&p2);          ritopa((Obj)a,&p1); ritopa((Obj)b,&p2);
         p3 = mulii(p1,p2);          p3 = mulii(p1,p2);
         patori(p3,r); cgiv(p3); cgiv(p2); cgiv(p1);          patori(p3,r); asir_cgiv(p3); asir_cgiv(p2); asir_cgiv(p1);
 }  }
   
 void p_gcd(a,b,r)  void p_gcd(a,b,r)
Line 161  N a,b,*r;
Line 173  N a,b,*r;
   
         ritopa_i(a,1,&p1); ritopa_i(b,1,&p2);          ritopa_i(a,1,&p1); ritopa_i(b,1,&p2);
         p3 = mppgcd(p1,p2);          p3 = mppgcd(p1,p2);
         patori_i(p3,r); cgiv(p3); cgiv(p2); cgiv(p1);          patori_i(p3,r); asir_cgiv(p3); asir_cgiv(p2); asir_cgiv(p1);
 }  }
   
 PARIF1P(p_sin,gsin) PARIF1P(p_cos,gcos) PARIF1P(p_tan,gtan)  PARIF1P(p_sin,gsin) PARIF1P(p_cos,gcos) PARIF1P(p_tan,gtan)
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>