===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.50
retrieving revision 1.65
diff -u -p -r1.50 -r1.65
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2003/12/13 08:03:56	1.50
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2006/09/29 09:02:49	1.65
@@ -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.49 2003/12/12 09:01:11 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.64 2006/09/26 05:35:26 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -59,7 +59,9 @@ void ox_usr1_handler();
 int asir_ox_init();
 
 /* environement is defined in libpari.a */
+# if !( PARI_VERSION_CODE > 131588)
 extern jmp_buf environnement;
+# endif
 extern int myrank_102,nserver_102;
 
 extern int do_message;
@@ -68,11 +70,13 @@ extern JMP_BUF ox_env;
 extern MATHCAP my_mathcap;
 
 extern int little_endian,ox_sock_id;
+extern char LastError[];
+extern LIST LastStackTrace;
 
 int ox_sock_id;
 int lib_ox_need_conv;
 
-void create_error(ERR *,unsigned int ,char *);
+void create_error(ERR *,unsigned int ,char *,LIST trace);
 
 int asir_OperandStackSize;
 Obj *asir_OperandStack;
@@ -145,7 +149,6 @@ void ox_main(int argc,char **argv) {
 	ERR err;
 	unsigned int serial;
 	int ret;
-	extern char LastError[];
 
 	ox_asir_init(argc,argv,"ox_asir");
 	if ( do_message )
@@ -153,6 +156,9 @@ void ox_main(int argc,char **argv) {
 	if ( SETJMP(ox_env) ) {
 		while ( NEXT(asir_infile) )
 			closecurrentinput();
+		resetpvs();
+		reset_engine();
+		reset_io();
 		ox_send_sync(0);
 	}
 	while ( 1 ) {
@@ -181,8 +187,11 @@ void ox_main(int argc,char **argv) {
 					fprintf(stderr," %s\n",name_of_cmd(cmd));
 				if ( ret = SETJMP(main_env) ) {
 					if ( ret == 1 ) {
-						create_error(&err,serial,LastError);
+						create_error(&err,serial,LastError,LastStackTrace);
 						asir_push_one((Obj)err);
+						while ( NEXT(asir_infile) )
+							closecurrentinput();
+						resetpvs();
 					}
 					break;
 				}
@@ -427,7 +436,7 @@ void asir_popCMO(unsigned int serial)
 	if ( valid_as_cmo(obj) )
 		ox_send_data(0,obj);
 	else {
-		create_error(&err,serial,"cannot convert to CMO object");
+		create_error(&err,serial,"cannot convert to CMO object",0);
 		ox_send_data(0,err);
 		asir_push_one(obj);
 	}
@@ -453,7 +462,7 @@ void asir_reduce_102(unsigned int serial)
 	else if ( !strcmp(opname,"*") )
 		func = arf_mul;
 	if ( !func ) {
-		create_error(&err,serial,"Invalid opration in ox_reduce_102");
+		create_error(&err,serial,"Invalid opration in ox_reduce_102",0);
 		asir_push_one(obj);
 	} else
 		ox_reduce_102(root,func);
@@ -506,7 +515,7 @@ void asir_set_rank_102(unsigned int serial)
 	}
 	if ( !stat ) return;
 	else {
-		create_error(&err,serial,"Invalid argument(s) in ox_set_rank_102");
+		create_error(&err,serial,"Invalid argument(s) in ox_set_rank_102",0);
 		asir_push_one(obj);
 	}
 }
@@ -534,7 +543,7 @@ void asir_tcp_accept_102(unsigned int serial)
 	rank = QTOS((Q)r);
 	if ( register_102(s,rank,1) < 0 ) {
 		create_error(&err,serial,
-			"failed to bind or accept in ox_tcp_accept_102");
+			"failed to bind or accept in ox_tcp_accept_102",0);
 		asir_push_one((Obj)err);
 	}
 }
@@ -566,7 +575,7 @@ void asir_tcp_connect_102(unsigned int serial)
 	rank = QTOS((Q)r);
 	if ( register_102(s,rank,1) < 0 ) {
 		create_error(&err,serial,
-			"failed to connect in ox_tcp_connect_102");
+			"failed to connect in ox_tcp_connect_102",0);
 		asir_push_one((Obj)err);
 	}
 }
