[BACK]Return to ox_pari.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / ox_pari

Diff for /OpenXM/src/ox_pari/ox_pari.c between version 1.12 and 1.15

version 1.12, 2015/08/21 01:20:30 version 1.15, 2016/09/23 07:03:29
Line 1 
Line 1 
 /*  $OpenXM: OpenXM/src/ox_pari/ox_pari.c,v 1.11 2015/08/21 00:53:53 noro Exp $  */  /*  $OpenXM: OpenXM/src/ox_pari/ox_pari.c,v 1.14 2016/08/23 03:03:26 ohara Exp $  */
   
 #include "ox_pari.h"  #include "ox_pari.h"
   
Line 85  void pops(int n)
Line 85  void pops(int n)
   
 int sm_mathcap()  int sm_mathcap()
 {  {
   mathcap_init(OX_PARI_VERSION, ID_STRING, "ox_pari", NULL, NULL);    char *opts[] = {"no_ox_reset", NULL};
     mathcap_init2(OX_PARI_VERSION, ID_STRING, "ox_pari", NULL, NULL, opts);
   push((cmo*)oxf_cmo_mathcap(fd_rw));    push((cmo*)oxf_cmo_mathcap(fd_rw));
   return 0;    return 0;
 }  }
Line 151  int sm_executeFunction()
Line 152  int sm_executeFunction()
   struct parif *parif;    struct parif *parif;
   unsigned long prec;    unsigned long prec;
   char buf[BUFSIZ];    char buf[BUFSIZ];
     int status;
     char *err;
   
   if ( setjmp(GP_DATA->env) ) {    if ( (status = setjmp(GP_DATA->env)) != 0 ) {
     sprintf(buf,"sm_executeFunction : an error occured in PARI.");      err = errmessage[status];
       if ( status == errpile ) {
         sprintf(buf,"%s\nIncrease PARI stack by pari(allocatemem,size).",err);
         init_pari();
       } else if ( strlen(err) != 0 )
         sprintf(buf,"An error occured in PARI :%s",err);
       else
         sprintf(buf,"An error occured in PARI.");
     push((cmo*)make_error2(buf));      push((cmo*)make_error2(buf));
     return -1;      return -1;
   }    }
Line 206  int sm_executeFunction()
Line 216  int sm_executeFunction()
     }      }
     printf("input : "); output(z);      printf("input : "); output(z);
     m = (*parif->f)(z,prec);      m = (*parif->f)(z,prec);
       ret = GEN_to_cmo(m);
       avma = av0;
       push(ret);
       return 0;
     } else if ( parif->type == 2 ) {
       /* one number/poly/matrix argument with flag=0 */
       av0 = avma;
       z = cmo_to_GEN(av[0]);
       if ( ismatrix(z) ) {
         int i,len;
         len = lg(z);
         for ( i = 1; i < len; i++ )
           settyp(z[i],t_COL);
         settyp(z,t_MAT);
         z = shallowtrans(z);
       }
       printf("input : "); output(z);
       m = (*parif->f)(z,0);
     ret = GEN_to_cmo(m);      ret = GEN_to_cmo(m);
     avma = av0;      avma = av0;
     push(ret);      push(ret);
Legend:
Removed from v.1.12  
changed lines
  Added in v.1.15
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>