===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.40
retrieving revision 1.47
diff -u -p -r1.40 -r1.47
--- OpenXM_contrib2/asir2000/parse/glob.c	2003/11/11 06:14:08	1.40
+++ OpenXM_contrib2/asir2000/parse/glob.c	2004/02/25 06:43:52	1.47
@@ -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.39 2003/10/20 09:17:52 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.46 2004/02/09 08:23:30 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,9 +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 read_exec_file;
+int asir_setenv;
 static int buserr_sav;
 static char asir_history[BUFSIZ];
 
@@ -334,7 +347,10 @@ 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--;
 		} else if ( !strcmp(*av,"-norc") ) {
@@ -728,24 +744,46 @@ 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.1(alpha5) copyright 2001, 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 "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
-	printf("PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n");
-	printf("   H. Cohen and M. Olivier.\n");
+	return "PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n   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-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()
+{
+	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-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";
+	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;
+}