===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/debug.c,v
retrieving revision 1.1.1.1
retrieving revision 1.8
diff -u -p -r1.1.1.1 -r1.8
--- OpenXM_contrib2/asir2000/parse/debug.c	1999/12/03 07:39:12	1.1.1.1
+++ OpenXM_contrib2/asir2000/parse/debug.c	2001/08/20 09:03:27	1.8
@@ -1,8 +1,58 @@
-/* $OpenXM: OpenXM/src/asir99/parse/debug.c,v 1.2 1999/11/18 05:42:02 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/parse/debug.c,v 1.7 2000/12/22 10:03:31 saito Exp $ 
+*/
 #include "ca.h"
 #include "parse.h"
 #include <ctype.h>
+#if PARI
 #include "genpari.h"
+#endif
 
 void show_stack(VS);
 void change_stack(int,NODE *);
@@ -103,16 +153,12 @@ void debug_init() {
 	for ( n = 0; dckwd[n].id != D_UNKNOWN; n++ );
 	for ( i = 0; i < n; i++ )
 		MKNODE(dckwd[i].names,debcom[i],0);
-#if defined(THINK_C)
-	strcpy(buf,"dbxinit");
-#else
 	home = (char *)getenv("HOME");
 	if ( home )
 		strcpy(buf,home);
 	else
 		buf[0] = 0;
 	strcat(buf,"/.dbxinit");
-#endif
 	if ( (fp = fopen(".dbxinit","r")) || (fp = fopen(buf,"r")) ) {
 		while ( fgets(buf,BUFSIZ,fp) ) {
 			stoarg(buf,&ac,av);
@@ -181,19 +227,19 @@ SNODE f;
 #endif
 	char buf[BUFSIZ];
 	char prompt[BUFSIZ];
-	char *p,*pe;
+	char *p,*pe,*line;
 	NODE tn;
-	extern int kernelmode,do_fep;
+	extern int do_fep;
 	NODE pvss;
 
-#if !defined(VISUAL)
+#if !MPI && !defined(VISUAL)
 	if ( !isatty(fileno(stdin)) && !do_server_in_X11 )
 		if ( do_file )
 			ExitAsir();
 		else
 			return;
 #endif
-#if defined(VISUAL) || defined(THINK_C)
+#if defined(VISUAL)
 	suspend_timer();
 #endif
 	pvss = PVSS; debug_mode = 1;
@@ -201,15 +247,22 @@ SNODE f;
 	if ( do_server_in_X11 )
 #endif
 		show_debug_window(1);
-	sprintf(prompt,"(debug)%c",kernelmode?0xfe:' ');
-	if ( kernelmode )
-		fputc('\0',stderr);
+	sprintf(prompt,"(debug) ");
 	setjmp(debug_env);
 	while ( 1 ) {
-		if ( !do_server_in_X11 )
-			fputs(prompt,stderr);
+#if FEP
+		if ( !do_fep )
+#endif
+			if ( !do_server_in_X11 )
+				fputs(prompt,stderr);
 		bzero(buf,BUFSIZ);
 		while ( 1 ) {
+#if FEP
+			if ( do_fep ) {
+				line = (char *)readline_console(prompt);
+				strcpy(buf,line); free(line);
+			} else
+#endif
 			{
 				int len;
 
@@ -305,13 +358,8 @@ SNODE f;
 		}
 	}
 LAST:
-	if ( kernelmode )
-		fputc('\0',stderr);
 	debug_mode = 0;
-#if defined(THINK_C)
-	show_debug_window(0);
-	resume_timer();
-#elif !defined(VISUAL)
+#if !defined(VISUAL)
 	if ( do_server_in_X11 )
 #endif
 		show_debug_window(0);
@@ -680,7 +728,7 @@ SNODE f;
 		CPVS->usrf->name,ln,CPVS->usrf->f.usrf->fname);
 	targetf = CPVS->usrf; curline = ln;
 	println(0,0,1);
-#if !defined(VISUAL)
+#if !MPI && !defined(VISUAL)
 	if ( do_server_in_X11 || isatty(0) )
 #endif
 		debug(f);
@@ -696,9 +744,6 @@ int l;
 	int i;
 	int ln;
 	FUNC r;
-#if defined(THINK_C)
-	void setDir(short);
-#endif
 
 	if ( !ac )
 		ln = curline;
@@ -716,13 +761,7 @@ int l;
 	}
 	if ( !targetf )
 		return;
-#if defined(THINK_C)
-	setDir(targetf->f.usrf->vol);
-#endif
 	fp = fopen(targetf->f.usrf->fname,"r");
-#if defined(THINK_C)
-	resetDir();
-#endif
 	if ( !fp ) {
 		fprintf(stderr,"\"%s\" not found\n",targetf->name);
 		return;