===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/bload.c,v
retrieving revision 1.2
retrieving revision 1.8
diff -u -p -r1.2 -r1.8
--- OpenXM_contrib2/asir2000/io/bload.c	2000/08/21 08:31:38	1.2
+++ OpenXM_contrib2/asir2000/io/bload.c	2001/03/16 01:56:18	1.8
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -44,13 +44,11 @@
  * 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.1.1.1 1999/12/03 07:39:11 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/bload.c,v 1.7 2000/12/24 06:32:31 saito Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
-#if INET
 #include "com.h"
-#endif
 #if PARI
 #include "genpari.h"
 int get_lg(GEN);
@@ -68,6 +66,7 @@ void loadr(FILE *,R *);
 void loadp(FILE *,P *);
 void loadgf2n(FILE *,GF2N *);
 void loadgfpn(FILE *,GFPN *);
+void loadgfs(FILE *,GFS *);
 void loadlm(FILE *,LM *);
 void loadmi(FILE *,MQ *);
 void loadcplx(FILE *,C *);
@@ -76,14 +75,21 @@ 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 };
-void (*nloadf[])() = { loadq, loadreal, 0, loadbf, loadcplx, loadmi, loadlm, loadgf2n, loadgfpn };
+	loadstring, 0, loaddp, loadui, loaderror,0,0,0,loadgfmmat, loadbytearray };
+#if defined(INTERVAL)
+void loaditv();
+void loaditvd();
+void (*nloadf[])() = { loadq, loadreal, 0, loadbf, loaditv, loaditvd, 0, loaditv, loadcplx, loadmi, loadlm, loadgf2n, loadgfpn, loadgfs };
+#else
+void (*nloadf[])() = { loadq, loadreal, 0, loadbf, loadcplx, loadmi, loadlm, loadgf2n, loadgfpn, loadgfs };
+#endif
 
 void loadobj(s,p)
 FILE *s;
@@ -191,6 +197,34 @@ BF *p;
 #endif
 }
 
+#if defined(INTERVAL)
+void loaditv(s,p)
+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(s,p)
+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(s,p)
 FILE *s;
 C *p;
@@ -259,6 +293,18 @@ GFPN *p;
 	MKGFPN(body,*p);
 }
 
+void loadgfs(s,p)
+FILE *s;
+GFS *p;
+{
+	GFS q;
+	char dmy;
+
+	read_char(s,&dmy);
+	NEWGFS(q); read_int(s,(int *)&CONT(q));
+	*p = q;
+}
+
 void loadp(s,p)
 FILE *s;
 P *p;
@@ -402,6 +448,21 @@ char **p;
 	} else
 		t = "";
 	*p = t;
+}
+
+void loadbytearray(s,p)
+FILE *s;
+BYTEARRAY *p;
+{
+	int len;
+	BYTEARRAY array;
+
+	read_int(s,&len);
+	MKBYTEARRAY(array,len);
+	if ( len ) {
+		read_string(s,array->body,len);
+	}
+	*p = array;
 }
 
 void loaddp(s,p)