===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ox_plot.c,v
retrieving revision 1.16
retrieving revision 1.32
diff -u -p -r1.16 -r1.32
--- OpenXM_contrib2/asir2000/plot/ox_plot.c	2002/07/10 05:29:36	1.16
+++ OpenXM_contrib2/asir2000/plot/ox_plot.c	2020/10/04 03:14:09	1.32
@@ -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.15 2001/12/27 07:51:18 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot.c,v 1.31 2018/03/29 01:32:55 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -53,18 +53,20 @@
 #include "ifplot.h"
 #include "version.h"
 #include <signal.h>
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
 #endif
 
-void ox_usr1_handler();
+int objcp(NODE arg);
 
 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
 
 extern int do_message;
 extern int ox_flushing;
@@ -72,10 +74,10 @@ 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 **);
+void ox_asir_init(int,char **,char *);
 Obj asir_pop_one();
 void asir_push_one(Obj);
 void asir_end_flush();
@@ -94,203 +96,258 @@ static void asir_do_cmd(unsigned int,unsigned int);
 static void process_ox();
 static void asir_executeFunction();
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 void ox_plot_main()
 #else
 void ox_plot_main(int argc,char **argv)
 #endif
 {
-	int ds;
-	fd_set r;
-	int n;
-	int use_x;
+  int ds;
+  fd_set r;
+  int n;
+  int use_x;
 
-#if !defined(VISUAL)
-	ox_asir_init(argc,argv);
-	use_x = init_plot_display(argc,argv);
-	if ( use_x )
-		ds = ConnectionNumber(display);
-	else
-		fprintf(stderr,"Entering no X mode\n");
+#if !defined(VISUAL) && !defined(__MINGW32__)
+  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");
 #endif
-	if ( do_message )
-		fprintf(stderr,"I'm an ox_plot, Version %d.\n",ASIR_VERSION);
-
-	if ( SETJMP(ox_env) ) {
-		while ( NEXT(asir_infile) )
-			closecurrentinput();
-		reset_current_computation();
-		ox_send_sync(0);
-	}
-	while ( 1 ) {
-#if defined(VISUAL)
-		process_ox();
+  if(do_message)fprintf(stderr,"I'm an ox_plot, Version %d.\n",ASIR_VERSION);
+  if(SETJMP(ox_env)){
+    while(NEXT(asir_infile))closecurrentinput();
+    reset_current_computation();
+    ox_send_sync(0);
+  }
+  while (1){
+#if defined(VISUAL) || defined(__MINGW32__)
+    process_ox();
 #else
-		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(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();
+    }
+  }
 #endif
 }
 
-static void process_ox()
-{
-	int id;
-	unsigned int cmd;
-	Obj obj;
-	ERR err;
-	unsigned int serial;
-	int ret;
+static void process_ox(){
+  int id;
+  unsigned int cmd;
+  Obj obj;
+  ERR err;
+  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 ) {
-		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);
-					asir_push_one((Obj)err);
-				}
-				break;
-			}
-			asir_do_cmd(cmd,serial);
-			break;
-		case OX_DATA:
-		case OX_LOCAL_OBJECT_ASIR:
-			if ( ox_flushing )
-				break;
-			if ( do_message )
-				fprintf(stderr," -> data pushed");
-			asir_push_one(obj);
-			break;
-		case OX_SYNC_BALL:
-				asir_end_flush();
-			break;
-		default:
-			break;
-	}
-	if ( do_message )
-		fprintf(stderr,"\n");
+  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));
+      ret=SETJMP(main_env);
+      if(ret){
+        if(ret==1){
+          create_error(&err,serial,LastError,0);
+          asir_push_one((Obj)err);
+        }
+        break;
+      }
+      asir_do_cmd(cmd,serial);
+      break;
+    case OX_DATA:
+    case OX_LOCAL_OBJECT_ASIR:
+      if(ox_flushing)break;
+      if(do_message)fprintf(stderr," -> data pushed");
+      asir_push_one(obj);
+      break;
+    case OX_SYNC_BALL:
+      asir_end_flush();
+      break;
+    default:
+      break;
+  }
+  if(do_message)fprintf(stderr,"\n");
 }
 