@@ -583,31 +592,39 @@ void asir_pushCMOtag(unsigned int serial)
 		MKUSINT(ui,tag);
 		asir_push_one((Obj)ui);
 	} else {
-		create_error(&err,serial,"cannot convert to CMO object");
+		create_error(&err,serial,"cannot convert to CMO object",0);
 		asir_push_one((Obj)err);
 	}
 }
 
+void print_to_wfep(Obj obj)
+{
+	asir_push_one(obj);
+	asir_popString();
+}
+
+extern int wfep_mode;
+
 void asir_popString()
 {
 	Obj val;
-	char *buf,*obuf;
+	char *buf;
 	int l;
 	STRING str;
 
 	val = asir_pop_one();
 	if ( !val )
-		obuf = "0";
-	else {
+		buf = "0";
+	else if ( wfep_mode && OID(val) == O_ERR ) {
+		/* XXX : for wfep */
+		ox_send_data(0,val); return;
+	} else {
 		l = estimate_length(CO,val);
 		buf = (char *)ALLOCA(l+1);
 		soutput_init(buf);
 		sprintexpr(CO,val);
-		l = strlen(buf);
-		obuf = (char *)MALLOC(l+1);
-		strcpy(obuf,buf);
 	}
-	MKSTR(str,obuf);
+	MKSTR(str,buf);
 	ox_send_data(0,str);
 }
 
@@ -633,7 +650,7 @@ void asir_setName(unsigned int serial)
 	parse_strp = (char *)ALLOCA(n);
 	sprintf(parse_strp,"%s%s",name,dummy);
 	if ( mainparse(&snode) ) {
-		create_error(&err,serial,"cannot set to variable");
+		create_error(&err,serial,"cannot set to variable",0);
 		asir_push_one((Obj)err);
 	} else {
 		FA1((FNODE)FA0(snode)) = (pointer)mkfnode(1,I_FORMULA,asir_pop_one());
@@ -655,13 +672,27 @@ void asir_evalName(unsigned int serial)
 	parse_strp = (char *)ALLOCA(n);
 	sprintf(parse_strp,"%s;",name);
 	if ( mainparse(&snode) ) {
-		create_error(&err,serial,"no such variable");
+		create_error(&err,serial,"no such variable",0);
 		val = (pointer)err;
 	} else
 		val = evalstat(snode);	
 	asir_push_one(val);
 }
 
+char *augment_backslash(char *s)
+{
+	char *p,*r;
+	int i;
+
+	for ( i = 0, p = s; *p; p++, i++ ) if ( *p == '\\' ) i++;
+	r = (char *)MALLOC_ATOMIC((i+1)*sizeof(char));
+	for ( i = 0, p = s; *p; p++, i++ ) {
+		if ( *p == '\\' ) r[i++] = '\\';
+		r[i] = *p;
+	}
+	return r;
+}
+
 int asir_executeString()
 {
 	SNODE snode;
@@ -670,13 +701,21 @@ int asir_executeString()
 #if defined(PARI)
 	recover(0);
 	/* environement is defined in libpari.a */
+# if !(PARI_VERSION_CODE > 131588 )
 	if ( setjmp(environnement) ) {
 		avma = top; recover(1);
 		resetenv("");
 	}
+# endif
 #endif
 	cmd = ((STRING)asir_pop_one())->body;
+/* XXX : probably this is useless */
+#if 0
+	parse_strp = augment_backslash(cmd);
+#else
 	parse_strp = cmd;
+#endif
+	asir_infile->ln = 1;
 	if ( mainparse(&snode) ) {
 		return -1;
 	}
@@ -729,6 +768,7 @@ static void asir_executeFunction(int serial)
 	if ( n )
 		NEXT(n1) = 0;
 
+#if 0
 	if ( !strcmp(func,"load") ) {
 		fname = (STRING)BDY(n);
 		if ( OID(fname) == O_STR ) {
@@ -743,6 +783,7 @@ static void asir_executeFunction(int serial)
 		}
 		result = 0;
 	} else {
+#endif
 		searchf(noargsysf,func,&f);
 		if ( !f )
 			searchf(sysf,func,&f); 
@@ -756,12 +797,14 @@ static void asir_executeFunction(int serial)
 		} else {
 			result = (Obj)bevalf(f,n);
 		}
+#if 0
 	}
+#endif
 	asir_push_one(result);
 	return;
 
 error:
-	create_error(&err,serial,buf);
+	create_error(&err,serial,buf,0);
 	result = (Obj)err;
 	asir_push_one(result);
 }
