=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ox_plot.c,v retrieving revision 1.20 retrieving revision 1.25 diff -u -p -r1.20 -r1.25 --- OpenXM_contrib2/asir2000/plot/ox_plot.c 2004/02/13 05:48:36 1.20 +++ OpenXM_contrib2/asir2000/plot/ox_plot.c 2014/05/12 16:54:41 1.25 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot.c,v 1.19 2003/02/14 22:29:19 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot.c,v 1.24 2013/12/20 02:27:17 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -63,7 +63,7 @@ extern int asir_OperandStackSize; extern Obj *asir_OperandStack; extern int asir_OperandStackPtr; -/* environement is defined in libpari.a */ +// environement is defined in libpari.a #if !(PARI_VERSION_CODE > 131588) extern jmp_buf environnement; #endif @@ -74,7 +74,7 @@ extern JMP_BUF ox_env; extern MATHCAP my_mathcap; extern char LastError[]; -void create_error(ERR *,unsigned int ,char *); +void create_error(ERR *,unsigned int ,char *,LIST ); void ox_io_init(); void ox_asir_init(int,char **,char *); @@ -109,42 +109,34 @@ void ox_plot_main(int argc,char **argv) #if !defined(VISUAL) ox_asir_init(argc,argv,"ox_plot"); - use_x = init_plot_display(argc,argv); - if ( use_x ) - ds = ConnectionNumber(display); - else - fprintf(stderr,"Entering no X mode\n"); + use_x=init_plot_display(argc,argv); + if(use_x) ds=ConnectionNumber(display); + else fprintf(stderr,"Entering no X mode\n"); #endif - if ( do_message ) - fprintf(stderr,"I'm an ox_plot, Version %d.\n",ASIR_VERSION); + if(do_message)fprintf(stderr,"I'm an ox_plot, Version %d.\n",ASIR_VERSION); - if ( SETJMP(ox_env) ) { - while ( NEXT(asir_infile) ) - closecurrentinput(); + if(SETJMP(ox_env)){ + while(NEXT(asir_infile))closecurrentinput(); reset_current_computation(); ox_send_sync(0); } - while ( 1 ) { + while (1){ #if defined(VISUAL) process_ox(); #else - if ( ox_data_is_available(0) ) - process_ox(); - else if ( use_x ) { + if(ox_data_is_available(0)) process_ox(); + else if(use_x){ FD_ZERO(&r); FD_SET(3,&r); FD_SET(ds,&r); select(FD_SETSIZE,&r,NULL,NULL,NULL); - if ( FD_ISSET(3,&r) ) - process_ox(); - else if ( FD_ISSET(ds,&r) ) - process_xevent(); + if(FD_ISSET(3,&r)) process_ox(); + else if(FD_ISSET(ds,&r)) process_xevent(); } } #endif } -static void process_ox() -{ +static void process_ox(){ int id; unsigned int cmd; Obj obj; @@ -152,19 +144,17 @@ static void process_ox() unsigned int serial; int ret; - serial = ox_recv(0,&id,&obj); - if ( do_message ) - fprintf(stderr,"#%d Got %s",serial,name_of_id(id)); - switch ( id ) { + serial=ox_recv(0,&id,&obj); + if(do_message) fprintf(stderr,"#%d Got %s",serial,name_of_id(id)); + switch (id){ case OX_COMMAND: - cmd = ((USINT)obj)->body; - if ( ox_flushing ) - break; - if ( do_message ) - fprintf(stderr," %s\n",name_of_cmd(cmd)); - if ( ret = SETJMP(main_env) ) { - if ( ret == 1 ) { - create_error(&err,serial,LastError); + cmd=((USINT)obj)->body; + if(ox_flushing) break; + if(do_message) fprintf(stderr," %s\n",name_of_cmd(cmd)); + ret=SETJMP(main_env); + if(ret){ + if(ret==1){ + create_error(&err,serial,LastError,0); asir_push_one((Obj)err); } break; @@ -173,36 +163,32 @@ static void process_ox() break; case OX_DATA: case OX_LOCAL_OBJECT_ASIR: - if ( ox_flushing ) - break; - if ( do_message ) - fprintf(stderr," -> data pushed"); + if(ox_flushing)break; + if(do_message)fprintf(stderr," -> data pushed"); asir_push_one(obj); break; case OX_SYNC_BALL: - asir_end_flush(); + asir_end_flush(); break; default: break; } - if ( do_message ) - fprintf(stderr,"\n"); + if(do_message)fprintf(stderr,"\n"); } -static void asir_do_cmd(unsigned int cmd,unsigned int serial) -{ +static void asir_do_cmd(unsigned int cmd,unsigned int serial){ MATHCAP client_mathcap; LIST list; int i; Q q; - switch ( cmd ) { + switch (cmd){ case SM_dupErrors: - list = asir_GetErrorList(); + list=asir_GetErrorList(); asir_push_one((Obj)list); break; case SM_getsp: - i = asir_OperandStackPtr+1; + i=asir_OperandStackPtr+1; STOQ(i,q); asir_push_one((Obj)q); break; @@ -237,7 +223,7 @@ static void asir_do_cmd(unsigned int cmd,unsigned int asir_push_one((Obj)my_mathcap); break; case SM_setMathcap: - client_mathcap = (MATHCAP)asir_pop_one(); + client_mathcap=(MATHCAP)asir_pop_one(); store_remote_mathcap(0,client_mathcap); break; case SM_nop: @@ -246,11 +232,9 @@ static void asir_do_cmd(unsigned int cmd,unsigned int } } -static void asir_executeFunction(int serial) -{ - char *func; - int argc; - int id; +static void asir_executeFunction(int serial){ + char *fn; + int argc,id,fno; FUNC f; Q ret; VL vl; @@ -258,42 +242,107 @@ static void asir_executeFunction(int serial) NODE n,n1; LIST bytes; - func = ((STRING)asir_pop_one())->body; - argc = (int)(((USINT)asir_pop_one())->body); - - for ( n = 0; argc; argc-- ) { + fn=((STRING)asir_pop_one())->body; + argc=(int)(((USINT)asir_pop_one())->body); + for(n=0;argc;argc--){ NEXTNODE(n,n1); - BDY(n1) = (pointer)asir_pop_one(); + BDY(n1)=(pointer)asir_pop_one(); } - if ( n ) - NEXT(n1) = 0; - id = -1; - if ( !strcmp(func,"plot") ) { - id = plot(n); - STOQ(id,ret); asir_push_one((Obj)ret); - } else if ( !strcmp(func,"memory_plot") ) { - memory_plot(n,&bytes); asir_push_one((Obj)bytes); - } else if ( !strcmp(func,"arrayplot") ) { - id = arrayplot(n); - STOQ(id,ret); asir_push_one((Obj)ret); - } else if ( !strcmp(func,"open_canvas") ) { - id = open_canvas(n); - STOQ(id,ret); asir_push_one((Obj)ret); - } else if ( !strcmp(func,"plotover") ) { + if(n)NEXT(n1)=0; + id=-1; + fno=modeNO(fn); + switch (fno){ + case 0://IFPLOTD + id=plot(n,IFPLOT); + STOQ(id,ret); + asir_push_one((Obj)ret); + break; + case 1://CONPLOT + id=plot(n,CONPLOT); + STOQ(id,ret); + asir_push_one((Obj)ret); + case 2://PLOT + id=plot(n,PLOT); + STOQ(id,ret); + asir_push_one((Obj)ret); + break; + case 4://POLARPLOT + id=polarplotNG(n); + STOQ(id,ret); + asir_push_one((Obj)ret); + break; + case 30://MEMORY_PLOT + memory_plot(n,&bytes); + asir_push_one((Obj)bytes); + break; + case 31://ARRAYPLOT + id=arrayplot(n); + STOQ(id,ret); + asir_push_one((Obj)ret); + break; + case 32://OPEN_CANVAS + id=open_canvas(n); + STOQ(id,ret); + asir_push_one((Obj)ret); + break; + case 5://PLOTOVER plotover(n); - } else if ( !strcmp(func,"drawcircle") ) { + break; + case 33://DRAWCIRCLE drawcircle(n); - } else if ( !strcmp(func,"draw_obj") ) { - if ( draw_obj(n) < 0 ) { - create_error(&err,serial,LastError); + break; + case 34://DRAW_OBJ + if(draw_obj(n) < 0 ){ + create_error(&err,serial,LastError,0); asir_push_one((Obj)err); } - } else if ( !strcmp(func,"draw_string") ) { - if ( draw_string(n) < 0 ) { - create_error(&err,serial,LastError); + break; + case 35://DRAW_STRING + if(draw_string(n)<0){ + create_error(&err,serial,LastError,0); asir_push_one((Obj)err); } - } else if ( !strcmp(func,"clear_canvas") ) { + break; + case 37://CLEAR_CANVAS clear_canvas(n); + break; +#if defined(INTERVAL) +// ifplotNG + case 36://OBJ_CP + id=objcp(n); + STOQ(id,ret); + asir_push_one((Obj)ret); + break; + case 6://IFPLOTD + case 7://IFPLOTQ + case 8://IFPLOTB + case 9://INEQND + case 10://INEQNQ + case 11://INEQNB + case 21://CONPLOTD + case 22://CONPLOTQ + case 23://CONPLOTB + case 24://ITVIFPLOT + id=ifplotNG(n,modeNO(fn)); + STOQ(id,ret); + asir_push_one((Obj)ret); + break; + case 12://INEQNDAND + case 13://INEQNQAND + case 14://INEQNBAND + case 15://INEQNDOR + case 16://INEQNQOR + case 17://INEQNBOR + case 18://INEQNDXOR + case 19://INEQNQXOR + case 20://INEQNBXOR + case 25://PLOTOVERD + case 26://PLOTOVERQ + case 27://PLOTOVERB + id=ifplotOP(n,modeNO(fn)); + STOQ(id,ret); + asir_push_one((Obj)ret); + break; +#endif } }