===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.61
retrieving revision 1.72
diff -u -p -r1.61 -r1.72
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2006/02/13 10:07:19	1.61
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2014/05/09 19:35:51	1.72
@@ -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.60 2006/02/11 09:10:16 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.71 2013/06/13 18:42:11 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -55,6 +55,7 @@
 #include "genpari.h"
 #endif
 
+char *find_asirrc();
 void ox_usr1_handler();
 int asir_ox_init();
 
@@ -108,6 +109,7 @@ char *name_of_id(int);
 
 static void asir_do_cmd(int,unsigned int);
 static void asir_executeFunction(int);
+static void asir_executeFunctionSync(int);
 
 #if defined(MPI)
 /* XXX : currently MPI version supports only a homogeneous cluster. */
@@ -121,7 +123,7 @@ void ox_mpi_master_init() {
 		/* ordering information is not exchanged */
 		/* idx should be equal to i */
 		idx = get_iofp(i,0,0);
-		register_server(0,idx,idx);
+		register_server(0,idx,idx,-1);
 	}
 }
 
@@ -134,7 +136,7 @@ void ox_mpi_slave_init() {
 		/* ordering information is not exchanged */
 		/* idx should be equal to i */
 		idx = get_iofp(i,0,0);
-		register_server(0,idx,idx);
+		register_server(0,idx,idx,-1);
 	}
 	asir_OperandStackSize = BUFSIZ;
 	asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj));
@@ -191,6 +193,7 @@ void ox_main(int argc,char **argv) {
 						asir_push_one((Obj)err);
 						while ( NEXT(asir_infile) )
 							closecurrentinput();
+						resetpvs();
 					}
 					break;
 				}
@@ -257,6 +260,9 @@ static void asir_do_cmd(int cmd,unsigned int serial)
 		case SM_executeFunction:
 			asir_executeFunction(serial);
 			break;
+		case SM_executeFunctionSync:
+			asir_executeFunctionSync(serial);
+			break;
 		case SM_shutdown:
 			asir_terminate(2);
 			break;
@@ -387,6 +393,9 @@ char *name_of_cmd(int cmd)
 		case SM_reduce_102:
 			return "SM_reduce_102";
 			break;
+		case SM_executeFunctionSync:
+			return "SM_executeFunctionSync";
+			break;
 		default:
 			return "Unknown cmd";
 			break;
@@ -596,6 +605,14 @@ void asir_pushCMOtag(unsigned int serial)
 	}
 }
 
