===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox.c,v
retrieving revision 1.6
retrieving revision 1.14
diff -u -p -r1.6 -r1.14
--- OpenXM_contrib2/asir2000/io/ox.c	2000/08/22 05:04:18	1.6
+++ OpenXM_contrib2/asir2000/io/ox.c	2002/07/25 04:47:41	1.14
@@ -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.c,v 1.5 2000/08/21 08:31:38 noro Exp $ 
+ * $OpenXM$
 */
 #include "ca.h"
 #include "parse.h"
@@ -54,21 +54,16 @@
 
 #define ISIZ sizeof(int)
 
-void ox_flush_stream(),ox_write_int(),ox_write_cmo();
-void ox_read_int(),ox_read_cmo();
-void mclist_to_mc();
-void ox_read_local();
-
 extern Obj VOIDobj;
 
 extern int ox_need_conv;
-extern int ox_usr1_sent, ox_int_received, critical_when_signal;
+int ox_usr1_sent, ox_int_received, critical_when_signal;
 unsigned int ox_serial;
 int ox_flushing;
 int ox_batch;
 int ox_check=1;
 int ox_exchange_mathcap=1;
-jmp_buf ox_env;
+JMP_BUF ox_env;
 
 MATHCAP my_mathcap;
 
@@ -94,11 +89,28 @@ static struct mathcap my_mc;
 static struct mathcap *remote_mc;
 static int remote_mc_len;
 
