===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.51
retrieving revision 1.57
diff -u -p -r1.51 -r1.57
--- OpenXM_contrib2/asir2000/parse/glob.c	2004/11/24 06:01:04	1.51
+++ OpenXM_contrib2/asir2000/parse/glob.c	2005/07/12 02:37:32	1.57
@@ -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/parse/glob.c,v 1.50 2004/06/30 06:26:39 fujiwara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.56 2005/03/24 23:40:50 takayama Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -83,8 +83,9 @@ extern FILE *asir_out;
 
 INFILE asir_infile;
 JMP_BUF main_env,debug_env,timer_env,exec_env;
-int little_endian,debug_mode;
+int little_endian,debug_mode,no_debug_on_error;
 char *asir_libdir;
+char *asir_contrib_dir;
 char *asir_pager;
 
 NODE usrf,sysf,noargsysf,ubinf,parif;
@@ -101,6 +102,7 @@ Obj LastVal;
 char LastError[BUFSIZ];
 int timer_is_set;
 NODE current_option;
+NODE user_int_handler, user_quit_handler;
 
 struct oV oVAR[] = {
 	{"x",0,0}, {"y",0,0}, {"z",0,0}, {"u",0,0},
@@ -195,7 +197,6 @@ int do_message;
 int do_fep;
 int read_exec_file;
 int asir_setenv;
-int asir_texmacs;
 static int buserr_sav;
 static char asir_history[BUFSIZ];
 
@@ -215,6 +216,7 @@ void ExitAsir() {
 void asir_terminate(int status)
 {
 	int t;
+	NODE n;
 
 	if ( read_exec_file ) {
 		t = read_exec_file;
@@ -224,6 +226,12 @@ void asir_terminate(int status)
 		else
 			LONGJMP(exec_env,status);
 	} else {
+		if ( user_quit_handler ) {
+			fprintf(stderr,"Calling the registered quit callbacks...");
+			for ( n = user_quit_handler; n; n = NEXT(n) )
+				bevalf((FUNC)BDY(n),0);
+			fprintf(stderr, "done.\n");
+		}
 		tty_reset();
 #if defined(MPI)
 		if ( !mpi_myid )
@@ -260,15 +268,11 @@ Obj user_defined_prompt;
 
 void prompt() {
 	if ( !do_quiet && !do_fep && asir_infile->fp == stdin ) {
-		if ( asir_texmacs ) printf("\2\verbatim:\2channel:prompt\5\2latex:\\red");
 		fprintf(asir_out,"[%d] ",APVS->n);
-		if ( asir_texmacs ) printf("\5\5");
 		fflush(asir_out);
 	} else if ( do_quiet && user_defined_prompt 
 		&& OID(user_defined_prompt)==O_STR) {
-		if ( asir_texmacs ) printf("\2\verbatim:\2channel:prompt\5\2latex:\\red");
 		fprintf(asir_out,BDY((STRING)user_defined_prompt),APVS->n);
-		if ( asir_texmacs ) printf("\5\5");
 		fflush(asir_out);
 	}
 }
@@ -355,9 +359,6 @@ void process_args(int ac,char **av)
 			do_file = 1;
 			do_filename = *(av+1);
 			av += 2; ac -= 2;
-		} else if ( !strcmp(*av,"-texmacs") ) {
-			asir_texmacs = 1; av++; ac--;
-			*stderr = *stdout;
 		} else if ( !strcmp(*av,"-E") ) {
 			asir_setenv = 1; av++; ac--;
 		} else if ( !strcmp(*av,"-quiet") ) {
@@ -451,10 +452,8 @@ void asir_reset_handler() {
 void resetenv(char *s)
 {
 	extern FILE *outfile;
-	FILE *stream = asir_texmacs ? stdout : stderr;
 
-	if ( asir_texmacs ) { printf("\2verbatim:"); fflush(stdout); }
-	fprintf(stream,"%s\n",s);
+	fprintf(stderr,"%s\n",s);
 	while ( NEXT(asir_infile) )
 		closecurrentinput();
 	resetpvs();
@@ -475,7 +474,6 @@ void resetenv(char *s)
 #if !defined(VISUAL)
 	reset_timer();
 #endif
-	if ( asir_texmacs ) { putchar('\5'); fflush(stdout); }
 	LONGJMP(main_env,1);
 }
 
@@ -484,16 +482,13 @@ void fatal(int n)
 	resetenv("return to toplevel");
 }
 
-FUNC registered_handler;
 extern int ox_int_received, critical_when_signal;
 
 void int_handler(int sig)
 {
 	extern NODE PVSS;
-	FILE *stream;
+	NODE t;
 
-	if ( asir_texmacs ) stream = stdout;
-	else stream = stderr;
 
 	if ( do_file ) {
 		ExitAsir();
@@ -521,35 +516,22 @@ void int_handler(int sig)
 #endif
 		getchar();
 #endif
-	if ( asir_texmacs ) {
-		printf("\2\verbatim:\2channel:prompt\5\2verbatim:interrupt>\5\5"); fflush(stdout);
-	}
 	while ( 1 ) {
 		char buf[BUFSIZ];
 		char c;
 
-		if ( asir_texmacs ) { printf("\2verbatim:"); fflush(stdout); }
-		fprintf(stream,"interrupt ?(q/t/c/d/u/w/?) "); fflush(stream);
-		if ( asir_texmacs ) { putchar('\5'); fflush(stdout); }
+		fprintf(stderr,"interrupt ?(q/t/c/d/u/w/?) "); fflush(stderr);
 		buf[0] = '\n';
 		while ( buf[0] == '\n' )
 			fgets(buf,BUFSIZ,stdin);
 		switch ( c = buf[0] ) {
 			case 'q':
 				while ( 1 ) {
-					if ( asir_texmacs ) {
-						printf("\2verbatim:"); fflush(stdout);
-					}
-					fprintf(stream,"Abort this session? (y or n) "); fflush(stream);
-					if ( asir_texmacs ) { putchar('\5'); fflush(stdout); }
+					fprintf(stderr,"Abort this session? (y or n) "); fflush(stderr);
 					fgets(buf,BUFSIZ,stdin);
 					if ( !strncmp(buf,"y",1) ) {
 						read_exec_file = 0;
-						if ( asir_texmacs ) { 
-							printf("\2verbatim:"); fflush(stdout); 
-						}
-						fprintf(stream,"Bye\n");
-						if ( asir_texmacs ) { putchar('\5'); fflush(stdout); }
+						fprintf(stderr,"Bye\n");
 						asir_terminate(1);
 					} else if ( !strncmp(buf,"n",1) ) {
 						restore_handler();
@@ -560,11 +542,7 @@ void int_handler(int sig)
 			case 't':
 			case 'u':
 				while ( 1 ) {
-					if ( asir_texmacs ) {
-						printf("\2verbatim:"); fflush(stdout);
-					}
-					fprintf(stream,"Abort this computation? (y or n) "); fflush(stream);
-					if ( asir_texmacs ) { putchar('\5'); fflush(stdout); }
+					fprintf(stderr,"Abort this computation? (y or n) "); fflush(stderr);
 					fgets(buf,BUFSIZ,stdin);
 					if ( !strncmp(buf,"y",1) )
 						break;
@@ -577,15 +555,12 @@ void int_handler(int sig)
 					debug_mode = 0;
 				restore_handler();
 				if ( c == 'u' ) {
-					if ( registered_handler ) {
-						if ( asir_texmacs ) {
-							printf("\2verbatim:"); fflush(stdout);
-						}
-						fprintf(stream,
-							"Calling the registered exception handler...");
-						bevalf(registered_handler,0);
-						fprintf(stream, "done.\n");
-						if ( asir_texmacs ) { putchar('\5'); fflush(stdout); }
+					if ( user_int_handler ) {
+						fprintf(stderr,
+							"Calling the registered exception callbacks...");
+						for ( t = user_int_handler; t; t = NEXT(t) )
+							bevalf((FUNC)BDY(t),0);
+						fprintf(stderr, "done.\n");
 					}
 				}
 				if ( read_exec_file ) {
@@ -608,11 +583,7 @@ void int_handler(int sig)
 				showpos();
 				break;
 			case '?': 
-				if ( asir_texmacs ) {
-					printf("\2verbatim:"); fflush(stdout);
-				}
-				fprintf(stream, "q:quit t:toplevel c:continue d:debug u:call registered handler w:where\n");
-				if ( asir_texmacs ) { putchar('\5'); fflush(stdout); }
+				fprintf(stderr, "q:quit t:toplevel c:continue d:debug u:call registered handler w:where\n");
 				break;
 			default:
 				break;
@@ -727,7 +698,7 @@ void error(char *s)
 	if ( debug_mode )
 		LONGJMP(debug_env,1);
 	if ( CPVS != GPVS )
-		if ( do_server_in_X11 || isatty(0) )
+		if ( !no_debug_on_error && (do_server_in_X11 || isatty(0)) )
 			bp(error_snode);
 	if ( read_exec_file )
 		read_exec_file = 0;
@@ -810,10 +781,8 @@ char *get_intervalversion()
 
 void copyright()
 {
-	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2004, Risa/Asir committers, http://www.openxm.org/.\nGC 6.2(alpha6) copyright 1988-2003, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
-	if ( asir_texmacs ) printf("\2verbatim:");
+	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2005, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
 	printf(format, get_intervalversion(), get_asir_version(), get_asir_distribution(), get_pariversion());
-	if ( asir_texmacs ) putchar('\5');
 }
 
 char *scopyright()
@@ -821,7 +790,7 @@ char *scopyright()
 	static char *notice;
 	char *s1, *s2, *s3;
 	int d, len;
-	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2003, Risa/Asir committers, http://www.openxm.org/.\nGC 6.2(alpha6) copyright 1988-2003, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
+	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2005, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
 	if (!notice) {
 		s1 = get_intervalversion();
 		s2 = get_asir_distribution();