===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.43
retrieving revision 1.66
diff -u -p -r1.43 -r1.66
--- OpenXM_contrib2/asir2000/parse/glob.c	2004/01/25 11:54:10	1.43
+++ OpenXM_contrib2/asir2000/parse/glob.c	2006/09/25 04:57:54	1.66
@@ -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.42 2004/01/07 06:25:42 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.65 2006/02/24 01:15:57 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,16 +127,22 @@ 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;
 MODULE CUR_MODULE;
 char *CUR_FUNC;
 
+struct oSYMBOL oGrlex, oGlex, oLex;
+SYMBOL Symbol_grlex = &oGrlex;
+SYMBOL Symbol_glex = &oGlex;
+SYMBOL Symbol_lex = &oLex;;
+
 struct oF oF_TRUE,oF_FALSE;
 F F_TRUE = &oF_TRUE;  
 F F_FALSE = &oF_FALSE;
@@ -147,7 +156,7 @@ char asirname[BUFSIZ];
 char displayname[BUFSIZ];
 
 int Verbose;
-int do_quiet;
+int do_quiet, do_batch;
 
 void glob_init() {
 	int i;
@@ -158,10 +167,17 @@ 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;
 	OID(F_FALSE)=O_F; FOP(F_FALSE)=AL_FALSE; F_FALSE->arg.dummy = 0;
+	OID(Symbol_grlex) = O_SYMBOL; Symbol_grlex->name = "@grlex"; 
+	Symbol_grlex->value = 0;
+	OID(Symbol_glex) = O_SYMBOL; Symbol_glex->name = "@glex"; 
+	Symbol_glex->value = 1;
+	OID(Symbol_lex) = O_SYMBOL; Symbol_lex->name = "@lex"; 
+	Symbol_lex->value = 2;
 	sprintf(asirname,"%s/asir_symtab",asir_libdir);
 }
 
@@ -181,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];
@@ -198,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 )
@@ -247,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)
@@ -332,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;
@@ -366,6 +391,8 @@ void process_args(int ac,char **av)
 
 			paristack = atoi(*(av+1)); av += 2; ac -= 2;
 #endif
+		} else if ( !strcmp(*av,"-batch") ) {
+			do_batch = 1; av++; ac--;
 		} else {
 			fprintf(stderr,"%s : unknown option.\n",*av);
 			asir_terminate(1);
@@ -428,6 +455,8 @@ void asir_reset_handler() {
 	signal(SIGINT,old_int);
 }
 
+extern int I_am_server;
+
 void resetenv(char *s)
 {
 	extern FILE *outfile;
@@ -461,13 +490,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();
 	}
@@ -508,8 +538,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;
@@ -532,18 +564,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
@@ -556,7 +587,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;
@@ -641,13 +673,14 @@ 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 )
+	if ( !error_in_timer && timer_is_set )
 		alrm_handler(SIGVTALRM);
 #endif
 	fprintf(stderr,"%s\n",s);
@@ -672,10 +705,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");
 }
 
@@ -695,8 +728,6 @@ void toplevel(char *s)
 		showpos_to_string(errbuf+strlen(errbuf));
 		ExitAsir();
 	}
-	if ( read_exec_file )
-		read_exec_file = 0;
 	resetenv("return to toplevel");
 }
 
@@ -733,24 +764,47 @@ void reset_timer()
 unsigned int get_asir_version();
 char *get_asir_distribution();
 
-void copyright() {
-#if defined(INTERVAL)
-	printf("This is Risa/Asir + Interval Arithmetic, Version %d (%s Distribution).\n",
-		get_asir_version(), get_asir_distribution());
-#else
-	printf("This is Risa/Asir, Version %d (%s Distribution).\n",
-		get_asir_version(), get_asir_distribution());
-#endif
-	printf("Copyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\n");
-	printf("Copyright 2000-2003, Risa/Asir committers, http://www.openxm.org/.\n");
-	printf("GC 6.2(alpha6) copyright 1988-2003, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n");
+char *get_pariversion() 
+{
 #if PARI
 #if 0
-	printf("PARI 2.2.4, copyright (C) 2002 The PARI Group.\n");
+	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
-	printf("PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n");
-	printf("   H. Cohen and M. Olivier.\n");
 #endif
+	return "";
 }
 
+char *get_intervalversion()
+{
+#if defined(INTERVAL)
+	return " + Interval Arithmetic";
+#else
+	return "";
+#endif
+}
 
+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-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());
+}
+
+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-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();
+		s3 = get_pariversion();
+		d  = get_asir_version();
+		len = (strlen(format)-8)+strlen(s1)+strlen(s2)+strlen(s3)+sizeof(int)*3;
+		notice = MALLOC(len+1);
+		sprintf(notice, format, s1, d, s2, s3);
+	}
+	return notice;
+}