===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.6
retrieving revision 1.13
diff -u -p -r1.6 -r1.13
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2000/02/08 04:47:11	1.6
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2000/03/19 12:35:20	1.13
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.5 2000/01/31 03:18:05 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.12 2000/03/16 08:23:16 noro Exp $ */
 #include "ca.h"
 #include "parse.h"
 #include "signal.h"
@@ -9,8 +9,8 @@
 #endif
 
 void ox_usr1_handler();
+int asir_ox_init();
 
-
 extern jmp_buf environnement;
 
 extern int do_message;
@@ -18,7 +18,10 @@ extern int ox_flushing;
 extern jmp_buf ox_env;
 extern MATHCAP my_mathcap;
 
+extern int little_endian,ox_sock_id;
+
 int ox_sock_id;
+int lib_ox_need_conv;
 
 static int asir_OperandStackSize;
 static Obj *asir_OperandStack;
@@ -39,9 +42,9 @@ static void asir_popString();
 static void asir_popCMO(unsigned int);
 static void asir_popSerializedLocalObject();
 static LIST asir_GetErrorList();
-static char *name_of_cmd(unsigned int);
+static char *name_of_cmd(int);
 static char *name_of_id(int);
-static void asir_do_cmd(unsigned int,unsigned int);
+static void asir_do_cmd(int,unsigned int);
 
 #if MPI
 extern int mpi_nprocs,mpi_myid;
@@ -87,7 +90,7 @@ static void create_error(ERR *err,unsigned int serial,
 
 void ox_main(int argc,char **argv) {
 	int id;
-	unsigned int cmd;
+	int cmd;
 	Obj obj;
 	USINT ui;
 	ERR err;
@@ -157,7 +160,7 @@ void ox_main(int argc,char **argv) {
 	}
 }
 
-static void asir_do_cmd(unsigned int cmd,unsigned int serial)
+static void asir_do_cmd(int cmd,unsigned int serial)
 {
 	MATHCAP client_mathcap;
 	Q q;
@@ -239,7 +242,7 @@ static char *name_of_id(int id)
 	}
 }
 
-static char *name_of_cmd(unsigned cmd)
+static char *name_of_cmd(int cmd)
 {
 	switch ( cmd ) {
 		case SM_popSerializedLocalObject:
@@ -646,7 +649,6 @@ static void ox_asir_init(int argc,char **argv)
 
 static void ox_io_init() {
 	unsigned char c,rc;
-	extern int little_endian,ox_sock_id;
 
 	endian_init();
 #if defined(VISUAL)
@@ -702,8 +704,14 @@ int asir_ox_pop_cmo(void *cmo, int limit)
 {
 	Obj obj;
 	int len;
+	ERR err;
 
 	obj = asir_pop_one();
+	if ( !valid_as_cmo(obj) ) {
+		asir_push_one(obj);
+		create_error(&err,0,"The object at the stack top is invalid as a CMO.");
+		obj = (Obj)err;
+	}
 	len = count_as_cmo(obj);
 	if ( len <= limit ) {
 		ox_copy_init(cmo);
@@ -717,9 +725,24 @@ int asir_ox_pop_cmo(void *cmo, int limit)
  * Executes an SM command.
  */
 
-void asir_ox_push_cmd(unsigned int cmd)
+void asir_ox_push_cmd(int cmd)
 {
-	asir_do_cmd(cmd,0);
+	int ret;
+	ERR err;
+	extern char LastError[];
+
+	if ( ret = setjmp(env) ) {
+		asir_reset_handler();
+		if ( ret == 1 ) {
+			create_error(&err,0,LastError); /* XXX */
+			asir_push_one((Obj)err);
+		}
+	} else {
+		asir_save_handler();
+		asir_set_handler();
+		asir_do_cmd(cmd,0);
+		asir_reset_handler();
+	}
 }
 
 /*
@@ -729,10 +752,24 @@ void asir_ox_push_cmd(unsigned int cmd)
 void asir_ox_execute_string(char *s)
 {
 	STRING str;
+	int ret;
+	ERR err;
+	extern char LastError[];
 
 	MKSTR(str,s);
 	asir_push_one((Obj)str);
-	asir_executeString();
+	if ( ret = setjmp(env) ) {
+		asir_reset_handler();
+		if ( ret == 1 ) {
+			create_error(&err,0,LastError); /* XXX */
+			asir_push_one((Obj)err);
+		}
+	} else {
+		asir_save_handler();
+		asir_set_handler();
+		asir_executeString();
+		asir_reset_handler();
+	}
 }
 
 /*
@@ -746,20 +783,22 @@ int asir_ox_peek_cmo_size()
 	int len;
 
 	obj = asir_pop_one();
-	len = count_as_cmo(obj);
 	asir_push_one(obj);
+	if ( !valid_as_cmo(obj) ) {
+		fprintf(stderr,"The object at the stack top is invalid as a CMO.\n");
+		return 0;
+	}
+	len = count_as_cmo(obj);
 	return len;
 }
 
 /*
  * Initialization.
- * byteorder = 1 : little endian
- *             0 : big endian
+ * byteorder=0 => native
+ *          =1 => network byte order
  */
 
-void asir_ox_io_init();
-
-void asir_ox_init(int byteorder)
+int asir_ox_init(int byteorder)
 {
 	int tmp;
 	char ifname[BUFSIZ];
@@ -772,7 +811,7 @@ void asir_ox_init(int byteorder)
 	FILE *ifp;
 
 #if !defined(VISUAL) && !MPI
-	do_server_in_X11 = 1; /* XXX */
+	do_server_in_X11 = 0; /* XXX */
 #endif
 	asir_save_handler();
 #if PARI
@@ -823,26 +862,16 @@ void asir_ox_init(int byteorder)
 		fclose(ifp);
 	}
 	input_init(0,"string");
-	asir_ox_io_init(byteorder);
-	create_my_mathcap("ox_asir");
-}
 
-void asir_ox_io_init(byteorder)
-int byteorder;
-{
-	unsigned char c;
-	extern int little_endian;
-	extern int lib_ox_initialized;
-
-	endian_init();
 	asir_OperandStackSize = BUFSIZ;
 	asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj));
 	asir_OperandStackPtr = -1;
-	if ( little_endian )
-		c = 1;
+	if ( little_endian && byteorder )
+		lib_ox_need_conv = 1;
 	else
-		c = 0;
-	iofp[0].conv = c == byteorder ? 0 : 1;
-	lib_ox_initialized = 1;
+		lib_ox_need_conv = 0;
 	do_message = 0;
+	create_my_mathcap("ox_asir");
+	asir_reset_handler();
+	return 0;
 }