@@ -820,7 +863,6 @@ void ox_asir_init(int argc,char **argv,char *servernam
 {
 	char ifname[BUFSIZ];
 	extern int GC_dont_gc;
-	extern int read_exec_file;
 	extern int do_asirrc;
 	extern int do_server_in_X11;
 	extern char displayname[];
@@ -829,10 +871,12 @@ void ox_asir_init(int argc,char **argv,char *servernam
 	FILE *ifp;
 	char *homedir;
 	char *ptr;
+	int do_server_sav;
 #if !defined(VISUAL)
 	int tmp;
 #endif
 
+	GC_init();
 #if !defined(VISUAL) && !defined(MPI)
 	do_server_in_X11 = 1; /* XXX */
 #endif
@@ -845,7 +889,6 @@ void ox_asir_init(int argc,char **argv,char *servernam
 	rtime_init();
 	env_init();
 	endian_init();
-	GC_init();
 	cppname_init();
 	process_args(--argc,++argv);
 #if defined(__CYGWIN__)
@@ -881,16 +924,19 @@ void ox_asir_init(int argc,char **argv,char *servernam
 		}
 		sprintf(ifname,"%s/.asirrc",homedir);
 	}
+
+	/* the bottom of the input stack */
+	input_init(0,"string");
+
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
-		input_init(ifp,ifname);
-		if ( !SETJMP(main_env) ) {
-			read_exec_file = 1;
-			read_eval_loop();
-			read_exec_file = 0;
-		}
 		fclose(ifp);
+		do_server_sav = do_server_in_X11;
+		do_server_in_X11 = 0;
+		if ( !SETJMP(main_env) )
+			execasirfile(ifname);
+		do_server_in_X11 = do_server_sav;
 	}
-	input_init(0,"string");
+
 /* XXX Windows compatibility */
 	ox_io_init();
 	create_my_mathcap(servername);
@@ -984,7 +1030,7 @@ int asir_ox_pop_cmo(void *cmo, int limit)
 	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.");
+		create_error(&err,0,"The object at the stack top is invalid as a CMO.",0);
 		obj = (Obj)err;
 	}
 	len = count_as_cmo(obj);
@@ -1033,7 +1079,7 @@ void asir_ox_push_cmd(int cmd)
 	if ( ret = SETJMP(main_env) ) {
 		asir_reset_handler();
 		if ( ret == 1 ) {
-			create_error(&err,0,LastError); /* XXX */
+			create_error(&err,0,LastError,LastStackTrace); /* XXX */
 			asir_push_one((Obj)err);
 		}
 	} else {
@@ -1060,7 +1106,7 @@ void asir_ox_execute_string(char *s)
 	if ( ret = SETJMP(main_env) ) {
 		asir_reset_handler();
 		if ( ret == 1 ) {
-			create_error(&err,0,LastError); /* XXX */
+			create_error(&err,0,LastError,LastStackTrace); /* XXX */
 			asir_push_one((Obj)err);
 		}
 	} else {
@@ -1115,13 +1161,13 @@ int asir_ox_init(int byteorder)
 	int tmp;
 	char ifname[BUFSIZ];
 	extern int GC_dont_gc;
-	extern int read_exec_file;
 	extern int do_asirrc;
 	extern int do_server_in_X11;
 	char *getenv();
 	static ox_asir_initialized = 0;
 	FILE *ifp;
 
+	GC_init();
 #if !defined(VISUAL) && !defined(MPI)
 	do_server_in_X11 = 0; /* XXX */
 #endif
@@ -1134,7 +1180,6 @@ int asir_ox_init(int byteorder)
 	rtime_init();
 	env_init();
 	endian_init();
-	GC_init();
 /*	process_args(argc,argv); */
 	output_init();
 	arf_init();
@@ -1152,17 +1197,13 @@ int asir_ox_init(int byteorder)
 #if defined(UINIT)
 	reg_sysf();
 #endif
+	input_init(0,"string");
 	sprintf(ifname,"%s/.asirrc",getenv("HOME"));
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
-		input_init(ifp,ifname);
-		if ( !SETJMP(main_env) ) {
-			read_exec_file = 1;
-			read_eval_loop();
-			read_exec_file = 0;
-		}
 		fclose(ifp);
+		if ( !SETJMP(main_env) )
+			execasirfile(ifname);
 	}
-	input_init(0,"string");
 
 	asir_OperandStackSize = BUFSIZ;
 	asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj));