===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/bsave.c,v
retrieving revision 1.5
retrieving revision 1.18
diff -u -p -r1.5 -r1.18
--- OpenXM_contrib2/asir2000/io/bsave.c	2000/12/05 01:24:54	1.5
+++ OpenXM_contrib2/asir2000/io/bsave.c	2015/08/13 00:13:03	1.18
@@ -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.4 2000/11/08 08:02:51 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/bsave.c,v 1.17 2015/08/04 06:20:45 noro Exp $ 
 */
 /* saveXXX must not use GC_malloc(), GC_malloc_atomic(). */
 
@@ -52,43 +52,22 @@
 #include "parse.h"
 #include "com.h"
 
-#if PARI
-#include "genpari.h"
-int get_lg(GEN);
-#endif
+void savenbp(FILE *s,NBP p);
 
-void saveerror(FILE *,ERR);
-void saveui(FILE *,USINT);
-void savedp(FILE *,DP);
-void savestr(FILE *,char *);
-void savestring(FILE *,STRING);
-void savemat(FILE *,MAT);
-void savevect(FILE *,VECT);
-void savelist(FILE *,LIST);
-void saver(FILE *,R);
-void savep(FILE *,P);
-void savegf2n(FILE *,GF2N);
-void savegfpn(FILE *,GFPN);
-void savelm(FILE *,LM);
-void savemi(FILE *,MQ);
-void savecplx(FILE *,C);
-void savebf(FILE *,BF);
-void savereal(FILE *,Real);
-void saveq(FILE *,Q);
-void savenum(FILE *,Num);
-void savepfins(FILE *,V);
-void savegfmmat(FILE *,GFMMAT);
-void savebytearray(FILE *,BYTEARRAY);
-
 void (*savef[])() = { 0, savenum, savep, saver, savelist, savevect,
-	savemat, savestring, 0, savedp, saveui, saveerror,0,0,0,savegfmmat, savebytearray };
-void (*nsavef[])() = { saveq, savereal, 0, savebf, savecplx ,savemi, savelm, savegf2n, savegfpn};
+	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,savedalg};
+#else
+void (*nsavef[])() = { saveq, savereal, 0, savebf, savecplx ,savemi, savelm, savegf2n, savegfpn, savegfs, savegfsn,savedalg};
+#endif
 
 static short zeroval = 0;
 
-void saveobj(s,p)
-FILE *s;
-Obj p;
+void saveobj(FILE *s,Obj p)
 {
 	if ( !p )
 		write_short(s,&zeroval);
@@ -98,9 +77,7 @@ Obj p;
 		(*savef[OID(p)])(s,p);
 }
 
-void savenum(s,p)
-FILE *s;
-Num p;
+void savenum(FILE *s,Num p)
 { 
 	if ( !nsavef[NID(p)] )
 		error("savenum : not implemented");
@@ -111,9 +88,7 @@ Num p;
 	}
 }
 
-void saveq(s,p)
-FILE *s;
-Q p;
+void saveq(FILE *s,Q p)
 {
 	int size[2];
 	int len = 2;
@@ -125,9 +100,7 @@ Q p;
 		write_intarray(s,BD(DN(p)),size[1]);
 }
 
-void savereal(s,p)
-FILE *s;
-Real p;
+void savereal(FILE *s,Real p)
 { write_double(s,&BDY(p)); }
 
 /*
@@ -135,52 +108,52 @@ Real p;
  * -> | id(2) | nid(1) | sgn(1) | expo>>32 | expo&0xffffffff | len | ... |
  */
 
-void savebf(s,p)
-FILE *s;
-BF p;
+void savebf(FILE *s,BF p)
 {
-#if PARI
-	GEN z;
-	int sign;
-	unsigned long expo;
-	unsigned int len,t;
+  unsigned int zero = 0;
+  unsigned int prec;
+	L exp;
+  int sgn,len,t;
 
-	z = (GEN)BDY(p);
-	sign = signe(z);
-	len = lg(z)-2;
-	expo = expo(z);
+  prec = MPFR_PREC(p->body);
+  exp = MPFR_EXP(p->body);
+  sgn = MPFR_SIGN(p->body);
+	len = MPFR_LIMB_SIZE(p->body);
 
-	write_int(s,&sign);
-
-#if defined(LONG_IS_32BIT)
-	write_int(s,(int *)&zeroval); /* expo>>32 is always 0 */
-	write_int(s,(int *)&expo); 
+	write_int(s,&sgn);
+	write_int(s,(int *)&prec);
+	write_int64(s,(UL *)&exp);
+#if SIZEOF_LONG == 4
 	write_int(s,&len);
-	write_intarray(s,(int *)&z[2],len);
-#elif defined(LONG_IS_64BIT)
-	t = expo>>32; write_int(s,(int *)&t);
-	t = expo&0xffffffff; write_int(s,&t);
-	t = 2*len; write_int(s,&t);
-	write_longarray(s,&z[2],len);
+	write_intarray(s,p->body->_mpfr_d,len);
+#else /* SIZEOF_LONG == 8 */
+	t = (prec+31)/32; 
+	write_int(s,&t);
+	write_longarray(s,p->body->_mpfr_d,t);
 #endif
-#else
-	error("savebf : PARI is not combined");
-#endif
 }
 
