=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/bload.c,v retrieving revision 1.6 retrieving revision 1.15 diff -u -p -r1.6 -r1.15 --- OpenXM_contrib2/asir2000/io/bload.c 2000/12/22 10:03:30 1.6 +++ OpenXM_contrib2/asir2000/io/bload.c 2006/08/09 02:40:47 1.15 @@ -44,55 +44,33 @@ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. - * $OpenXM: OpenXM_contrib2/asir2000/io/bload.c,v 1.5 2000/12/05 01:24:54 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/bload.c,v 1.14 2004/12/10 07:36:35 noro Exp $ */ #include "ca.h" #include "parse.h" #include "com.h" -#if PARI +#if defined(PARI) #include "genpari.h" int get_lg(GEN); #endif -void loaderror(FILE *,ERR *); -void loadui(FILE *,USINT *); -void loaddp(FILE *,DP *); -void loadstr(FILE *,char **); -void loadstring(FILE *,STRING *); -void loadmat(FILE *,MAT *); -void loadvect(FILE *,VECT *); -void loadlist(FILE *,LIST *); -void loadr(FILE *,R *); -void loadp(FILE *,P *); -void loadgf2n(FILE *,GF2N *); -void loadgfpn(FILE *,GFPN *); -void loadlm(FILE *,LM *); -void loadmi(FILE *,MQ *); -void loadcplx(FILE *,C *); -void loadbf(FILE *,BF *); -void loadreal(FILE *,Real *); -void loadq(FILE *,Q *); -void loadnum(FILE *,Num *); -void loadgfmmat(FILE *,GFMMAT *); -void loadbytearray(FILE *,BYTEARRAY *); - -V loadpfins(FILE *); - extern VL file_vl; +void loadnbp(FILE *s,NBP *p); + 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) -int loaditv(); -int loaditvd(); -void (*nloadf[])() = { loadq, loadreal, 0, loadbf, loaditv, loaditvd, 0, loaditv, loadcplx, loadmi, loadlm, loadgf2n, loadgfpn }; +void loaditv(); +void loaditvd(); +void (*nloadf[])() = { loadq, loadreal, 0, loadbf, loaditv, loaditvd, 0, loaditv, loadcplx, loadmi, loadlm, loadgf2n, loadgfpn, loadgfs, loadgfsn, loaddalg }; #else -void (*nloadf[])() = { loadq, loadreal, 0, loadbf, loadcplx, loadmi, loadlm, loadgf2n, loadgfpn }; +void (*nloadf[])() = { loadq, loadreal, 0, loadbf, loadcplx, loadmi, loadlm, loadgf2n, loadgfpn, loadgfs, loadgfsn, loaddalg }; #endif -void loadobj(s,p) -FILE *s; -Obj *p; +void loadobj(FILE *s,Obj *p) { short id; @@ -105,9 +83,7 @@ Obj *p; (*loadf[id])(s,p); } -void loadnum(s,p) -FILE *s; -Num *p; +void loadnum(FILE *s,Num *p) { char nid; @@ -118,9 +94,7 @@ Num *p; (*nloadf[nid])(s,p); } -void loadq(s,p) -FILE *s; -Q *p; +void loadq(FILE *s,Q *p) { int size[2]; char sgn; @@ -138,9 +112,7 @@ Q *p; NDTOQ(nm,dn,sgn,*p); } -void loadreal(s,p) -FILE *s; -Real *p; +void loadreal(FILE *s,Real *p) { Real q; char dmy; @@ -150,17 +122,15 @@ Real *p; *p = q; } -void loadbf(s,p) -FILE *s; -BF *p; +void loadbf(FILE *s,BF *p) { -#if PARI +#if defined(PARI) GEN z; unsigned int uexpo,lexpo; - UL expo; char dmy; int sign; unsigned int len; + unsigned long expo; BF q; read_char(s,&dmy); @@ -197,9 +167,7 @@ BF *p; } #if defined(INTERVAL) -loaditv(s,p) -FILE *s; -Itv *p; +void loaditv(FILE *s,Itv *p) { Itv q; char dmy; @@ -209,24 +177,20 @@ Itv *p; *p = q; } -loaditvd(s,p) -FILE *s; -ItvD *p; +void loaditvd(FILE *s,IntervalDouble *p) { - ItvD q; + IntervalDouble q; char dmy; read_char(s,&dmy); - NEWItvD(q); + NEWIntervalDouble(q); read_double(s,&INF(q)); read_double(s,&SUP(q)); *p = q; } #endif -void loadcplx(s,p) -FILE *s; -C *p; +void loadcplx(FILE *s,C *p) { C q; char dmy; @@ -236,9 +200,7 @@ C *p; *p = q; } -void loadmi(s,p) -FILE *s; -MQ *p; +void loadmi(FILE *s,MQ *p) { MQ q; char dmy; @@ -248,9 +210,7 @@ MQ *p; *p = q; } -void loadlm(s,p) -FILE *s; -LM *p; +void loadlm(FILE *s,LM *p) { int size; char dmy; @@ -262,9 +222,7 @@ LM *p; MKLM(body,*p); } -void loadgf2n(s,p) -FILE *s; -GF2N *p; +void loadgf2n(FILE *s,GF2N *p) { char dmy; int len; @@ -276,9 +234,7 @@ GF2N *p; MKGF2N(body,*p); } -void loadgfpn(s,p) -FILE *s; -GFPN *p; +void loadgfpn(FILE *s,GFPN *p) { char dmy; int d,i; @@ -292,10 +248,41 @@ GFPN *p; MKGFPN(body,*p); } -void loadp(s,p) -FILE *s; -P *p; +void loadgfs(FILE *s,GFS *p) { + GFS q; + char dmy; + + read_char(s,&dmy); + NEWGFS(q); read_int(s,(int *)&CONT(q)); + *p = q; +} + +void loadgfsn(FILE *s,GFSN *p) +{ + char dmy; + int d; + UM body; + + read_char(s,&dmy); read_int(s,&d); + body = UMALLOC(d); DEG(body) = d; + read_intarray(s,COEF(body),d+1); + 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) +{ V v; int n,vindex; DCP dc,dc0; @@ -321,8 +308,7 @@ P *p; /* |name(str)|argc(int)|darray(intarray)|args| */ -V loadpfins(s) -FILE *s; +V loadpfins(FILE *s) { char *name; FUNC fp; @@ -360,9 +346,7 @@ FILE *s; return v; } -void loadr(s,p) -FILE *s; -R *p; +void loadr(FILE *s,R *p) { R r; @@ -370,9 +354,7 @@ R *p; loadobj(s,(Obj *)&NM(r)); loadobj(s,(Obj *)&DN(r)); *p = r; } -void loadlist(s,p) -FILE *s; -LIST *p; +void loadlist(FILE *s,LIST *p) { int n; NODE tn,tn0; @@ -386,9 +368,7 @@ LIST *p; MKLIST(*p,tn0); } -void loadvect(s,p) -FILE *s; -VECT *p; +void loadvect(FILE *s,VECT *p) { int i,len; VECT vect; @@ -399,9 +379,7 @@ VECT *p; *p = vect; } -void loadmat(s,p) -FILE *s; -MAT *p; +void loadmat(FILE *s,MAT *p) { int row,col,i,j; MAT mat; @@ -413,18 +391,14 @@ MAT *p; *p = mat; } -void loadstring(s,p) -FILE *s; -STRING *p; +void loadstring(FILE *s,STRING *p) { char *t; loadstr(s,&t); MKSTR(*p,t); } -void loadstr(s,p) -FILE *s; -char **p; +void loadstr(FILE *s,char **p) { int len; char *t; @@ -437,9 +411,7 @@ char **p; *p = t; } -void loadbytearray(s,p) -FILE *s; -BYTEARRAY *p; +void loadbytearray(FILE *s,BYTEARRAY *p) { int len; BYTEARRAY array; @@ -452,9 +424,7 @@ BYTEARRAY *p; *p = array; } -void loaddp(s,p) -FILE *s; -DP *p; +void loaddp(FILE *s,DP *p) { int nv,n,i,sugar; DP dp; @@ -471,18 +441,14 @@ DP *p; NEXT(m) = 0; MKDP(nv,m0,dp); dp->sugar = sugar; *p = dp; } -void loadui(s,u) -FILE *s; -USINT *u; +void loadui(FILE *s,USINT *u) { unsigned int b; read_int(s,&b); MKUSINT(*u,b); } -void loaderror(s,e) -FILE *s; -ERR *e; +void loaderror(FILE *s,ERR *e) { Obj b; @@ -490,11 +456,9 @@ ERR *e; } -void loadgfmmat(s,p) -FILE *s; -GFMMAT *p; +void loadgfmmat(FILE *s,GFMMAT *p) { - int i,j,row,col; + int i,row,col; unsigned int **a; GFMMAT mat; @@ -504,4 +468,22 @@ GFMMAT *p; for ( i = 0; i < row; i++ ) read_intarray(s,a[i],col); *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); }