===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.18
retrieving revision 1.25
diff -u -p -r1.18 -r1.25
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2000/09/07 23:59:55	1.18
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2001/08/20 09:03:26	1.25
@@ -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/ox_asir.c,v 1.17 2000/08/29 04:03:06 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.24 2001/04/23 05:02:29 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -70,30 +70,32 @@ extern int little_endian,ox_sock_id;
 int ox_sock_id;
 int lib_ox_need_conv;
 
-static int asir_OperandStackSize;
-static Obj *asir_OperandStack;
-static int asir_OperandStackPtr = -1;
+void create_error(ERR *,unsigned int ,char *);
 
-static void create_error(ERR *,unsigned int ,char *);
-static void ox_io_init();
-static void ox_asir_init(int,char **);
-static Obj asir_pop_one();
-static Obj asir_peek_one();
-static void asir_push_one(Obj);
-static void asir_end_flush();
-static void asir_executeFunction(int);
-static int asir_executeString();
-static void asir_evalName(unsigned int);
-static void asir_setName(unsigned int);
-static void asir_pops();
-static void asir_popString();
-static void asir_popCMO(unsigned int);
-static void asir_popSerializedLocalObject();
-static void asir_pushCMOtag(unsigned int);
-static LIST asir_GetErrorList();
-static char *name_of_cmd(int);
-static char *name_of_id(int);
+int asir_OperandStackSize;
+Obj *asir_OperandStack;
+int asir_OperandStackPtr = -1;
+
+void ox_io_init();
+void ox_asir_init(int,char **);
+Obj asir_pop_one();
+Obj asir_peek_one();
+void asir_push_one(Obj);
+void asir_end_flush();
+int asir_executeString();
+void asir_evalName(unsigned int);
+void asir_setName(unsigned int);
+void asir_pops();
+void asir_popString();
+void asir_popCMO(unsigned int);
+void asir_popSerializedLocalObject();
+void asir_pushCMOtag(unsigned int);
+LIST asir_GetErrorList();
+char *name_of_cmd(int);
+char *name_of_id(int);
+
 static void asir_do_cmd(int,unsigned int);
+static void asir_executeFunction(int);
 
 #if MPI
 /* XXX : currently MPI version supports only a homogeneous cluster. */
@@ -128,24 +130,6 @@ void ox_mpi_slave_init() {
 }
 #endif
 
