===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox.c,v
retrieving revision 1.25
retrieving revision 1.36
diff -u -p -r1.25 -r1.36
--- OpenXM_contrib2/asir2000/io/ox.c	2004/08/28 12:50:30	1.25
+++ OpenXM_contrib2/asir2000/io/ox.c	2015/08/18 02:26:05	1.36
@@ -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.24 2003/12/11 05:48:04 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox.c,v 1.35 2015/08/14 13:51:55 fujimoto Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -91,9 +91,12 @@ static struct mathcap *remote_mc;
 static int remote_mc_len;
 
 void mclist_to_mc(LIST mclist,struct mathcap *mc);
+Obj asir_pop_one();
+void asir_push_one(Obj);
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 /* XXX : mainly used in engine2000/io.c, but declared here */
+typedef void *HANDLE;
 HANDLE hStreamNotify,hStreamNotify_Ack;
 
 void cleanup_events()
@@ -107,7 +110,7 @@ void cleanup_events()
 
 void ox_resetenv(char *s)
 {
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	cleanup_events();
 #endif
 	fprintf(stderr,"%s\n",s);
@@ -123,7 +126,7 @@ static int available_cmo[] = {
     CMO_RATIONAL,
 	CMO_RECURSIVE_POLYNOMIAL, CMO_UNIVARIATE_POLYNOMIAL,
 	CMO_INDETERMINATE,
-	CMO_TREE,
+	CMO_TREE, CMO_BIGFLOAT, CMO_COMPLEX,
 	0
 };
 
@@ -145,7 +148,7 @@ static int ox_asir_available_sm[] = {
 	SM_executeStringByLocalParserInBatchMode,
 	SM_executeFunction, SM_shutdown, SM_pops,
 	SM_mathcap, SM_setMathcap, SM_nop,
-	SM_beginBlock, SM_endBlock,
+	SM_beginBlock, SM_endBlock,  SM_executeFunctionSync,
 	SM_set_rank_102, SM_tcp_accept_102, SM_tcp_connect_102, SM_reset_102,
 	SM_bcast_102, SM_reduce_102,
 	0
@@ -393,7 +396,7 @@ void end_critical() {
 	critical_when_signal = 0;
 	if ( ox_usr1_sent ) {
 		ox_usr1_sent = 0;
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	ox_usr1_handler(SIGUSR1);
 #else
 	ox_usr1_handler(0);
@@ -404,11 +407,13 @@ void end_critical() {
 	}
 }
 
-extern FUNC registered_handler;
+extern NODE user_int_handler;
 
 void ox_usr1_handler(int sig)
 {
-#if !defined(VISUAL)
+	NODE t;
+
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	signal(SIGUSR1,ox_usr1_handler);
 #endif
 	if ( critical_when_signal ) {
@@ -416,10 +421,11 @@ void ox_usr1_handler(int sig)
 		ox_usr1_sent = 1;
 	} else {
 		ox_flushing = 1;
-		if ( registered_handler ) {
+		if ( user_int_handler ) {
 			fprintf(stderr,
-				"usr1 : calling the registered exception handler...");
-			bevalf(registered_handler,0);
+				"usr1 : calling the registered exception handlers...");
+			for ( t = user_int_handler; t; t = NEXT(t) )
+				bevalf((FUNC)BDY(t),0);
 			fprintf(stderr, "done.\n");
 		}
 		ox_resetenv("usr1 : return to toplevel by SIGUSR1");
@@ -459,6 +465,11 @@ void wait_for_data(int s)
 {
 	return;
 }
+
+void wait_for_data_102(int rank)
+{
+	return;
+}
 #else
 int ox_data_is_available(int s)
 {
@@ -471,7 +482,7 @@ void wait_for_data(int s)
 	int sock;
 
 	if ( !FP_DATA_IS_AVAILABLE(iofp[s].in) ) {
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 		sock = iofp[s].in->fildes;
 		FD_ZERO(&r);
 		FD_SET((unsigned int)sock,&r);
@@ -491,7 +502,7 @@ void wait_for_data_102(int rank)
 	int sock;
 
 	if ( !FP_DATA_IS_AVAILABLE(iofp_102[rank].in) ) {
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 		sock = iofp_102[rank].in->fildes;
 		FD_ZERO(&r);
 		FD_SET((unsigned int)sock,&r);
@@ -511,7 +522,7 @@ void ox_send_data(int s,pointer p)
 	ERR err;
 
 	if ( ox_check && !ox_check_cmo(s,(Obj)p) ) {
-		create_error(&err,ox_serial,"ox_send_data : Mathcap violation");
+		create_error(&err,ox_serial,"ox_send_data : Mathcap violation",0);
 		p = (pointer)err;
 	}
 	begin_critical();
@@ -864,7 +875,7 @@ int ox_check_cmo(int s, Obj obj)
 						return check_by_mc(s,OX_DATA,CMO_ZZ);
 					else
 						return check_by_mc(s,OX_DATA,CMO_QQ);
-				case N_R:
+				case N_R: case N_B: case N_C:
 					return 1;
 				default:
 					return 0;
@@ -877,6 +888,8 @@ int ox_check_cmo(int s, Obj obj)
 			return 1;
 		case O_QUOTE: /* XXX */
 			return 1;
+    case O_MAT: /* MAT is sent as a list */
+			return 1;
 		default:
 			return 0;
 	}
@@ -925,7 +938,7 @@ void ox_flush_stream(int s)
 {
 	if ( ox_batch )
 		return;
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	if ( _fileno(&iofp[s].out->fp) < 0 )
 		cflush(iofp[s].out);
 	else
@@ -939,7 +952,7 @@ void ox_flush_stream(int s)
 
 void ox_flush_stream_force(int s)
 {
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	if ( _fileno(&iofp[s].out->fp) < 0 )
 		cflush(iofp[s].out);
 	else
@@ -960,7 +973,7 @@ void ox_flush_stream_102(int rank)
 void ox_flush_stream_force_102(int rank)
 {
 	if ( iofp_102[rank].out )
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 		cflush(iofp_102[rank].out);
 #elif MPI
 		cflush(iofp_102[rank].out);