=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/bsave.c,v retrieving revision 1.10 retrieving revision 1.15 diff -u -p -r1.10 -r1.15 --- OpenXM_contrib2/asir2000/io/bsave.c 2001/10/09 01:36:20 1.10 +++ OpenXM_contrib2/asir2000/io/bsave.c 2006/08/09 02:40:47 1.15 @@ -44,7 +44,7 @@ * 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/bsave.c,v 1.9 2001/09/03 07:01:08 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/bsave.c,v 1.14 2004/12/10 07:36:35 noro Exp $ */ /* saveXXX must not use GC_malloc(), GC_malloc_atomic(). */ @@ -52,19 +52,22 @@ #include "parse.h" #include "com.h" -#if PARI +#if defined(PARI) #include "genpari.h" int get_lg(GEN); #endif +void savenbp(FILE *s,NBP p); + void (*savef[])() = { 0, savenum, savep, saver, savelist, savevect, - savemat, savestring, 0, savedp, saveui, saveerror,0,0,0,savegfmmat, savebytearray }; + savemat, savestring, 0, savedp, saveui, saveerror,0,0,0,savegfmmat, + savebytearray, 0, 0, 0, 0, 0, 0, 0, 0, savenbp }; #if defined(INTERVAL) void saveitv(); void saveitvd(); -void (*nsavef[])() = { saveq, savereal, 0, savebf, saveitv, saveitvd, 0, saveitv, savecplx ,savemi, savelm, savegf2n, savegfpn, savegfs, savegfsn}; +void (*nsavef[])() = { saveq, savereal, 0, savebf, saveitv, saveitvd, 0, saveitv, savecplx ,savemi, savelm, savegf2n, savegfpn, savegfs, savegfsn,savedalg}; #else -void (*nsavef[])() = { saveq, savereal, 0, savebf, savecplx ,savemi, savelm, savegf2n, savegfpn, savegfs, savegfsn}; +void (*nsavef[])() = { saveq, savereal, 0, savebf, savecplx ,savemi, savelm, savegf2n, savegfpn, savegfs, savegfsn,savedalg}; #endif static short zeroval = 0; @@ -112,11 +115,11 @@ void savereal(FILE *s,Real p) void savebf(FILE *s,BF p) { -#if PARI +#if defined(PARI) GEN z; int sign; unsigned long expo; - unsigned int len; + unsigned int len,t; z = (GEN)BDY(p); sign = signe(z); @@ -148,7 +151,7 @@ void saveitv(FILE *s,Itv p) saveobj(s,(Obj)SUP(p)); } -void saveitvd(FILE *s,ItvD p) +void saveitvd(FILE *s,IntervalDouble p) { write_double(s,&INF(p)); write_double(s,&SUP(p)); @@ -201,6 +204,12 @@ void savegfsn(FILE *s,GFSN p) write_intarray(s,COEF(BDY(p)),d+1); } +void savedalg(FILE *s,DAlg p) +{ + saveobj(s,(Obj)p->nm); + saveobj(s,(Obj)p->dn); +} + void savep(FILE *s,P p) { DCP dc; @@ -338,4 +347,21 @@ void savebytearray(FILE *s,BYTEARRAY p) { write_short(s,&OID(p)); write_int(s,&p->len); write_string(s,p->body,p->len); +} + +void savenbp(FILE *s,NBP p) +{ + int i,n; + NODE t; + NBM m; + + write_short(s,&OID(p)); + for ( n = 0, t = BDY(p); t; t = NEXT(t), n++ ); + write_int(s,&n); + for ( i = 0, t = BDY(p); i < n; t = NEXT(t), i++ ) { + m = (NBM)BDY(t); + saveobj(s,(Obj)m->c); + write_int(s,&m->d); + write_intarray(s,m->b,(m->d+31)/32); + } }