===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/bsave.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- OpenXM_contrib2/asir2000/io/bsave.c	2017/08/31 09:11:04	1.19
+++ OpenXM_contrib2/asir2000/io/bsave.c	2018/03/29 01:32:53	1.20
@@ -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.18 2015/08/13 00:13:03 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/bsave.c,v 1.19 2017/08/31 09:11:04 noro Exp $ 
 */
 /* saveXXX must not use GC_malloc(), GC_malloc_atomic(). */
 
@@ -55,8 +55,8 @@
 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, 0, 0, 0, 0, 0, 0, 0, 0,  savenbp };
+  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();
@@ -69,35 +69,35 @@ static short zeroval = 0;
 
 void saveobj(FILE *s,Obj p)
 {
-	if ( !p )
-		write_short(s,&zeroval);
-	else if ( !savef[OID(p)] )
-		error("saveobj : not implemented");
-	else
-		(*savef[OID(p)])(s,p);
+  if ( !p )
+    write_short(s,&zeroval);
+  else if ( !savef[OID(p)] )
+    error("saveobj : not implemented");
+  else
+    (*savef[OID(p)])(s,p);
 }
 
 void savenum(FILE *s,Num p)
 { 
-	if ( !nsavef[NID(p)] )
-		error("savenum : not implemented");
-	else {
-		write_short(s,&OID(p)); write_char(s,&NID(p));
-		write_char(s,&(p->pad));
-		(*nsavef[NID(p)])(s,p); 
-	}
+  if ( !nsavef[NID(p)] )
+    error("savenum : not implemented");
+  else {
+    write_short(s,&OID(p)); write_char(s,&NID(p));
+    write_char(s,&(p->pad));
+    (*nsavef[NID(p)])(s,p); 
+  }
 }
 
 void saveq(FILE *s,Q p)
 {
-	int size[2];
-	int len = 2;
+  int size[2];
+  int len = 2;
 
-	size[0] = PL(NM(p)); size[1] = DN(p) ? PL(DN(p)) : 0;
-	write_intarray(s,size,len);
-	write_intarray(s,BD(NM(p)),size[0]);
-	if ( size[1] )
-		write_intarray(s,BD(DN(p)),size[1]);
+  size[0] = PL(NM(p)); size[1] = DN(p) ? PL(DN(p)) : 0;
+  write_intarray(s,size,len);
+  write_intarray(s,BD(NM(p)),size[0]);
+  if ( size[1] )
+    write_intarray(s,BD(DN(p)),size[1]);
 }
 
 void savereal(FILE *s,Real p)
@@ -125,21 +125,21 @@ void savebf(FILE *s,BF p)
   write_int64(s,(UL *)&exp);
 #if defined(VISUAL)
 #if !defined(_WIN64)
-	write_int(s,&len);
-	write_intarray(s,p->body->_mpfr_d,len);
+  write_int(s,&len);
+  write_intarray(s,p->body->_mpfr_d,len);
 #else
-	t = (prec+31)/32; 
-	write_int(s,&t);
-	write_longarray(s,(long long *)p->body->_mpfr_d,t);
+  t = (prec+31)/32; 
+  write_int(s,&t);
+  write_longarray(s,(long long *)p->body->_mpfr_d,t);
 #endif
 #else
 #if SIZEOF_LONG == 4
-	write_int(s,&len);
-	write_intarray(s,p->body->_mpfr_d,len);
+  write_int(s,&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);
+  t = (prec+31)/32; 
+  write_int(s,&t);
+  write_longarray(s,p->body->_mpfr_d,t);
 #endif
 #endif
 }
@@ -147,14 +147,14 @@ void savebf(FILE *s,BF p)
 #if defined(INTERVAL)
 void saveitv(FILE *s,Itv p)
 {
-	saveobj(s,(Obj)INF(p));
-	saveobj(s,(Obj)SUP(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));
+  write_double(s,&INF(p));
+  write_double(s,&SUP(p));
 }
 #endif
 
