===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.47
retrieving revision 1.72
diff -u -p -r1.47 -r1.72
--- OpenXM_contrib2/asir2000/parse/glob.c	2004/02/25 06:43:52	1.47
+++ OpenXM_contrib2/asir2000/parse/glob.c	2007/11/15 05:39:39	1.72
@@ -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.46 2004/02/09 08:23:30 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.71 2007/09/19 05:56:01 noro 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;
@@ -98,10 +99,12 @@ 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;
+NODE user_int_handler, user_quit_handler;
 
-
 struct oV oVAR[] = {
 	{"x",0,0}, {"y",0,0}, {"z",0,0}, {"u",0,0},
 	{"v",0,0}, {"w",0,0}, {"p",0,0}, {"q",0,0},
@@ -124,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;
@@ -163,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;
@@ -192,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];
@@ -209,20 +214,28 @@ void ExitAsir() {
 /*
  * status = 1 abnormal termination (error() etc.)
  * status = 2 normal termination (end(), quit() etc.)
+ * status = 3 absolute termination
  */
 
 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 ) {
+			if ( !do_terse )
+				fprintf(stderr,"Calling the registered quit callbacks...");
+			for ( n = user_quit_handler; n; n = NEXT(n) )
+				bevalf((FUNC)BDY(n),0);
+			if ( !do_terse )
+				fprintf(stderr, "done.\n");
+		}
 		tty_reset();
 #if defined(MPI)
 		if ( !mpi_myid )