-static void create_error(ERR *err,unsigned int serial,char *msg)
-{
-	int len;
-	USINT ui;
-	NODE n,n1;
-	LIST list;
-	char *msg1;
-	STRING errmsg;
-
-	MKUSINT(ui,serial);
-	len = strlen(msg);
-	msg1 = (char *)MALLOC(len+1);
-	strcpy(msg1,msg);
-	MKSTR(errmsg,msg1);
-	MKNODE(n1,errmsg,0); MKNODE(n,ui,n1); MKLIST(list,n);
-	MKERR(*err,list);
-}
-
 void ox_main(int argc,char **argv) {
 	int id;
 	int cmd;
@@ -190,7 +174,7 @@ void ox_main(int argc,char **argv) {
 					break;
 				if ( do_message )
 					fprintf(stderr," %s\n",name_of_cmd(cmd));
-				if ( ret = setjmp(env) ) {
+				if ( ret = setjmp(main_env) ) {
 					if ( ret == 1 ) {
 						create_error(&err,serial,LastError);
 						asir_push_one((Obj)err);
@@ -282,7 +266,7 @@ static void asir_do_cmd(int cmd,unsigned int serial)
 	}
 }
 
-static char *name_of_id(int id)
+char *name_of_id(int id)
 {
 	switch ( id ) {
 		case OX_COMMAND:
@@ -303,7 +287,7 @@ static char *name_of_id(int id)
 	}
 }
 
-static char *name_of_cmd(int cmd)
+char *name_of_cmd(int cmd)
 {
 	switch ( cmd ) {
 		case SM_popSerializedLocalObject:
@@ -361,7 +345,7 @@ static char *name_of_cmd(int cmd)
 	}
 }
 
-static LIST asir_GetErrorList()
+LIST asir_GetErrorList()
 {
 	int i;
 	NODE n,n0;
@@ -378,7 +362,7 @@ static LIST asir_GetErrorList()
 	return err;
 }
 
-static void asir_popSerializedLocalObject()
+void asir_popSerializedLocalObject()
 {
 	Obj obj;
 	VL t,vl;
@@ -394,7 +378,7 @@ static void asir_popSerializedLocalObject()
 	ox_send_cmd(0,SM_endBlock);
 }
 
-static void asir_popCMO(unsigned int serial)
+void asir_popCMO(unsigned int serial)
 {
 	Obj obj;
 	ERR err;
@@ -409,7 +393,7 @@ static void asir_popCMO(unsigned int serial)
 	}
 }
 
-static void asir_pushCMOtag(unsigned int serial)
+void asir_pushCMOtag(unsigned int serial)
 {
 	Obj obj;
 	ERR err;
@@ -426,7 +410,7 @@ static void asir_pushCMOtag(unsigned int serial)
 	}
 }
 
-static void asir_popString()
+void asir_popString()
 {
 	Obj val;
 	char *buf,*obuf;
@@ -435,7 +419,7 @@ static void asir_popString()
 
 	val = asir_pop_one();
 	if ( !val )
-		obuf = 0;
+		obuf = "0";
 	else {
 		l = estimate_length(CO,val);
 		buf = (char *)ALLOCA(l+1);
@@ -449,7 +433,7 @@ static void asir_popString()
 	ox_send_data(0,str);
 }
 
-static void asir_pops()
+void asir_pops()
 {
 	int n;
 
@@ -457,7 +441,7 @@ static void asir_pops()
 	asir_OperandStackPtr = MAX(asir_OperandStackPtr-n,-1);
 }
 
-static void asir_setName(unsigned int serial)
+void asir_setName(unsigned int serial)
 {
 	char *name;
 	int l,n;
@@ -479,7 +463,7 @@ static void asir_setName(unsigned int serial)
 	}
 }
 
-static void asir_evalName(unsigned int serial)
+void asir_evalName(unsigned int serial)
 {
 	char *name;
 	int l,n;
@@ -500,7 +484,7 @@ static void asir_evalName(unsigned int serial)
 	asir_push_one(val);
 }
 
-static int asir_executeString()
+int asir_executeString()
 {
 	SNODE snode;
 	pointer val;
@@ -605,7 +589,7 @@ error:
 	asir_push_one(result);
 }
 
-static void asir_end_flush()
+void asir_end_flush()
 {
 	ox_flushing = 0;
 }
@@ -617,7 +601,7 @@ static void asir_end_flush()
 */
 
 
-static void asir_push_one(Obj obj)
+void asir_push_one(Obj obj)
 {
 	if ( !obj || OID(obj) != O_VOID ) {
 		asir_OperandStackPtr++;
@@ -631,7 +615,7 @@ static void asir_push_one(Obj obj)
 	}
 }
 
-static Obj asir_pop_one() {
+Obj asir_pop_one() {
 	if ( asir_OperandStackPtr < 0 ) {
 		if ( do_message )
 			fprintf(stderr,"OperandStack underflow");
@@ -643,7 +627,7 @@ static Obj asir_pop_one() {
 	}
 }
 
-static Obj asir_peek_one() {
+Obj asir_peek_one() {
 	if ( asir_OperandStackPtr < 0 ) {
 		if ( do_message )
 			fprintf(stderr,"OperandStack underflow");
@@ -655,7 +639,7 @@ static Obj asir_peek_one() {
 	}
 }
 
-static void ox_asir_init(int argc,char **argv)
+void ox_asir_init(int argc,char **argv)
 {
 	int tmp;
 	char ifname[BUFSIZ];
@@ -678,16 +662,9 @@ static void ox_asir_init(int argc,char **argv)
 #endif
 	srandom((int)get_current_time());
 
-#if defined(THINK_C)
-	param_init();
-#endif
-	StackBottom = &tmp + 1; /* XXX */
 	rtime_init();
 	env_init();
 	endian_init();
-#if !defined(VISUAL) && !defined(THINK_C)
-/*	check_key(); */
-#endif
 	GC_init();
 	process_args(--argc,++argv);
 	output_init();
@@ -710,9 +687,6 @@ static void ox_asir_init(int argc,char **argv)
 	if ( ptr = getenv("ASIR_CONFIG") )
 		strcpy(ifname,ptr);
 	else {
-#if defined(THINK_C)
-		sprintf(ifname,"asirrc");
-#else
 		homedir = getenv("HOME");
 		if ( !homedir ) {
 			char rootname[BUFSIZ];
@@ -721,11 +695,10 @@ static void ox_asir_init(int argc,char **argv)
 			homedir = rootname;
 		}
 		sprintf(ifname,"%s/.asirrc",homedir);
-#endif
 	}
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
 		input_init(ifp,ifname);
-		if ( !setjmp(env) ) {
+		if ( !setjmp(main_env) ) {
 			read_exec_file = 1;
 			read_eval_loop();
 			read_exec_file = 0;
@@ -739,9 +712,11 @@ static void ox_asir_init(int argc,char **argv)
 	create_my_mathcap("ox_asir");
 }
 
-static void ox_io_init() {
+void ox_io_init() {
 	unsigned char c,rc;
+	extern int I_am_server;
 
+	I_am_server = 1;
 	endian_init();
 #if defined(VISUAL)
 	if ( !ox_sock_id )
@@ -826,7 +801,7 @@ void asir_ox_push_cmd(int cmd)
 	ERR err;
 	extern char LastError[];
 
-	if ( ret = setjmp(env) ) {
+	if ( ret = setjmp(main_env) ) {
 		asir_reset_handler();
 		if ( ret == 1 ) {
 			create_error(&err,0,LastError); /* XXX */
@@ -853,7 +828,7 @@ void asir_ox_execute_string(char *s)
 
 	MKSTR(str,s);
 	asir_push_one((Obj)str);
-	if ( ret = setjmp(env) ) {
+	if ( ret = setjmp(main_env) ) {
 		asir_reset_handler();
 		if ( ret == 1 ) {
 			create_error(&err,0,LastError); /* XXX */
@@ -914,16 +889,9 @@ int asir_ox_init(int byteorder)
 #endif
 	srandom((int)get_current_time());
 
-#if defined(THINK_C)
-	param_init();
-#endif
-	StackBottom = &tmp + 1; /* XXX */
 	rtime_init();
 	env_init();
 	endian_init();
-#if !defined(VISUAL) && !defined(THINK_C)
-/*	check_key(); */
-#endif
 	GC_init();
 /*	process_args(argc,argv); */
 	output_init();
@@ -942,14 +910,10 @@ int asir_ox_init(int byteorder)
 #if defined(UINIT)
 	reg_sysf();
 #endif
-#if defined(THINK_C)
-	sprintf(ifname,"asirrc");
-#else
 	sprintf(ifname,"%s/.asirrc",getenv("HOME"));
-#endif
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
 		input_init(ifp,ifname);
-		if ( !setjmp(env) ) {
+		if ( !setjmp(main_env) ) {
 			read_exec_file = 1;
 			read_eval_loop();
 			read_exec_file = 0;