@@ -166,30 +166,30 @@ void savemi(FILE *s,MQ p)
 
 void savelm(FILE *s,LM p)
 {
-	int size;
+  int size;
 
-	size = PL(BDY(p));
-	write_int(s,&size);
-	write_intarray(s,BD(BDY(p)),size);
+  size = PL(BDY(p));
+  write_int(s,&size);
+  write_intarray(s,BD(BDY(p)),size);
 }
 
 void savegf2n(FILE *s,GF2N p)
 {
-	int len;
+  int len;
 
-	len = p->body->w;
-	write_int(s,&len);
-	write_intarray(s,p->body->b,len);
+  len = p->body->w;
+  write_int(s,&len);
+  write_intarray(s,p->body->b,len);
 }
 
 void savegfpn(FILE *s,GFPN p)
 {
-	int d,i;
+  int d,i;
 
-	d = p->body->d;
-	write_int(s,&d);
-	for ( i = 0; i <= d; i++ )
-		saveobj(s,(Obj)p->body->c[i]);
+  d = p->body->d;
+  write_int(s,&d);
+  for ( i = 0; i <= d; i++ )
+    saveobj(s,(Obj)p->body->c[i]);
 }
 
 void savegfs(FILE *s,GFS p)
@@ -197,39 +197,39 @@ void savegfs(FILE *s,GFS p)
 
 void savegfsn(FILE *s,GFSN p)
 {
-	int d;
+  int d;
 
-	d = DEG(BDY(p));
-	write_int(s,&d);
-	write_intarray(s,COEF(BDY(p)),d+1);
+  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);
+  saveobj(s,(Obj)p->nm);
+  saveobj(s,(Obj)p->dn);
 }
 
 void savep(FILE *s,P p)
 {
-	DCP dc;
-	int n;
-	int vindex;
+  DCP dc;
+  int n;
+  int vindex;
 
-	if ( NUM(p) )
-		savenum(s,(Num)p);
-	else {
-		vindex = save_convv(VR(p)); 
-		for ( dc = DC(p), n = 0; dc; dc = NEXT(dc), n++ );
-		write_short(s,&OID(p));
-		write_int(s,&vindex);
-		if ( vindex < 0 )
-			savepfins(s,VR(p));
-		write_int(s,&n);
-		for ( dc = DC(p); dc; dc = NEXT(dc) ) {
-			saveobj(s,(Obj)DEG(dc)); saveobj(s,(Obj)COEF(dc));
-		}
-	}
+  if ( NUM(p) )
+    savenum(s,(Num)p);
+  else {
+    vindex = save_convv(VR(p)); 
+    for ( dc = DC(p), n = 0; dc; dc = NEXT(dc), n++ );
+    write_short(s,&OID(p));
+    write_int(s,&vindex);
+    if ( vindex < 0 )
+      savepfins(s,VR(p));
+    write_int(s,&n);
+    for ( dc = DC(p); dc; dc = NEXT(dc) ) {
+      saveobj(s,(Obj)DEG(dc)); saveobj(s,(Obj)COEF(dc));
+    }
+  }
 }
 
 /* save a pure function (v->attr = V_PF) */