-void savecplx(s,p)
-FILE *s;
-C p;
+#if defined(INTERVAL)
+void saveitv(FILE *s,Itv p)
+{
+	saveobj(s,(Obj)INF(p));
+	saveobj(s,(Obj)SUP(p));
+}
+
+void saveitvd(FILE *s,IntervalDouble p)
+{
+	write_double(s,&INF(p));
+	write_double(s,&SUP(p));
+}
+#endif
+
+void savecplx(FILE *s,C p)
 { saveobj(s,(Obj)p->r); saveobj(s,(Obj)p->i); }
 
-void savemi(s,p)
-FILE *s;
-MQ p;
+void savemi(FILE *s,MQ p)
 { write_int(s,&CONT(p)); }
 
-void savelm(s,p)
-FILE *s;
-LM p;
+void savelm(FILE *s,LM p)
 {
 	int size;
 
@@ -189,9 +162,7 @@ LM p;
 	write_intarray(s,BD(BDY(p)),size);
 }
 
-void savegf2n(s,p)
-FILE *s;
-GF2N p;
+void savegf2n(FILE *s,GF2N p)
 {
 	int len;
 
@@ -200,9 +171,7 @@ GF2N p;
 	write_intarray(s,p->body->b,len);
 }
 
-void savegfpn(s,p)
-FILE *s;
-GFPN p;
+void savegfpn(FILE *s,GFPN p)
 {
 	int d,i;
 
@@ -212,10 +181,26 @@ GFPN p;
 		saveobj(s,(Obj)p->body->c[i]);
 }
 
-void savep(s,p)
-FILE *s;
-P p;
+void savegfs(FILE *s,GFS p)
+{ write_int(s,&CONT(p)); }
+
+void savegfsn(FILE *s,GFSN p)
 {
+	int d;
+
+	d = DEG(BDY(p));
+	write_int(s,&d);
+	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;
 	int n;
 	int vindex;
@@ -239,9 +224,7 @@ P p;
 /* save a pure function (v->attr = V_PF) */
 /* |name(str)|argc(int)|darray(intarray)|args| */
 
-void savepfins(s,v)
-FILE *s;
-V v;
+void savepfins(FILE *s,V v)
 {
 	PFINS ins;
 	PF pf;
@@ -261,9 +244,7 @@ V v;
 		saveobj(s,ins->ad[i].arg);
 }
 
-void saver(s,p)
-FILE *s;
-R p;
+void saver(FILE *s,R p)
 {
 	if ( !RAT(p) )
 		savep(s,(P)p);
@@ -273,9 +254,7 @@ R p;
 	}
 }
 
-void savelist(s,p)
-FILE *s;
-LIST p;
+void savelist(FILE *s,LIST p)
 {
 	int n;
 	NODE tn;
@@ -286,9 +265,7 @@ LIST p;
 		saveobj(s,(Obj)BDY(tn));
 }
 
-void savevect(s,p)
-FILE *s;
-VECT p;
+void savevect(FILE *s,VECT p)
 {
 	int i,len = 2;
 
@@ -297,9 +274,7 @@ VECT p;
 		saveobj(s,(Obj)BDY(p)[i]);
 }
 
-void savemat(s,p)
-FILE *s;
-MAT p;
+void savemat(FILE *s,MAT p)
 {
 	int i,j,row,col;
 	int len = 3;
@@ -310,16 +285,12 @@ MAT p;
 			saveobj(s,(Obj)BDY(p)[i][j]);
 }
 
-void savestring(s,p)
-FILE *s;
-STRING p;
+void savestring(FILE *s,STRING p)
 {
 	write_short(s,&OID(p)); savestr(s,BDY(p));
 }
 
-void savestr(s,p)
-FILE *s;
-char *p;
+void savestr(FILE *s,char *p)
 {
 	int size;
 
@@ -328,9 +299,7 @@ char *p;
 		write_string(s,p,size);
 }
 
-void savedp(s,p)
-FILE *s;
-DP p;
+void savedp(FILE *s,DP p)
 {
 	int nv,n,i,sugar;
 	MP m,t;
@@ -344,35 +313,44 @@ DP p;
 	}
 }
 
-void saveui(s,u)
-FILE *s;
-USINT u;
+void saveui(FILE *s,USINT u)
 {
 	write_short(s,&OID(u)); write_int(s,&BDY(u));
 }
 
-void saveerror(s,e)
-FILE *s;
-ERR e;
+void saveerror(FILE *s,ERR e)
 {
 	write_short(s,&OID(e)); saveobj(s,(Obj)BDY(e));
 }
 
-void savegfmmat(s,p)
-FILE *s;
-GFMMAT p;
+void savegfmmat(FILE *s,GFMMAT p)
 {
-	int i,j,row,col;
+	int i,row,col;
 
 	write_short(s,&OID(p)); write_int(s,&p->row); write_int(s,&p->col);
 	for ( i = 0, row = p->row, col = p->col; i < row; i++ )
 		write_intarray(s,p->body[i],col);
 }
 
-void savebytearray(s,p)
-FILE *s;
-BYTEARRAY p;
+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);
+	}
 }