=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.27 retrieving revision 1.51 diff -u -p -r1.27 -r1.51 --- OpenXM_contrib2/asir2000/parse/glob.c 2002/07/26 00:33:03 1.27 +++ OpenXM_contrib2/asir2000/parse/glob.c 2004/11/24 06:01:04 1.51 @@ -45,22 +45,26 @@ * 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.26 2001/12/25 02:39:06 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.50 2004/06/30 06:26:39 fujiwara Exp $ */ #include "ca.h" #include "al.h" #include "parse.h" #include "ox.h" -#if PARI +#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 #if defined(VISUAL) #include #include +#else +#include +#include +#include #endif #if defined(SYSV) && !defined(_IBMR2) @@ -85,7 +89,7 @@ char *asir_pager; NODE usrf,sysf,noargsysf,ubinf,parif; NODE ONENODE; -int main_parser, ox_do_copy, ox_do_count, ox_count_length; +int main_parser, allow_create_var, ox_do_copy, ox_do_count, ox_count_length; int ox_file_io, ox_need_conv; char *ox_copy_bptr; char *parse_strp; @@ -96,8 +100,8 @@ int do_server_in_X11; Obj LastVal; char LastError[BUFSIZ]; int timer_is_set; +NODE current_option; - 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,29 +128,31 @@ struct oVS oGPVS,oAPVS,oEPVS; VS GPVS = &oGPVS; VS APVS = &oAPVS; VS EPVS = &oEPVS; -VS CPVS; +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; -#if defined(__SVR4) && defined(sun) -char cppname[BUFSIZ] = "/usr/ccs/lib/cpp "; -#else -#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__) -char cppname[BUFSIZ] = "/usr/bin/cpp "; -#else #if defined(VISUAL) char cppname[BUFSIZ] = "c:\\asir\\stdlib\\cpp "; #else char cppname[BUFSIZ] = "/lib/cpp "; #endif -#endif -#endif char asirname[BUFSIZ]; char displayname[BUFSIZ]; int Verbose; +int do_quiet; void glob_init() { int i; @@ -161,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); } @@ -178,10 +190,12 @@ 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; +int asir_texmacs; static int buserr_sav; static char asir_history[BUFSIZ]; @@ -211,7 +225,7 @@ void asir_terminate(int status) LONGJMP(exec_env,status); } else { tty_reset(); -#if MPI +#if defined(MPI) if ( !mpi_myid ) close_allconnections(); mpi_finalize(); @@ -241,11 +255,22 @@ 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 ) { + if ( asir_texmacs ) printf("\2\verbatim:\2channel:prompt\5\2latex:\\red"); fprintf(asir_out,"[%d] ",APVS->n); - fflush(asir_out); + if ( asir_texmacs ) printf("\5\5"); + fflush(asir_out); + } else if ( do_quiet && user_defined_prompt + && OID(user_defined_prompt)==O_STR) { + if ( asir_texmacs ) printf("\2\verbatim:\2channel:prompt\5\2latex:\\red"); + fprintf(asir_out,BDY((STRING)user_defined_prompt),APVS->n); + if ( asir_texmacs ) printf("\5\5"); + fflush(asir_out); + } } void sprompt(char *ptr) @@ -253,14 +278,56 @@ void sprompt(char *ptr) sprintf(ptr,"[%d] ",APVS->n); } +#if !defined(VISUAL) +static int which(char *prog, char *path, char *buf, size_t size) +{ + char *tok; + char delim[] = ":"; + char *path2 = malloc(strlen(path)+1); + char *name = malloc(size); + int proglen = strlen(prog)+3; /* "/" + prog + " \0" */ + + if (!name || !path2) { + return 0; + } + strcpy(path2, path); + tok = strtok(path2, delim); + while (tok != NULL) { + if (size >= strlen(tok)) { + sprintf(name, "%s/%s", tok, prog); + if (access(name, X_OK&R_OK) == 0) { + strcpy(buf, name); + strcat(buf, " "); + free(path2); free(name); + return 1; + } + tok = strtok(NULL, delim); + } + } + free(path2); free(name); + return 0; +} +#endif + +void cppname_init() +{ +#if !defined(VISUAL) + if (access(cppname, X_OK&R_OK) != 0) { + which("cpp", "/lib:/usr/ccs/lib:/usr/bin", cppname, BUFSIZ) || + which("cpp", getenv("PATH"), cppname, BUFSIZ); + } +#endif +} + FILE *in_fp; void process_args(int ac,char **av) { do_asirrc = 1; -#if !MPI +#if !defined(MPI) do_message = 1; #endif + do_quiet = 0; while ( ac > 0 ) { if ( !strcmp(*av,"-heap") && (ac >= 2) ) { void GC_expand_hp(int); @@ -279,19 +346,26 @@ 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)); asir_terminate(1); } do_file = 1; + do_filename = *(av+1); av += 2; ac -= 2; + } else if ( !strcmp(*av,"-texmacs") ) { + asir_texmacs = 1; av++; ac--; + *stderr = *stdout; + } 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") ) { 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) ) { @@ -306,7 +380,7 @@ void process_args(int ac,char **av) } else if ( !strcmp(*av,"-fep") ) { do_fep = 1; av++; ac--; #endif -#if PARI +#if defined(PARI) } else if ( !strcmp(*av,"-paristack") ) { extern int paristack; @@ -377,8 +451,10 @@ void asir_reset_handler() { void resetenv(char *s) { extern FILE *outfile; + FILE *stream = asir_texmacs ? stdout : stderr; - fprintf(stderr,"%s\n",s); + if ( asir_texmacs ) { printf("\2verbatim:"); fflush(stdout); } + fprintf(stream,"%s\n",s); while ( NEXT(asir_infile) ) closecurrentinput(); resetpvs(); @@ -390,7 +466,7 @@ void resetenv(char *s) w_noflush_stderr(0); #endif asir_out = stdout; -#if PARI +#if defined(PARI) pari_outfile = stdout; #endif /* restore states */ @@ -399,6 +475,7 @@ void resetenv(char *s) #if !defined(VISUAL) reset_timer(); #endif + if ( asir_texmacs ) { putchar('\5'); fflush(stdout); } LONGJMP(main_env,1); } @@ -413,7 +490,11 @@ extern int ox_int_received, critical_when_signal; void int_handler(int sig) { extern NODE PVSS; + FILE *stream; + if ( asir_texmacs ) stream = stdout; + else stream = stderr; + if ( do_file ) { ExitAsir(); } @@ -440,22 +521,36 @@ void int_handler(int sig) #endif getchar(); #endif + if ( asir_texmacs ) { + printf("\2\verbatim:\2channel:prompt\5\2verbatim:interrupt>\5\5"); fflush(stdout); + } while ( 1 ) { char buf[BUFSIZ]; char c; - fprintf(stderr,"interrupt ?(q/t/c/d/u/w/?) "); fflush(stderr); + if ( asir_texmacs ) { printf("\2verbatim:"); fflush(stdout); } + fprintf(stream,"interrupt ?(q/t/c/d/u/w/?) "); fflush(stream); + if ( asir_texmacs ) { putchar('\5'); fflush(stdout); } buf[0] = '\n'; while ( buf[0] == '\n' ) fgets(buf,BUFSIZ,stdin); switch ( c = buf[0] ) { case 'q': while ( 1 ) { - fprintf(stderr,"Abort this session? (y or n) "); fflush(stderr); + if ( asir_texmacs ) { + printf("\2verbatim:"); fflush(stdout); + } + fprintf(stream,"Abort this session? (y or n) "); fflush(stream); + if ( asir_texmacs ) { putchar('\5'); fflush(stdout); } fgets(buf,BUFSIZ,stdin); if ( !strncmp(buf,"y",1) ) { read_exec_file = 0; - fprintf(stderr,"Bye\n"); asir_terminate(1); + if ( asir_texmacs ) { + printf("\2verbatim:"); fflush(stdout); + } + fprintf(stream,"Bye\n"); + if ( asir_texmacs ) { putchar('\5'); fflush(stdout); } + asir_terminate(1); } else if ( !strncmp(buf,"n",1) ) { restore_handler(); return; @@ -465,7 +560,11 @@ void int_handler(int sig) case 't': case 'u': while ( 1 ) { - fprintf(stderr,"Abort this computation? (y or n) "); fflush(stderr); + if ( asir_texmacs ) { + printf("\2verbatim:"); fflush(stdout); + } + fprintf(stream,"Abort this computation? (y or n) "); fflush(stream); + if ( asir_texmacs ) { putchar('\5'); fflush(stdout); } fgets(buf,BUFSIZ,stdin); if ( !strncmp(buf,"y",1) ) break; @@ -479,10 +578,14 @@ void int_handler(int sig) restore_handler(); if ( c == 'u' ) { if ( registered_handler ) { - fprintf(stderr, + if ( asir_texmacs ) { + printf("\2verbatim:"); fflush(stdout); + } + fprintf(stream, "Calling the registered exception handler..."); bevalf(registered_handler,0); - fprintf(stderr, "done.\n"); + fprintf(stream, "done.\n"); + if ( asir_texmacs ) { putchar('\5'); fflush(stdout); } } } if ( read_exec_file ) { @@ -502,9 +605,14 @@ 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"); + if ( asir_texmacs ) { + printf("\2verbatim:"); fflush(stdout); + } + fprintf(stream, "q:quit t:toplevel c:continue d:debug u:call registered handler w:where\n"); + if ( asir_texmacs ) { putchar('\5'); fflush(stdout); } break; default: break; @@ -587,19 +695,20 @@ void set_lasterror(char *s) } SNODE error_snode; +int error_in_timer; void error(char *s) { - SNODE *snp; + 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); set_lasterror(s); if ( CPVS != GPVS ) { - if ( CPVS->usrf && CPVS->usrf && CPVS->usrf->f.usrf ) + if ( CPVS && CPVS->usrf && CPVS->usrf->f.usrf ) searchsn(&BDY(CPVS->usrf->f.usrf),evalstatline,&snp); if ( snp ) error_snode = *snp; @@ -625,7 +734,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 void set_timer(int interval) @@ -658,19 +788,48 @@ void reset_timer() unsigned int get_asir_version(); char *get_asir_distribution(); -void copyright() { +char *get_pariversion() +{ +#if PARI +#if 0 + 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 + 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) - printf("This is Risa/Asir + Interval Arithmetic, Version %d (%s Distribution).\n", - get_asir_version(), get_asir_distribution()); + return " + Interval Arithmetic"; #else - printf("This is Risa/Asir, Version %d (%s Distribution).\n", - get_asir_version(), get_asir_distribution()); + return ""; #endif - printf("Copyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\n"); - printf("Copyright 2000,2001, 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("PARI 2.2.1(alpha), copyright (C) 2000,\n"); - printf(" C. Batut, K. Belabas, D. Bernardi, H. Cohen and M. Olivier.\n"); } +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-2004, 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 ( asir_texmacs ) printf("\2verbatim:"); + printf(format, get_intervalversion(), get_asir_version(), get_asir_distribution(), get_pariversion()); + if ( asir_texmacs ) putchar('\5'); +} +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; +}