===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.4
retrieving revision 1.11
diff -u -p -r1.4 -r1.11
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2000/01/19 09:31:00	1.4
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2000/03/16 04:55:21	1.11
@@ -1,10 +1,15 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.3 2000/01/18 05:55:07 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.10 2000/03/16 01:07:00 noro Exp $ */
 #include "ca.h"
 #include "parse.h"
+#include "signal.h"
 #include "ox.h"
 #include "version.h"
+#if PARI
+#include "genpari.h"
+#endif
 
 void ox_usr1_handler();
+void asir_ox_init();
 
 extern jmp_buf environnement;
 
@@ -13,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;
@@ -456,11 +464,23 @@ static void asir_executeFunction(int serial)
 	char *path;
 	USINT ui;
 	ERR err;
+	Obj arg;
 	static char buf[BUFSIZ];
 
-	func = ((STRING)asir_pop_one())->body;
-	argc = (int)(((USINT)asir_pop_one())->body);
+	arg = asir_pop_one();
+	if ( !arg || OID(arg) != O_STR ) {
+		sprintf(buf,"executeFunction : invalid function name");
+		goto error;
+	} else
+		func = ((STRING)arg)->body;
 
+	arg = asir_pop_one();
+	if ( !arg || OID(arg) != O_USINT ) {
+		sprintf(buf,"executeFunction : invalid argc");
+		goto error;
+	} else
+		argc = (int)(((USINT)arg)->body);
+
 	for ( n = 0; argc; argc-- ) {
 		NEXTNODE(n,n1);
 		BDY(n1) = (pointer)asir_pop_one();
@@ -491,13 +511,18 @@ static void asir_executeFunction(int serial)
 			searchf(usrf,func,&f);
 		if ( !f ) {
 			sprintf(buf,"executeFunction : the function %s not found",func);
-			create_error(&err,serial,buf);
-			result = (Obj)err;
+			goto error;
 		} else {
 			result = (Obj)bevalf(f,n);
 		}
 	}
 	asir_push_one(result);
+	return;
+
+error:
+	create_error(&err,serial,buf);
+	result = (Obj)err;
+	asir_push_one(result);
 }
 
 static void asir_end_flush()
@@ -624,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)
@@ -680,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);
@@ -697,7 +727,17 @@ int asir_ox_pop_cmo(void *cmo, int limit)
 
 void asir_ox_push_cmd(unsigned int cmd)
 {
-	asir_do_cmd(cmd,0);
+	int ret;
+	ERR err;
+	extern char LastError[];
+
+	if ( ret = setjmp(env) ) {
+		if ( ret == 1 ) {
+			create_error(&err,0,LastError); /* XXX */
+			asir_push_one((Obj)err);
+		}
+	} else
+		asir_do_cmd(cmd,0);
 }
 
 /*
@@ -707,10 +747,19 @@ 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) ) {
+		if ( ret == 1 ) {
+			create_error(&err,0,LastError); /* XXX */
+			asir_push_one((Obj)err);
+		}
+	} else
+		asir_executeString();
 }
 
 /*
@@ -724,19 +773,21 @@ 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 tmp;
@@ -750,7 +801,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
@@ -801,26 +852,14 @@ 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");
 }