-static void asir_do_cmd(unsigned int cmd,unsigned int serial)
-{
-	MATHCAP client_mathcap;
-	LIST list;
-	int i;
-	Q q;
+static void asir_do_cmd(unsigned int cmd,unsigned int serial){
+  MATHCAP client_mathcap;
+  LIST list;
+  int i;
+  Q q;
 
-	switch ( cmd ) {
-		case SM_dupErrors:
-			list = asir_GetErrorList();
-			asir_push_one((Obj)list);
-			break;
-		case SM_getsp:
-			i = asir_OperandStackPtr+1;
-			STOQ(i,q);
-			asir_push_one((Obj)q);
-			break;
-		case SM_popSerializedLocalObject:
-			asir_popSerializedLocalObject();
-			break;
-		case SM_popCMO:
-			asir_popCMO(serial);
-			break;
-		case SM_popString:
-			asir_popString();
-			break;
-		case SM_setName:
-			asir_setName(serial);
-			break;
-		case SM_evalName:
-			asir_evalName(serial);
-			break;
-		case SM_executeStringByLocalParser:
-			asir_executeString();
-			break;
-		case SM_executeFunction:
-			asir_executeFunction(serial);
-			break;
-		case SM_shutdown:
-			asir_terminate(2);
-			break;
-		case SM_pops:
-			asir_pops();
-			break;
-		case SM_mathcap:
-			asir_push_one((Obj)my_mathcap);
-			break;
-		case SM_setMathcap:
-			client_mathcap = (MATHCAP)asir_pop_one();
-			store_remote_mathcap(0,client_mathcap);
-			break;
-		default:
-			break;
-	}
+  switch (cmd){
+    case SM_dupErrors:
+      list=asir_GetErrorList();
+      asir_push_one((Obj)list);
+      break;
+    case SM_getsp:
+      i=asir_OperandStackPtr+1;
+      STOQ(i,q);
+      asir_push_one((Obj)q);
+      break;
+    case SM_popSerializedLocalObject:
+      asir_popSerializedLocalObject();
+      break;
+    case SM_popCMO:
+      asir_popCMO(serial);
+      break;
+    case SM_popString:
+      asir_popString();
+      break;
+    case SM_setName:
+      asir_setName(serial);
+      break;
+    case SM_evalName:
+      asir_evalName(serial);
+      break;
+    case SM_executeStringByLocalParser:
+      asir_executeString();
+      break;
+    case SM_executeFunction:
+      asir_executeFunction(serial);
+      break;
+    case SM_shutdown:
+      asir_terminate(2);
+      break;
+    case SM_pops:
+      asir_pops();
+      break;
+    case SM_mathcap:
+      asir_push_one((Obj)my_mathcap);
+      break;
+    case SM_setMathcap:
+      client_mathcap=(MATHCAP)asir_pop_one();
+      store_remote_mathcap(0,client_mathcap);
+      break;
+    case SM_nop:
+    default:
+      break;
+  }
 }
 
-static void asir_executeFunction(int serial)
-{ 
-	char *func;
-	int argc;
-	int id;
-	FUNC f;
-	Q ret;
-	VL vl;
-	ERR err;
-	NODE n,n1; 
-	LIST bytes;
+static void asir_executeFunction(int serial){
+  char *fn;
+  int argc,id,fno;
+  FUNC f;
+  Q ret;
+  VL vl;
+  ERR err;
+  NODE n,n1; 
+  LIST bytes;
 
-	func = ((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();
-	}
-	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") ) {
-		plotover(n);
-	} else if ( !strcmp(func,"drawcircle") ) {
-		drawcircle(n);
-	} else if ( !strcmp(func,"draw_obj") ) {
-		if ( draw_obj(n) < 0 ) {
-			create_error(&err,serial,LastError);
-			asir_push_one((Obj)err);
-		}	
-	} else if ( !strcmp(func,"draw_string") ) {
-		if ( draw_string(n) < 0 ) {
-			create_error(&err,serial,LastError);
-			asir_push_one((Obj)err);
-		}
-	} else if ( !strcmp(func,"clear_canvas") ) {
-		clear_canvas(n);
-	}
+  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();
+  }
+  if(n)NEXT(n1)=0;
+  id=-1;
+  fno=modeNO(fn);
+  switch (fno){
+  case 0://IFPLOT
+    id=plot(n,fno);
+    STOQ(id,ret);
+    asir_push_one((Obj)ret);
+    break;
+  case 1://CONPLOT
+    id=plot(n,fno);
+    STOQ(id,ret);
+    asir_push_one((Obj)ret);
+    break;
+  case 2://PLOT
+    id=plot(n,fno);
+    STOQ(id,ret);
+    asir_push_one((Obj)ret);
+    break;
+  case 4://POLARPLOT
+    id=plot(n,fno);
+    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);
+    break;
+  case 33://DRAWCIRCLE
+    drawcircle(n);
+    break;
+  case 34://DRAW_OBJ
+    if(draw_obj(n) < 0 ){
+      create_error(&err,serial,LastError,0);
+      asir_push_one((Obj)err);
+    }  
+    break;
+  case 35://DRAW_STRING
+    if(draw_string(n)<0){
+      create_error(&err,serial,LastError,0);
+      asir_push_one((Obj)err);
+    }
+    break;
+  case 37://CLEAR_CANVAS
+    clear_canvas(n);
+    break;
+// 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
+#if defined(INTERVAL)
+  case 24://ITVIFPLOT
+#endif
+    id=ifplotNG(n,fno);
+    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,fno);
+    STOQ(id,ret);
+    asir_push_one((Obj)ret);
+    break;
+  case 38://POLARPLOTD
+    id=polarplotNG(n);
+    STOQ(id,ret);
+    asir_push_one((Obj)ret);
+    break;
+  }
 }