=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox.c,v retrieving revision 1.26 retrieving revision 1.32 diff -u -p -r1.26 -r1.32 --- OpenXM_contrib2/asir2000/io/ox.c 2004/12/17 03:09:08 1.26 +++ OpenXM_contrib2/asir2000/io/ox.c 2015/08/06 09:12:29 1.32 @@ -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.25 2004/08/28 12:50:30 takayama Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox.c,v 1.31 2015/08/04 06:20:45 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -91,6 +91,8 @@ 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) /* XXX : mainly used in engine2000/io.c, but declared here */ @@ -123,7 +125,7 @@ static int available_cmo[] = { CMO_RATIONAL, CMO_RECURSIVE_POLYNOMIAL, CMO_UNIVARIATE_POLYNOMIAL, CMO_INDETERMINATE, - CMO_TREE, + CMO_TREE, CMO_BIGFLOAT, 0 }; @@ -145,7 +147,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 @@ -462,6 +464,11 @@ void wait_for_data(int s) { return; } + +void wait_for_data_102(int rank) +{ + return; +} #else int ox_data_is_available(int s) { @@ -514,7 +521,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(); @@ -867,7 +874,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: return 1; default: return 0; @@ -879,6 +886,8 @@ int ox_check_cmo(int s, Obj obj) return 0; return 1; case O_QUOTE: /* XXX */ + return 1; + case O_MAT: /* MAT is sent as a list */ return 1; default: return 0;