-void ox_resetenv(s)
-char *s;
+void mclist_to_mc(LIST mclist,struct mathcap *mc);
+
+#if defined(VISUAL)
+/* XXX : mainly used in engine2000/io.c, but declared here */
+HANDLE hStreamNotify,hStreamNotify_Ack;
+
+void cleanup_events()
 {
+	/* ox_watch_stream may be waiting for hStreamNotify_Ack to be set */
+
+	ResetEvent(hStreamNotify);
+	SetEvent(hStreamNotify_Ack);
+}
+#endif
+
+void ox_resetenv(char *s)
+{
+#if defined(VISUAL)
+	cleanup_events();
+#endif
 	fprintf(stderr,"%s\n",s);
-	longjmp(ox_env,1);
+	LONGJMP(ox_env,1);
 }
 
 static int available_cmo[] = {
@@ -109,12 +121,13 @@ static int available_cmo[] = {
 	CMO_RING_BY_NAME, CMO_DISTRIBUTED_POLYNOMIAL,
 	CMO_RECURSIVE_POLYNOMIAL, CMO_UNIVARIATE_POLYNOMIAL,
 	CMO_INDETERMINATE,
+	CMO_TREE,
 	0
 };
 
 static int available_sm[] = {
 	SM_dupErrors, SM_getsp, SM_popSerializedLocalObject,
-	SM_popCMO, SM_popString, SM_setName,
+	SM_popCMO, SM_popString, SM_pushCMOtag, SM_setName,
 	SM_evalName, SM_executeStringByLocalParser,
 	SM_executeStringByLocalParserInBatchMode,
 	SM_executeFunction, SM_shutdown, SM_pops,
@@ -141,7 +154,7 @@ void create_my_mathcap(char *system)
 	NODE n,n0;
 	int i,k;
 	STRING str;
-	LIST sname,smlist,oxlist,cmolist,asirlist,oxtag,oxasir,r;
+	LIST sname,smlist,oxlist,cmolist,asirlist,oxasir,r;
 	USINT tag,t,t1;
 
 	if ( my_mathcap )
@@ -234,8 +247,8 @@ void store_remote_mathcap(int s,MATHCAP mc)
 
 void mclist_to_mc(LIST mclist,struct mathcap *mc)
 {
-	int id,l,i,j;
-	NODE n,t,oxcmo,ox,cap;
+	int l,i,j;
+	NODE n,t,oxcmo,cap;
 	int *ptr;
 
 	/*
@@ -281,9 +294,7 @@ void mclist_to_mc(LIST mclist,struct mathcap *mc)
 	}
 }
 
-int check_sm_by_mc(s,smtag)
-int s;
-unsigned int smtag;
+int check_sm_by_mc(int s,unsigned int smtag)
 {
 	struct mathcap *rmc;
 	int nsmcap,i;
@@ -306,9 +317,7 @@ unsigned int smtag;
 		return 1;
 }
 
-int check_by_mc(s,oxtag,cmotag)
-int s;
-unsigned int oxtag,cmotag;
+int check_by_mc(int s,unsigned int oxtag,unsigned int cmotag)
 {
 	struct mathcap *rmc;
 	int noxcap,ncap,i,j;
@@ -346,19 +355,20 @@ void begin_critical() {
 void end_critical() {
 	critical_when_signal = 0;
 	if ( ox_usr1_sent ) {
-		ox_usr1_sent = 0; ox_usr1_handler();
+		ox_usr1_sent = 0;
+#if !defined(VISUAL)
+	ox_usr1_handler(SIGUSR1);
+#else
+	ox_usr1_handler(0);
+#endif
 	}
 	if ( ox_int_received ) {
 		ox_int_received = 0; int_handler(SIGINT);
 	}
 }
 
-void ox_usr1_handler(sig)
-int sig;
+void ox_usr1_handler(int sig)
 {
-	extern jmp_buf env;
-	unsigned int cmd;
-
 #if !defined(VISUAL)
 	signal(SIGUSR1,ox_usr1_handler);
 #endif
@@ -373,11 +383,6 @@ int sig;
 
 void clear_readbuffer()
 {
-	char c;
-	fd_set r,w,e;
-	struct timeval interval;
-	int n,sock;
-
 #if defined(linux)
 	iofp[0].in->_IO_read_ptr = iofp[0].in->_IO_read_end;
 #elif defined(__FreeBSD__)
@@ -424,7 +429,7 @@ void wait_for_data(int s)
 #if defined(VISUAL)
 		sock = iofp[s].in->fildes;
 		FD_ZERO(&r);
-		FD_SET(sock,&r);
+		FD_SET((unsigned int)sock,&r);
 		select(0,&r,NULL,NULL,NULL);
 #else
 		sock = fileno(iofp[s].in);
@@ -438,8 +443,12 @@ void wait_for_data(int s)
 
 void ox_send_data(int s,pointer p)
 {
-	if ( ox_check && !ox_check_cmo(s,(Obj)p) )
-		error("ox_send_data : Mathcap violation");
+	ERR err;
+
+	if ( ox_check && !ox_check_cmo(s,(Obj)p) ) {
+		create_error(&err,ox_serial,"ox_send_data : Mathcap violation");
+		p = (pointer)err;
+	}
 	begin_critical();
 	ox_write_int(s,OX_DATA);
 	ox_write_int(s,ox_serial++);
@@ -475,7 +484,7 @@ void ox_send_local_data(int s,Obj p)
 	ox_write_int(s,OX_LOCAL_OBJECT_ASIR);
 	ox_write_int(s,ox_serial++);
 	ox_write_int(s,ASIR_OBJ);
-	saveobj(iofp[s].out,p);
+	saveobj((FILE *)iofp[s].out,p);
 	ox_flush_stream(s);
 	end_critical();
 }
@@ -486,12 +495,12 @@ void ox_send_local_ring(int s,VL vl)
 	ox_write_int(s,OX_LOCAL_OBJECT_ASIR);
 	ox_write_int(s,ox_serial++);
 	ox_write_int(s,ASIR_VL);
-	savevl(iofp[s].out,vl);
+	savevl((FILE *)iofp[s].out,vl);
 	ox_flush_stream(s);
 	end_critical();
 }
 
-unsigned int ox_recv(int s, int *id, pointer *p)
+unsigned int ox_recv(int s, int *id, Obj *p)
 {
 	unsigned int cmd,serial;
 	USINT ui;
@@ -504,7 +513,7 @@ unsigned int ox_recv(int s, int *id, pointer *p)
 		case OX_COMMAND:
 			ox_read_int(s,&cmd);
 			MKUSINT(ui,cmd);
-			*p = (pointer)ui;
+			*p = (Obj)ui;
 			break;
 		case OX_DATA:
 			ox_read_cmo(s,p);
@@ -520,9 +529,7 @@ unsigned int ox_recv(int s, int *id, pointer *p)
 	return serial;
 }
 
-void ox_get_result(s,rp)
-int s;
-Obj *rp;
+void ox_get_result(int s,Obj *rp)
 {
 	int id;
 	Obj obj,r;
@@ -531,7 +538,7 @@ Obj *rp;
 	level = 0;
 	r = 0;
 	do {
-		ox_recv(s,&id,(pointer *)&obj);
+		ox_recv(s,&id,&obj);
 		if ( id == OX_COMMAND ) {
 			switch ( ((USINT)obj)->body ) {
 				case SM_beginBlock:
@@ -549,13 +556,13 @@ Obj *rp;
 void ox_read_int(int s, int *n)
 {
 	ox_need_conv = iofp[s].conv;
-	read_int(iofp[s].in,n);
+	read_int((FILE *)iofp[s].in,n);
 }
 
 void ox_read_cmo(int s, Obj *rp)
 {
 	ox_need_conv = iofp[s].conv;
-	read_cmo(iofp[s].in,rp);
+	read_cmo((FILE *)iofp[s].in,rp);
 }
 
 void ox_read_local(int s, Obj *rp)
@@ -563,14 +570,14 @@ void ox_read_local(int s, Obj *rp)
 	int id;
 
 	ox_need_conv = iofp[s].conv;
-	read_int(iofp[s].in,&id);
+	read_int((FILE *)iofp[s].in,&id);
 	switch ( id ) {
 		case ASIR_VL:
-			loadvl(iofp[s].in);
+			loadvl((FILE *)iofp[s].in);
 			*rp = VOIDobj;
 			break;
 		case ASIR_OBJ:
-			loadobj(iofp[s].in,rp);
+			loadobj((FILE *)iofp[s].in,rp);
 			break;
 		default:
 			error("ox_read_local : unsupported id");
@@ -581,13 +588,13 @@ void ox_read_local(int s, Obj *rp)
 void ox_write_int(int s, int n)
 {
 	ox_need_conv = iofp[s].conv;
-	write_int(iofp[s].out,&n);
+	write_int((FILE *)iofp[s].out,&n);
 }
 
 void ox_write_cmo(int s, Obj obj)
 {
 	ox_need_conv = iofp[s].conv;
-	write_cmo(iofp[s].out,obj);
+	write_cmo((FILE *)iofp[s].out,obj);
 }
 
 int ox_check_cmo(int s, Obj obj)
@@ -598,6 +605,7 @@ int ox_check_cmo(int s, Obj obj)
 		return 1;
 	switch ( OID(obj) ) {
 		case O_MATHCAP: case O_STR: case O_ERR: case O_USINT: case O_VOID:
+		case O_BYTEARRAY:
 			return 1;
 		case O_P:
 			if ( !check_by_mc(s,OX_DATA,CMO_RECURSIVE_POLYNOMIAL) )
@@ -631,6 +639,8 @@ int ox_check_cmo(int s, Obj obj)
 				if ( !ox_check_cmo(s,(BDY(m))) )
 					return 0;
 			return 1;
+		case O_QUOTE: /* XXX */
+			return 1;
 		default:
 			return 0;
 	}
@@ -669,8 +679,7 @@ int ox_check_cmo_dp(int s, DP p)
 	return 1;
 }
 
-void ox_flush_stream(s)
-int s;
+void ox_flush_stream(int s)
 {
 	if ( ox_batch )
 		return;
@@ -683,11 +692,10 @@ int s;
 		cflush(iofp[s].out);
 	else
 #endif
-	fflush(iofp[s].out);
+	fflush((FILE *)iofp[s].out);
 }
 
-void ox_flush_stream_force(s)
-int s;
+void ox_flush_stream_force(int s)
 {
 #if defined(VISUAL)
 	if ( _fileno(&iofp[s].out->fp) < 0 )
@@ -698,5 +706,5 @@ int s;
 		cflush(iofp[s].out);
 	else
 #endif
-	fflush(iofp[s].out);
+	fflush((FILE *)iofp[s].out);
 }