+void print_to_wfep(Obj obj)
+{
+	asir_push_one(obj);
+	asir_popString();
+}
+
+extern int wfep_mode;
+
 void asir_popString()
 {
 	Obj val;
@@ -606,7 +623,10 @@ void asir_popString()
 	val = asir_pop_one();
 	if ( !val )
 		buf = "0";
-	else {
+	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);
@@ -627,7 +647,7 @@ void asir_pops()
 void asir_setName(unsigned int serial)
 {
 	char *name;
-	int l,n;
+	size_t l,n;
 	char *dummy = "=0;";
 	SNODE snode;
 	ERR err;
@@ -649,7 +669,7 @@ void asir_setName(unsigned int serial)
 void asir_evalName(unsigned int serial)
 {
 	char *name;
-	int l,n;
+	size_t l,n;
 	SNODE snode;
 	ERR err;
 	pointer val;
@@ -703,6 +723,7 @@ int asir_executeString()
 #else
 	parse_strp = cmd;
 #endif
+	asir_infile->ln = 1;
 	if ( mainparse(&snode) ) {
 		return -1;
 	}
@@ -773,11 +794,7 @@ static void asir_executeFunction(int serial)
 #endif
 		searchf(noargsysf,func,&f);
 		if ( !f )
-			searchf(sysf,func,&f); 
-		if ( !f )
-			searchf(ubinf,func,&f);
-		if ( !f )
-			searchf(usrf,func,&f);
+			gen_searchf_searchonly(func,&f); 
 		if ( !f ) {
 			sprintf(buf,"executeFunction : the function %s not found",func);
 			goto error;
@@ -787,6 +804,7 @@ static void asir_executeFunction(int serial)
 #if 0
 	}
 #endif
+	printf("executeFunction done\n");
 	asir_push_one(result);
 	return;
 
@@ -796,6 +814,80 @@ error:
 	asir_push_one(result);
 }
 
+static void asir_executeFunctionSync(int serial)
+{ 
+	char *func;
+	int argc,i;
+	FUNC f;
+	Obj result=0;
+	NODE n,n1; 
+	STRING fname;
+	char *path;
+	ERR err;
+	Obj arg;
+	static char buf[BUFSIZ];
+
+	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();
+	}
+	if ( n )
+		NEXT(n1) = 0;
+
+	ox_send_data(0,ONE);
+
+#if 0
+	if ( !strcmp(func,"load") ) {
+		fname = (STRING)BDY(n);
+		if ( OID(fname) == O_STR ) {
+			searchasirpath(BDY(fname),&path);
+			if ( path ) {
+				if ( do_message )
+					fprintf(stderr,"loading %s\n",path);
+				execasirfile(path);
+			} else 
+				if ( do_message )
+					fprintf(stderr,"load : %s not found in the search path\n",BDY(fname));
+		}
+		result = 0;
+	} else {
+#endif
+		searchf(noargsysf,func,&f);
+		if ( !f )
+			gen_searchf_searchonly(func,&f); 
+		if ( !f ) {
+			sprintf(buf,"executeFunction : the function %s not found",func);
+			goto error;
+		} else {
+			result = (Obj)bevalf(f,n);
+		}
+#if 0
+	}
+#endif
+	printf("executeFunctionSync done\n");
+	ox_send_data(0,result);
+	return;
+
+error:
+	create_error(&err,serial,buf,0);
+	result = (Obj)err;
+	ox_send_data(0,result);
+}
+
 void asir_end_flush()
 {
 	ox_flushing = 0;
@@ -848,16 +940,12 @@ Obj asir_peek_one() {
 
 void ox_asir_init(int argc,char **argv,char *servername)
 {
-	char ifname[BUFSIZ];
+	char *ifname;
 	extern int GC_dont_gc;
 	extern int do_asirrc;
 	extern int do_server_in_X11;
 	extern char displayname[];
-	char *getenv();
 	static ox_asir_initialized = 0;
-	FILE *ifp;
-	char *homedir;
-	char *ptr;
 	int do_server_sav;
 #if !defined(VISUAL)
 	int tmp;
@@ -892,31 +980,17 @@ void ox_asir_init(int argc,char **argv,char *servernam
 	pf_init();
 	sysf_init();
 	parif_init();
+	order_init();
 #if defined(VISUAL)
 	init_socket();
 #endif
 #if defined(UINIT)
 	reg_sysf();
 #endif
-/* if ASIR_CONFIG is set, execute it; else execute .asirrc */
-	if ( ptr = getenv("ASIR_CONFIG") )
-		strcpy(ifname,ptr);
-	else {
-		homedir = getenv("HOME");
-		if ( !homedir ) {
-			char rootname[BUFSIZ];
-
-			get_rootdir(rootname,sizeof(rootname));
-			homedir = rootname;
-		}
-		sprintf(ifname,"%s/.asirrc",homedir);
-	}
-
 	/* the bottom of the input stack */
 	input_init(0,"string");
 
-	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
-		fclose(ifp);
+	if ( do_asirrc && (ifname = find_asirrc()) ) {
 		do_server_sav = do_server_in_X11;
 		do_server_in_X11 = 0;
 		if ( !SETJMP(main_env) )
@@ -981,7 +1055,7 @@ void ox_io_init() {
 	read_char(iofp[0].in,&rc);
 	iofp[0].conv = c == rc ? 0 : 1;
 	/* XXX; for raw I/O */
-	register_server(0,0,0);
+	register_server(0,0,0,-1);
 }
 
 #if !defined(VISUAL)
@@ -1146,13 +1220,11 @@ int asir_ox_peek_cmo_string_length()
 int asir_ox_init(int byteorder)
 {
 	int tmp;
-	char ifname[BUFSIZ];
+	char *ifname;
 	extern int GC_dont_gc;
 	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)
@@ -1185,9 +1257,7 @@ int asir_ox_init(int byteorder)
 	reg_sysf();
 #endif
 	input_init(0,"string");
-	sprintf(ifname,"%s/.asirrc",getenv("HOME"));
-	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
-		fclose(ifp);
+	if ( do_asirrc && (ifname = find_asirrc()) ) {
 		if ( !SETJMP(main_env) )
 			execasirfile(ifname);
 	}