===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.37
retrieving revision 1.40
diff -u -p -r1.37 -r1.40
--- OpenXM_contrib2/asir2000/parse/glob.c	2003/09/12 01:12:41	1.37
+++ OpenXM_contrib2/asir2000/parse/glob.c	2003/11/11 06:14:08	1.40
@@ -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.36 2003/05/16 07:56:16 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.39 2003/10/20 09:17:52 noro Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -147,6 +147,7 @@ char asirname[BUFSIZ];
 char displayname[BUFSIZ];
 
 int Verbose;
+int do_quiet;
 
 void glob_init() {
 	int i;
@@ -180,7 +181,6 @@ int do_asirrc;
 int do_file;
 int do_message;
 int do_fep;
-int no_prompt;
 int read_exec_file;
 static int buserr_sav;
 static char asir_history[BUFSIZ];
@@ -241,10 +241,16 @@ void param_init() {
 	else
 		little_endian = 0;
 }
-	
+
+Obj user_defined_prompt;
+
 void prompt() {
-	if ( !no_prompt && !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 
+		&& OID(user_defined_prompt)==O_STR) {
+		fprintf(asir_out,BDY((STRING)user_defined_prompt),APVS->n);
+	}
 	fflush(asir_out);
 }
 
@@ -302,6 +308,7 @@ void process_args(int ac,char **av)
 #if !defined(MPI)
 	do_message = 1;
 #endif
+	do_quiet = 0;
 	while ( ac > 0 ) {
 		if ( !strcmp(*av,"-heap") && (ac >= 2) ) {
 			void GC_expand_hp(int);
@@ -320,6 +327,7 @@ void process_args(int ac,char **av)
 		} else if ( !strcmp(*av,"-cpp") && (ac >= 2) ) {
 			strcpy(cppname,*(av+1)); av += 2; ac -= 2;
 		} else if ( !strcmp(*av,"-f") && (ac >= 2) ) {
+			do_quiet = 1;
 			in_fp = fopen(*(av+1),"r");
 			if ( !in_fp ) {
 				fprintf(stderr,"%s does not exist!",*(av+1));
@@ -327,12 +335,12 @@ void process_args(int ac,char **av)
 			}
 			do_file = 1;
 			av += 2; ac -= 2;
+		} else if ( !strcmp(*av,"-quiet") ) {
+			do_quiet = 1; av++; ac--;
 		} else if ( !strcmp(*av,"-norc") ) {
 			do_asirrc = 0; av++; ac--;
 		} else if ( !strcmp(*av,"-nomessage") ) {
 			do_message = 0; av++; ac--;
-		} else if ( !strcmp(*av,"-terse") ) {
-			no_prompt = 0; av++; ac--;
 		} else if ( !strcmp(*av,"-rootdir") && (ac >= 2) ) {
 			set_rootdir(*(av+1)); av += 2; ac -= 2;
 		} else if ( !strcmp(*av,"-maxheap") && (ac >= 2) ) {
@@ -661,6 +669,27 @@ void error(char *s)
 	if ( CPVS != GPVS )
 		if ( do_server_in_X11 || isatty(0) )
 			bp(error_snode);
+	if ( read_exec_file )
+		read_exec_file = 0;
+	resetenv("return to toplevel");
+}
+
+void toplevel(char *s)
+{
+	SNODE *snp=0;
+
+#if !defined(VISUAL)
+	if ( timer_is_set )
+		alrm_handler(SIGVTALRM);
+#endif
+	fprintf(stderr,"%s\n",s);
+	if ( do_file ) {
+		char errbuf[BUFSIZ*5]; /* sufficient to store stack information ? */
+
+		sprintf(errbuf,"%s\n",s);
+		showpos_to_string(errbuf+strlen(errbuf));
+		ExitAsir();
+	}
 	if ( read_exec_file )
 		read_exec_file = 0;
 	resetenv("return to toplevel");