=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.40 retrieving revision 1.45 diff -u -p -r1.40 -r1.45 --- OpenXM_contrib2/asir2000/parse/glob.c 2003/11/11 06:14:08 1.40 +++ OpenXM_contrib2/asir2000/parse/glob.c 2004/02/05 08:28:53 1.45 @@ -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.44 2004/02/04 07:42:07 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 #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") ) { @@ -738,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");