===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ox_plot.c,v
retrieving revision 1.2
retrieving revision 1.7
diff -u -p -r1.2 -r1.7
--- OpenXM_contrib2/asir2000/plot/ox_plot.c	2000/02/08 04:47:13	1.2
+++ OpenXM_contrib2/asir2000/plot/ox_plot.c	2000/09/12 06:05:31	1.7
@@ -1,9 +1,58 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot.c,v 1.1.1.1 1999/12/03 07:39:13 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * shall be made on your publication or presentation in any form of the
+ * results obtained by use of the SOFTWARE.
+ * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * 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/plot/ox_plot.c,v 1.6 2000/08/22 05:04:31 noro Exp $ 
+*/
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
 #include "ifplot.h"
 #include "version.h"
+#include <signal.h>
 #if PARI
 #include "genpari.h"
 #endif
@@ -21,7 +70,8 @@ static int plot_OperandStackSize;
 static Obj *plot_OperandStack;
 static int plot_OperandStackPtr = -1;
 
-static void create_error(ERR *,unsigned int ,char *);
+void create_error(ERR *,unsigned int ,char *);
+
 static void process_ox();
 static void ox_io_init();
 static void ox_asir_init(int,char **);
@@ -39,20 +89,8 @@ static void asir_popSerializedLocalObject();
 static char *name_of_cmd(unsigned int);
 static char *name_of_id(int);
 static void asir_do_cmd(unsigned int,unsigned int);
+static LIST asir_GetErrorList();
 
-static void create_error(ERR *err,unsigned int serial,char *msg)
-{
-	USINT ui;
-	NODE n,n1;
-	LIST list;
-	STRING errmsg;
-
-	MKUSINT(ui,serial);
-	MKSTR(errmsg,msg);
-	MKNODE(n1,errmsg,0); MKNODE(n,ui,n1); MKLIST(list,n);
-	MKERR(*err,list);
-}
-
 void ox_plot_main(int argc,char **argv) {
 	int ds;
 	fd_set r;
@@ -135,8 +173,20 @@ static void process_ox()
 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 = plot_OperandStackPtr+1;
+			STOQ(i,q);
+			asir_push_one((Obj)q);
+			break;
 		case SM_popSerializedLocalObject:
 			asir_popSerializedLocalObject();
 			break;
@@ -433,6 +483,23 @@ static void asir_push_one(Obj obj)
 		}
 		plot_OperandStack[plot_OperandStackPtr] = obj;
 	}
+}
+
+static LIST asir_GetErrorList()
+{
+	int i;
+	NODE n,n0;
+	LIST err;
+	Obj obj;
+
+	for ( i = 0, n0 = 0; i <= plot_OperandStackPtr; i++ )
+		if ( (obj = plot_OperandStack[i]) && (OID(obj) == O_ERR) ) {
+			NEXTNODE(n0,n); BDY(n) = (pointer)obj;
+		}
+	if ( n0 )
+		NEXT(n) = 0;
+	MKLIST(err,n0);
+	return err;
 }
 
 static Obj asir_pop_one() {