===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.57
retrieving revision 1.65
diff -u -p -r1.57 -r1.65
--- OpenXM_contrib2/asir2000/parse/glob.c	2005/07/12 02:37:32	1.57
+++ OpenXM_contrib2/asir2000/parse/glob.c	2006/02/24 01:15:57	1.65
@@ -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.56 2005/03/24 23:40:50 takayama Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.64 2006/02/10 23:56:44 fujiwara Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -99,6 +99,7 @@ FUNC parse_targetf;
 FILE *ox_istream,*ox_ostream;
 int do_server_in_X11;
 Obj LastVal;
+LIST LastStackTrace;
 char LastError[BUFSIZ];
 int timer_is_set;
 NODE current_option;
@@ -126,10 +127,11 @@ struct oVL oVLIST[52];
 VL CO = oVLIST;
 VL ALG;
 
-struct oVS oGPVS,oAPVS,oEPVS;
+struct oVS oGPVS,oAPVS,oEPVS,oPPVS;
 VS GPVS = &oGPVS;
 VS APVS = &oAPVS;
 VS EPVS = &oEPVS;
+VS PPVS = &oPPVS;
 VS CPVS,MPVS;
 
 NODE MODULE_LIST;
@@ -165,6 +167,7 @@ void glob_init() {
 	VR(&oVLIST[i]) = &oVAR[i]; NEXT(&oVLIST[i]) = 0;
 	reallocarray((char **)&GPVS->va,(int *)&GPVS->asize,(int *)&GPVS->n,(int)sizeof(struct oPV));
 	reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV));
+	reallocarray((char **)&PPVS->va,(int *)&PPVS->asize,(int *)&PPVS->n,(int)sizeof(struct oPV));
 	CPVS = GPVS;
 	MKNODE(ONENODE,mkfnode(1,I_FORMULA,ONE),0);
 	OID(F_TRUE)=O_F; FOP(F_TRUE)=AL_TRUE; F_TRUE->arg.dummy = 0;
@@ -194,8 +197,8 @@ int do_asirrc;
 int do_file;
 char *do_filename;
 int do_message;
+int do_terse;
 int do_fep;
-int read_exec_file;
 int asir_setenv;
 static int buserr_sav;
 static char asir_history[BUFSIZ];
@@ -211,6 +214,7 @@ void ExitAsir() {
 /*
  * status = 1 abnormal termination (error() etc.)
  * status = 2 normal termination (end(), quit() etc.)
+ * status = 3 absolute termination
  */
 
 void asir_terminate(int status)
@@ -218,19 +222,19 @@ void asir_terminate(int status)
 	int t;
 	NODE n;
 
-	if ( read_exec_file ) {
-		t = read_exec_file;
-		read_exec_file = 0;
-		if ( t == 1 )
-			LONGJMP(main_env,status);
-		else
-			LONGJMP(exec_env,status);
-	} else {
+	/* called from engine in Windows */
+	if ( status == 3 ) asir_infile = 0;
+
+	if ( asir_infile && asir_infile->ready_for_longjmp )
+		LONGJMP(asir_infile->jmpbuf,status);
+	else {
 		if ( user_quit_handler ) {
-			fprintf(stderr,"Calling the registered quit callbacks...");
+			if ( !do_terse )
+				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");
+			if ( !do_terse )
+				fprintf(stderr, "done.\n");
 		}
 		tty_reset();
 #if defined(MPI)
@@ -353,7 +357,7 @@ void process_args(int ac,char **av)
 			do_quiet = 1;
 			in_fp = fopen(*(av+1),"r");
 			if ( !in_fp ) {
-				fprintf(stderr,"%s does not exist!",*(av+1));
+				fprintf(stderr,"%s does not exist!\n",*(av+1));
 				asir_terminate(1);
 			}
 			do_file = 1;
@@ -449,6 +453,8 @@ void asir_reset_handler() {
 	signal(SIGINT,old_int);
 }
 
+extern int I_am_server;
+
 void resetenv(char *s)
 {
 	extern FILE *outfile;
@@ -530,8 +536,9 @@ void int_handler(int sig)
 					fprintf(stderr,"Abort this session? (y or n) "); fflush(stderr);
 					fgets(buf,BUFSIZ,stdin);
 					if ( !strncmp(buf,"y",1) ) {
-						read_exec_file = 0;
 						fprintf(stderr,"Bye\n");
+						/* for terminating myself */
+						asir_infile = 0;
 						asir_terminate(1);
 					} else if ( !strncmp(buf,"n",1) ) {
 						restore_handler();
@@ -556,18 +563,16 @@ void int_handler(int sig)
 				restore_handler();
 				if ( c == 'u' ) {
 					if ( user_int_handler ) {
-						fprintf(stderr,
-							"Calling the registered exception callbacks...");
+						if ( !do_terse )
+							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 ( !do_terse )
+							fprintf(stderr, "done.\n");
 					}
 				}
-				if ( read_exec_file ) {
-					read_exec_file = 0;
-					resetenv("initialization aborted; return to toplevel");
-				} else
-					resetenv("return to toplevel");
+				resetenv("return to toplevel");
 				break;
 			case 'd':
 #if 0
@@ -700,8 +705,8 @@ void error(char *s)
 	if ( CPVS != GPVS )
 		if ( !no_debug_on_error && (do_server_in_X11 || isatty(0)) )
 			bp(error_snode);
-	if ( read_exec_file )
-		read_exec_file = 0;
+	if ( I_am_server )
+		showpos_to_list(&LastStackTrace);	
 	resetenv("return to toplevel");
 }
 
@@ -721,8 +726,6 @@ void toplevel(char *s)
 		showpos_to_string(errbuf+strlen(errbuf));
 		ExitAsir();
 	}
-	if ( read_exec_file )
-		read_exec_file = 0;
 	resetenv("return to toplevel");
 }
 
@@ -763,10 +766,11 @@ char *get_pariversion() 
 {
 #if PARI
 #if 0
-	return "PARI 2.2.4, copyright (C) 2002 The PARI Group.\nPARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n   H. Cohen and M. Olivier.\n";
-#endif
+	return PARIVERSION", Copyright (C) 2000-2005 The PARI Group.\n";
+#else
 	return "PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n   H. Cohen and M. Olivier.\n";
 #endif
+#endif
 	return "";
 }
 
@@ -781,7 +785,7 @@ 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-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";
+	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2006, 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());
 }
 
@@ -790,7 +794,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-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";
+	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2006, 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();