=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/bload.c,v retrieving revision 1.4 retrieving revision 1.10 diff -u -p -r1.4 -r1.10 --- OpenXM_contrib2/asir2000/io/bload.c 2000/11/08 08:02:51 1.4 +++ OpenXM_contrib2/asir2000/io/bload.c 2001/10/09 01:36:20 1.10 @@ -44,51 +44,29 @@ * 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.3 2000/08/22 05:04:17 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/bload.c,v 1.9 2001/09/03 07:01:08 noro Exp $ */ #include "ca.h" #include "parse.h" -#if INET #include "com.h" -#endif #if 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 (*loadf[])() = { 0, loadnum, loadp, loadr, loadlist, loadvect, loadmat, loadstring, 0, loaddp, loadui, loaderror,0,0,0,loadgfmmat, loadbytearray }; -void (*nloadf[])() = { loadq, loadreal, 0, loadbf, loadcplx, loadmi, loadlm, loadgf2n, loadgfpn }; +#if defined(INTERVAL) +void loaditv(); +void loaditvd(); +void (*nloadf[])() = { loadq, loadreal, 0, loadbf, loaditv, loaditvd, 0, loaditv, loadcplx, loadmi, loadlm, loadgf2n, loadgfpn, loadgfs, loadgfsn }; +#else +void (*nloadf[])() = { loadq, loadreal, 0, loadbf, loadcplx, loadmi, loadlm, loadgf2n, loadgfpn, loadgfs, loadgfsn }; +#endif -void loadobj(s,p) -FILE *s; -Obj *p; +void loadobj(FILE *s,Obj *p) { short id; @@ -101,9 +79,7 @@ Obj *p; (*loadf[id])(s,p); } -void loadnum(s,p) -FILE *s; -Num *p; +void loadnum(FILE *s,Num *p) { char nid; @@ -114,9 +90,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; @@ -134,9 +108,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; @@ -146,14 +118,11 @@ Real *p; *p = q; } -void loadbf(s,p) -FILE *s; -BF *p; +void loadbf(FILE *s,BF *p) { #if PARI GEN z; unsigned int uexpo,lexpo; - UL expo; char dmy; int sign; unsigned int len; @@ -192,10 +161,32 @@ BF *p; #endif } -void loadcplx(s,p) -FILE *s; -C *p; +#if defined(INTERVAL) +void loaditv(FILE *s,Itv *p) { + Itv q; + char dmy; + + read_char(s,&dmy); + NEWItvP(q); loadobj(s,(Obj *)&INF(q)); loadobj(s,(Obj *)&SUP(q)); + *p = q; +} + +void loaditvd(FILE *s,ItvD *p) +{ + ItvD q; + char dmy; + + read_char(s,&dmy); + NEWItvD(q); + read_double(s,&INF(q)); + read_double(s,&SUP(q)); + *p = q; +} +#endif + +void loadcplx(FILE *s,C *p) +{ C q; char dmy; @@ -204,9 +195,7 @@ C *p; *p = q; } -void loadmi(s,p) -FILE *s; -MQ *p; +void loadmi(FILE *s,MQ *p) { MQ q; char dmy; @@ -216,9 +205,7 @@ MQ *p; *p = q; } -void loadlm(s,p) -FILE *s; -LM *p; +void loadlm(FILE *s,LM *p) { int size; char dmy; @@ -230,9 +217,7 @@ LM *p; MKLM(body,*p); } -void loadgf2n(s,p) -FILE *s; -GF2N *p; +void loadgf2n(FILE *s,GF2N *p) { char dmy; int len; @@ -244,9 +229,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; @@ -260,10 +243,30 @@ 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 loadp(FILE *s,P *p) +{ V v; int n,vindex; DCP dc,dc0; @@ -289,8 +292,7 @@ P *p; /* |name(str)|argc(int)|darray(intarray)|args| */ -V loadpfins(s) -FILE *s; +V loadpfins(FILE *s) { char *name; FUNC fp; @@ -328,9 +330,7 @@ FILE *s; return v; } -void loadr(s,p) -FILE *s; -R *p; +void loadr(FILE *s,R *p) { R r; @@ -338,9 +338,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; @@ -354,9 +352,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; @@ -367,9 +363,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; @@ -381,18 +375,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; @@ -405,9 +395,7 @@ char **p; *p = t; } -void loadbytearray(s,p) -FILE *s; -BYTEARRAY *p; +void loadbytearray(FILE *s,BYTEARRAY *p) { int len; BYTEARRAY array; @@ -420,9 +408,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; @@ -439,18 +425,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; @@ -458,11 +440,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;