@@ -237,131 +237,131 @@ void savep(FILE *s,P p)
 
 void savepfins(FILE *s,V v)
 {
-	PFINS ins;
-	PF pf;
-	int argc,i;
-	int *darray;
+  PFINS ins;
+  PF pf;
+  int argc,i;
+  int *darray;
 
-	ins = (PFINS)v->priv;
-	pf = ins->pf;
-	savestr(s,NAME(pf));
-	argc = pf->argc;
-	write_int(s,&argc);
-	darray = (int *)ALLOCA(argc*sizeof(int));
-	for ( i = 0; i < argc; i++ )
-		darray[i] = ins->ad[i].d;
-	write_intarray(s,darray,argc);
-	for ( i = 0; i < argc; i++ )
-		saveobj(s,ins->ad[i].arg);
+  ins = (PFINS)v->priv;
+  pf = ins->pf;
+  savestr(s,NAME(pf));
+  argc = pf->argc;
+  write_int(s,&argc);
+  darray = (int *)ALLOCA(argc*sizeof(int));
+  for ( i = 0; i < argc; i++ )
+    darray[i] = ins->ad[i].d;
+  write_intarray(s,darray,argc);
+  for ( i = 0; i < argc; i++ )
+    saveobj(s,ins->ad[i].arg);
 }
 
 void saver(FILE *s,R p)
 {
-	if ( !RAT(p) )
-		savep(s,(P)p);
-	else {
-		write_short(s,&OID(p)); write_short(s,&p->reduced);
-		savep(s,NM(p)); savep(s,DN(p));
-	}
+  if ( !RAT(p) )
+    savep(s,(P)p);
+  else {
+    write_short(s,&OID(p)); write_short(s,&p->reduced);
+    savep(s,NM(p)); savep(s,DN(p));
+  }
 }
 
 void savelist(FILE *s,LIST p)
 {
-	int n;
-	NODE tn;
+  int n;
+  NODE tn;
 
-	for ( tn = BDY(p), n = 0; tn; tn = NEXT(tn), n++ );
-	write_short(s,&OID(p)); write_int(s,&n);
-	for ( tn = BDY(p); tn; tn = NEXT(tn) )
-		saveobj(s,(Obj)BDY(tn));
+  for ( tn = BDY(p), n = 0; tn; tn = NEXT(tn), n++ );
+  write_short(s,&OID(p)); write_int(s,&n);
+  for ( tn = BDY(p); tn; tn = NEXT(tn) )
+    saveobj(s,(Obj)BDY(tn));
 }
 
 void savevect(FILE *s,VECT p)
 {
-	int i,len = 2;
+  int i,len = 2;
 
-	write_short(s,&OID(p)); write_int(s,&p->len);
-	for ( i = 0, len = p->len; i < len; i++ )
-		saveobj(s,(Obj)BDY(p)[i]);
+  write_short(s,&OID(p)); write_int(s,&p->len);
+  for ( i = 0, len = p->len; i < len; i++ )
+    saveobj(s,(Obj)BDY(p)[i]);
 }
 
 void savemat(FILE *s,MAT p)
 {
-	int i,j,row,col;
-	int len = 3;
+  int i,j,row,col;
+  int len = 3;
 
-	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++ )
-		for ( j = 0; j < col; j++ )
-			saveobj(s,(Obj)BDY(p)[i][j]);
+  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++ )
+    for ( j = 0; j < col; j++ )
+      saveobj(s,(Obj)BDY(p)[i][j]);
 }
 
 void savestring(FILE *s,STRING p)
 {
-	write_short(s,&OID(p)); savestr(s,BDY(p));
+  write_short(s,&OID(p)); savestr(s,BDY(p));
 }
 
 void savestr(FILE *s,char *p)
 {
-	int size;
+  int size;
 
-	size = p ? strlen(p) : 0; write_int(s,&size);
-	if ( size )
-		write_string(s,p,size);
+  size = p ? strlen(p) : 0; write_int(s,&size);
+  if ( size )
+    write_string(s,p,size);
 }
 
 void savedp(FILE *s,DP p)
 {
-	int nv,n,i,sugar;
-	MP m,t;
+  int nv,n,i,sugar;
+  MP m,t;
 
-	nv = p->nv; m = p->body; sugar = p->sugar;
-	for ( n = 0, t = m; t; t = NEXT(t), n++ );	
-	write_short(s,&OID(p)); write_int(s,&nv); write_int(s,&sugar); write_int(s,&n);
-	for ( i = 0, t = m; i < n; i++, t = NEXT(t) ) {
-		saveobj(s,(Obj)t->c);
-		write_int(s,&t->dl->td); write_intarray(s,&(t->dl->d[0]),nv);
-	}
+  nv = p->nv; m = p->body; sugar = p->sugar;
+  for ( n = 0, t = m; t; t = NEXT(t), n++ );  
+  write_short(s,&OID(p)); write_int(s,&nv); write_int(s,&sugar); write_int(s,&n);
+  for ( i = 0, t = m; i < n; i++, t = NEXT(t) ) {
+    saveobj(s,(Obj)t->c);
+    write_int(s,&t->dl->td); write_intarray(s,&(t->dl->d[0]),nv);
+  }
 }
 
 void saveui(FILE *s,USINT u)
 {
-	write_short(s,&OID(u)); write_int(s,&BDY(u));
+  write_short(s,&OID(u)); write_int(s,&BDY(u));
 }
 
 void saveerror(FILE *s,ERR e)
 {
-	write_short(s,&OID(e)); saveobj(s,(Obj)BDY(e));
+  write_short(s,&OID(e)); saveobj(s,(Obj)BDY(e));
 }
 
 void savegfmmat(FILE *s,GFMMAT p)
 {
-	int i,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);
+  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(FILE *s,BYTEARRAY p)
 {
-	write_short(s,&OID(p)); write_int(s,&p->len);
-	write_string(s,p->body,p->len);
+  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;
+  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);
-	}
+  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);
+  }
 }