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

Diff for /OpenXM_contrib2/asir2000/io/bload.c between version 1.11 and 1.15

version 1.11, 2002/01/08 04:14:38 version 1.15, 2006/08/09 02:40:47
Line 44 
Line 44 
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY   * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * 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/io/bload.c,v 1.10 2001/10/09 01:36:20 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/bload.c,v 1.14 2004/12/10 07:36:35 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
 #include "com.h"  #include "com.h"
 #if PARI  #if defined(PARI)
 #include "genpari.h"  #include "genpari.h"
 int get_lg(GEN);  int get_lg(GEN);
 #endif  #endif
   
 extern VL file_vl;  extern VL file_vl;
   
   void loadnbp(FILE *s,NBP *p);
   
 void (*loadf[])() = { 0, loadnum, loadp, loadr, loadlist, loadvect, loadmat,  void (*loadf[])() = { 0, loadnum, loadp, loadr, loadlist, loadvect, loadmat,
         loadstring, 0, loaddp, loadui, loaderror,0,0,0,loadgfmmat, loadbytearray };          loadstring, 0, loaddp, loadui, loaderror,0,0,0,loadgfmmat,
           loadbytearray, 0, 0, 0, 0, 0, 0, 0, 0,  loadnbp };
   
 #if defined(INTERVAL)  #if defined(INTERVAL)
 void loaditv();  void loaditv();
 void loaditvd();  void loaditvd();
 void (*nloadf[])() = { loadq, loadreal, 0, loadbf, loaditv, loaditvd, 0, loaditv, loadcplx, loadmi, loadlm, loadgf2n, loadgfpn, loadgfs, loadgfsn };  void (*nloadf[])() = { loadq, loadreal, 0, loadbf, loaditv, loaditvd, 0, loaditv, loadcplx, loadmi, loadlm, loadgf2n, loadgfpn, loadgfs, loadgfsn, loaddalg };
 #else  #else
 void (*nloadf[])() = { loadq, loadreal, 0, loadbf, loadcplx, loadmi, loadlm, loadgf2n, loadgfpn, loadgfs, loadgfsn };  void (*nloadf[])() = { loadq, loadreal, 0, loadbf, loadcplx, loadmi, loadlm, loadgf2n, loadgfpn, loadgfs, loadgfsn, loaddalg };
 #endif  #endif
   
 void loadobj(FILE *s,Obj *p)  void loadobj(FILE *s,Obj *p)
Line 120  void loadreal(FILE *s,Real *p)
Line 124  void loadreal(FILE *s,Real *p)
   
 void loadbf(FILE *s,BF *p)  void loadbf(FILE *s,BF *p)
 {  {
 #if PARI  #if defined(PARI)
         GEN z;          GEN z;
         unsigned int uexpo,lexpo;          unsigned int uexpo,lexpo;
         char dmy;          char dmy;
         int sign;          int sign;
         unsigned int len;          unsigned int len;
           unsigned long expo;
         BF q;          BF q;
   
         read_char(s,&dmy);          read_char(s,&dmy);
Line 265  void loadgfsn(FILE *s,GFSN *p)
Line 270  void loadgfsn(FILE *s,GFSN *p)
         MKGFSN(body,*p);          MKGFSN(body,*p);
 }  }
   
   void loaddalg(FILE *s,DAlg *p)
   {
           char dmy;
           Obj nm,dn;
   
           read_char(s,&dmy);
           loadobj(s,&nm);
           loadobj(s,&dn);
           MKDAlg((DP)nm,(Q)dn,*p);
   }
   
 void loadp(FILE *s,P *p)  void loadp(FILE *s,P *p)
 {  {
         V v;          V v;
Line 452  void loadgfmmat(FILE *s,GFMMAT *p) 
Line 468  void loadgfmmat(FILE *s,GFMMAT *p) 
         for ( i = 0; i < row; i++ )          for ( i = 0; i < row; i++ )
                 read_intarray(s,a[i],col);                  read_intarray(s,a[i],col);
         *p = mat;          *p = mat;
   }
   
   void loadnbp(FILE *s,NBP *p)
   {
           int n,i;
           NBM m;
           NODE r0,r;
   
           read_int(s,&n);
           for ( i = 0, r0 = 0; i < n; i++ ) {
                   NEWNBM(m);
                   loadobj(s,(Obj *)&m->c);
                   read_int(s,&m->d);
                   NEWNBMBDY(m,m->d); read_intarray(s,m->b,(m->d+31)/32);
                   NEXTNODE(r0,r); BDY(r) = (pointer)m;
           }
           if ( r0 ) NEXT(r) = 0;
           MKNBP(*p,r0);
 }  }
Legend:
Removed from v.1.11  
changed lines
  Added in v.1.15
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>