===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.38
retrieving revision 1.46
diff -u -p -r1.38 -r1.46
--- OpenXM_contrib2/asir2000/parse/glob.c	2003/10/19 02:54:41	1.38
+++ OpenXM_contrib2/asir2000/parse/glob.c	2004/02/09 08:23:30	1.46
@@ -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.37 2003/09/12 01:12:41 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.45 2004/02/05 08:28:53 noro Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -54,7 +54,7 @@
 #if defined(PARI)
 #include "genpari.h"
 #endif
-#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__)
+#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX)
 #include <sgtty.h>
 #endif
 
@@ -134,6 +134,11 @@ 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;
@@ -162,6 +167,12 @@ void glob_init() {
 	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);
 }
 
@@ -179,10 +190,11 @@ void notdef(VL vl,Obj a,Obj b,Obj *c)
 
 int do_asirrc;
 int do_file;
+char *do_filename;
 int do_message;
 int do_fep;
-int no_prompt;
 int read_exec_file;
+int asir_setenv;
 static int buserr_sav;
 static char asir_history[BUFSIZ];
 
@@ -242,10 +254,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);
 }
 
@@ -329,15 +347,16 @@ void process_args(int ac,char **av)
 				asir_terminate(1);
 			}
 			do_file = 1;
+			do_filename = *(av+1);
 			av += 2; ac -= 2;
+		} else if ( !strcmp(*av,"-E") ) {
+			asir_setenv = 1; av++; ac--;
 		} else if ( !strcmp(*av,"-quiet") ) {
-			do_quiet = 1;	av++; ac--;
+			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) ) {
@@ -671,7 +690,28 @@ void error(char *s)
 	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");
+}
+
+#if !defined(VISUAL)
 #include <sys/time.h>
 
 void set_timer(int interval)
@@ -714,7 +754,7 @@ void copyright() {
 #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.1(alpha5) copyright 2001, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n");
+	printf("GC 6.2(alpha6) copyright 1988-2003, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n");
 #if PARI
 #if 0
 	printf("PARI 2.2.4, copyright (C) 2002 The PARI Group.\n");