@@ -258,13 +271,14 @@ void param_init() {
 Obj user_defined_prompt;
 
 void prompt() {
-	if ( !do_quiet && !do_fep && asir_infile->fp == stdin )
+	if ( !do_quiet && !do_fep && asir_infile->fp == stdin ) {
 		fprintf(asir_out,"[%d] ",APVS->n);
-	else if ( do_quiet && user_defined_prompt 
+		fflush(asir_out);
+	} else if ( do_quiet && user_defined_prompt 
 		&& OID(user_defined_prompt)==O_STR) {
 		fprintf(asir_out,BDY((STRING)user_defined_prompt),APVS->n);
+		fflush(asir_out);
 	}
-	fflush(asir_out);
 }
 
 void sprompt(char *ptr)
@@ -343,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;
@@ -439,6 +453,8 @@ void asir_reset_handler() {
 	signal(SIGINT,old_int);
 }
 
+extern int I_am_server;
+
 void resetenv(char *s)
 {
 	extern FILE *outfile;
@@ -472,13 +488,14 @@ 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;
+	NODE t;
 
+
 	if ( do_file ) {
 		ExitAsir();
 	}
@@ -519,8 +536,10 @@ 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"); asir_terminate(1);
+						fprintf(stderr,"Bye\n");
+						/* for terminating myself */
+						asir_infile = 0;
+						asir_terminate(1);
 					} else if ( !strncmp(buf,"n",1) ) {
 						restore_handler();
 						return;
@@ -543,18 +562,17 @@ void int_handler(int sig)
 					debug_mode = 0;
 				restore_handler();
 				if ( c == 'u' ) {
-					if ( registered_handler ) {
-						fprintf(stderr,
-							"Calling the registered exception handler...");
-						bevalf(registered_handler,0);
-						fprintf(stderr, "done.\n");
+					if ( user_int_handler ) {
+						if ( !do_terse )
+							fprintf(stderr,
+								"Calling the registered exception callbacks...");
+						for ( t = user_int_handler; t; t = NEXT(t) )
+							bevalf((FUNC)BDY(t),0);
+						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
@@ -567,7 +585,8 @@ void int_handler(int sig)
 				restore_handler();
 				return; break;
 			case 'w':
-				showpos(); break;
+				showpos();
+				break;
 			case '?': 
 				fprintf(stderr, "q:quit t:toplevel c:continue d:debug u:call registered handler w:where\n");
 				break;
@@ -602,6 +621,14 @@ void ill_handler(int sig)
 #endif
 }
 
+#if defined(__DARWIN__)
+#define SIGNAL_FOR_TIMER SIGALRM
+#define ITIMER_TYPE ITIMER_REAL
+#else
+#define SIGNAL_FOR_TIMER SIGVTALRM
+#define ITIMER_TYPE ITIMER_VIRTUAL
+#endif
+
 void alrm_handler(int sig)
 {
 	fprintf(stderr,"interval timer expired (VTALRM)\n");
@@ -652,14 +679,15 @@ void set_lasterror(char *s)
 }
 
 SNODE error_snode;
+int error_in_timer;
 
 void error(char *s)
 {
 	SNODE *snp=0;
 
 #if !defined(VISUAL)
-	if ( timer_is_set )
-		alrm_handler(SIGVTALRM);
+	if ( !error_in_timer && timer_is_set )
+		alrm_handler(SIGNAL_FOR_TIMER);
 #endif
 	fprintf(stderr,"%s\n",s);
 	set_lasterror(s);
@@ -683,10 +711,10 @@ 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;
+	if ( I_am_server )
+		showpos_to_list(&LastStackTrace);	
 	resetenv("return to toplevel");
 }
 
@@ -696,7 +724,7 @@ void toplevel(char *s)
 
 #if !defined(VISUAL)
 	if ( timer_is_set )
-		alrm_handler(SIGVTALRM);
+		alrm_handler(SIGNAL_FOR_TIMER);
 #endif
 	fprintf(stderr,"%s\n",s);
 	if ( do_file ) {
@@ -706,8 +734,6 @@ void toplevel(char *s)
 		showpos_to_string(errbuf+strlen(errbuf));
 		ExitAsir();
 	}
-	if ( read_exec_file )
-		read_exec_file = 0;
 	resetenv("return to toplevel");
 }
 
@@ -722,8 +748,8 @@ void set_timer(int interval)
 	it.it_interval.tv_usec = 0;
 	it.it_value.tv_sec = interval;
 	it.it_value.tv_usec = 0;
-	setitimer(ITIMER_VIRTUAL,&it,0);
-	signal(SIGVTALRM,alrm_handler);
+	setitimer(ITIMER_TYPE,&it,0);
+	signal(SIGNAL_FOR_TIMER,alrm_handler);
 	timer_is_set = 1;
 }
 
@@ -735,8 +761,8 @@ void reset_timer()
 	it.it_interval.tv_usec = 0;
 	it.it_value.tv_sec = 0;
 	it.it_value.tv_usec = 0;
-	setitimer(ITIMER_VIRTUAL,&it,0);
-	signal(SIGVTALRM,SIG_IGN);
+	setitimer(ITIMER_TYPE,&it,0);
+	signal(SIGNAL_FOR_TIMER,SIG_IGN);
 	timer_is_set = 0;
 }
 #endif
@@ -744,14 +770,24 @@ void reset_timer()
 unsigned int get_asir_version();
 char *get_asir_distribution();
 
+char *get_gcversion() 
+{
+#if defined(GC7)
+	return "GC 7.0 copyright 1988-2007, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n";
+#else
+	return "GC 6.5 copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n";
+#endif
+}
+
 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 "";
 }
 
@@ -766,24 +802,25 @@ 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-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";
-	printf(format, get_intervalversion(), get_asir_version(), get_asir_distribution(), get_pariversion());
+	char *scopyright();
+	fputs(scopyright(), stdout);
 }
 
 char *scopyright()
 {
 	static char *notice;
-	char *s1, *s2, *s3;
+	char *s1, *s2, *s3, *s4;
 	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-2007, Risa/Asir committers, http://www.openxm.org/.\n%s%s";
 	if (!notice) {
 		s1 = get_intervalversion();
 		s2 = get_asir_distribution();
-		s3 = get_pariversion();
+		s3 = get_gcversion();
+		s4 = get_pariversion();
 		d  = get_asir_version();
-		len = (strlen(format)-8)+strlen(s1)+strlen(s2)+strlen(s3)+sizeof(int)*3;
+		len = (strlen(format)-8)+strlen(s1)+strlen(s2)+strlen(s3)+strlen(s4)+sizeof(int)*3;
 		notice = MALLOC(len+1);
-		sprintf(notice, format, s1, d, s2, s3);
+		sprintf(notice, format, s1, d, s2, s3, s4);
 	}
 	return notice;
 }