=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.19 retrieving revision 1.43 diff -u -p -r1.19 -r1.43 --- OpenXM_contrib2/asir2000/parse/glob.c 2001/06/15 07:56:06 1.19 +++ OpenXM_contrib2/asir2000/parse/glob.c 2004/01/25 11:54:10 1.43 @@ -45,21 +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.18 2001/06/04 02:49:48 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.42 2004/01/07 06:25:42 ohara Exp $ */ #include "ca.h" #include "al.h" #include "parse.h" -#if PARI +#include "ox.h" +#if defined(PARI) #include "genpari.h" #endif -#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) +#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) @@ -76,15 +81,15 @@ extern int GC_free_space_divisor; extern int GC_free_space_numerator; extern FILE *asir_out; -IN asir_infile; -jmp_buf env,debug_env,timer_env; +INFILE asir_infile; +JMP_BUF main_env,debug_env,timer_env,exec_env; int little_endian,debug_mode; char *asir_libdir; 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; @@ -123,29 +128,26 @@ 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 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__)) -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; @@ -163,30 +165,25 @@ void glob_init() { sprintf(asirname,"%s/asir_symtab",asir_libdir); } -void input_init(fp,name) -FILE *fp; -char *name; +void input_init(FILE *fp,char *name) { - asir_infile = (IN)CALLOC(sizeof(struct oIN),1); + asir_infile = (INFILE)CALLOC(sizeof(struct oINFILE),1); asir_infile->name = name; asir_infile->fp = fp; asir_infile->ln = 1; NEXT(asir_infile) = 0; } -void notdef(vl,a,b,c) -VL vl; -Obj a,b,*c; +void notdef(VL vl,Obj a,Obj b,Obj *c) { - *c = 0; error("undefined arithmetic operation."); } -int kernelmode; 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]; @@ -203,22 +200,29 @@ void ExitAsir() { * status = 2 normal termination (end(), quit() etc.) */ -void asir_terminate(status) -int status; +void asir_terminate(int status) { + int t; + if ( read_exec_file ) { - read_exec_file = 0; longjmp(env,status); + t = read_exec_file; + read_exec_file = 0; + if ( t == 1 ) + LONGJMP(main_env,status); + else + LONGJMP(exec_env,status); } else { tty_reset(); -#if MPI +#if defined(MPI) if ( !mpi_myid ) close_allconnections(); mpi_finalize(); #else +#if defined(SIGPIPE) + signal(SIGPIPE,SIG_IGN); +#endif close_allconnections(); #endif - if ( kernelmode ) - fputc(0xff,asir_out); if ( asir_out ) fflush(asir_out); #if FEP @@ -239,29 +243,74 @@ void param_init() { else little_endian = 0; } - + +Obj user_defined_prompt; + void prompt() { - if ( !no_prompt && !do_fep && asir_infile->fp == stdin ) - fprintf(asir_out,"[%d]%c",APVS->n,kernelmode?0xfe:' '); + 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); } -void sprompt(ptr) -char *ptr; +void sprompt(char *ptr) { - sprintf(ptr,"[%d]%c",APVS->n,kernelmode?0xfe:' '); + 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(ac,av) -int ac; -char **av; +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); @@ -280,21 +329,23 @@ 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,"-kernel") ) { - kernelmode = 1; av++; ac--; + } 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) ) { @@ -309,7 +360,7 @@ 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; @@ -339,19 +390,21 @@ void sig_init() { #if !defined(VISUAL) signal(SIGINT,int_handler); #else + void register_ctrlc_handler(); + register_ctrlc_handler(); #endif signal(SIGSEGV,segv_handler); -#if defined SIGFPE +#if defined(SIGFPE) signal(SIGFPE,fpe_handler); #endif -#if defined SIGPIPE +#if defined(SIGPIPE) signal(SIGPIPE,pipe_handler); #endif -#if defined SIGILL +#if defined(SIGILL) signal(SIGILL,ill_handler); #endif @@ -375,8 +428,7 @@ void asir_reset_handler() { signal(SIGINT,old_int); } -void resetenv(s) -char *s; +void resetenv(char *s) { extern FILE *outfile; @@ -392,7 +444,7 @@ char *s; w_noflush_stderr(0); #endif asir_out = stdout; -#if PARI +#if defined(PARI) pari_outfile = stdout; #endif /* restore states */ @@ -401,11 +453,10 @@ char *s; #if !defined(VISUAL) reset_timer(); #endif - longjmp(env,1); + LONGJMP(main_env,1); } -void fatal(n) -int n; +void fatal(int n) { resetenv("return to toplevel"); } @@ -413,8 +464,7 @@ int n; FUNC registered_handler; extern int ox_int_received, critical_when_signal; -void int_handler(sig) -int sig; +void int_handler(int sig) { extern NODE PVSS; @@ -449,8 +499,6 @@ int sig; char c; fprintf(stderr,"interrupt ?(q/t/c/d/u/w/?) "); fflush(stderr); - if ( kernelmode ) - fputc('\0',stderr); buf[0] = '\n'; while ( buf[0] == '\n' ) fgets(buf,BUFSIZ,stdin); @@ -482,8 +530,6 @@ int sig; } if ( debug_mode ) debug_mode = 0; - if ( kernelmode ) - fputc('\0',stderr); restore_handler(); if ( c == 'u' ) { if ( registered_handler ) { @@ -507,8 +553,6 @@ int sig; restore_handler(); return; case 'c': - if ( kernelmode ) - fputc('\0',stderr); restore_handler(); return; break; case 'w': @@ -531,8 +575,7 @@ void restore_handler() { #endif } -void segv_handler(sig) -int sig; +void segv_handler(int sig) { #if defined(SIGSEGV) signal(SIGSEGV,segv_handler); @@ -540,8 +583,7 @@ int sig; #endif } -void ill_handler(sig) -int sig; +void ill_handler(int sig) { #if defined(SIGILL) signal(SIGILL,ill_handler); @@ -549,15 +591,13 @@ int sig; #endif } -void alrm_handler(sig) -int sig; +void alrm_handler(int sig) { fprintf(stderr,"interval timer expired (VTALRM)\n"); - longjmp(timer_env,1); + LONGJMP(timer_env,1); } -void bus_handler(sig) -int sig; +void bus_handler(int sig) { #if defined(SIGBUS) signal(SIGBUS,bus_handler); @@ -565,8 +605,7 @@ int sig; #endif } -void fpe_handler(sig) -int sig; +void fpe_handler(int sig) { #if defined(SIGFPE) signal(SIGFPE,fpe_handler); @@ -574,11 +613,11 @@ int sig; #endif } -void pipe_handler(sig) -int sig; +void pipe_handler(int sig) { #if defined(SIGPIPE) signal(SIGPIPE,pipe_handler); + end_critical(); error("internal error (BROKEN PIPE)"); #endif } @@ -595,8 +634,7 @@ void tty_reset() { extern int evalstatline; -void set_lasterror(s) -char *s; +void set_lasterror(char *s) { strncpy(LastError,s,BUFSIZ); LastError[BUFSIZ-1] = 0; @@ -604,10 +642,9 @@ char *s; SNODE error_snode; -void error(s) -char *s; +void error(char *s) { - SNODE *snp; + SNODE *snp=0; #if !defined(VISUAL) if ( timer_is_set ) @@ -616,7 +653,7 @@ char *s; 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; @@ -633,7 +670,7 @@ char *s; ExitAsir(); } if ( debug_mode ) - longjmp(debug_env,1); + LONGJMP(debug_env,1); if ( CPVS != GPVS ) if ( do_server_in_X11 || isatty(0) ) bp(error_snode); @@ -642,11 +679,31 @@ 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(interval) -int interval; +void set_timer(int interval) { struct itimerval it; @@ -685,10 +742,15 @@ void copyright() { get_asir_version(), get_asir_distribution()); #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 5.3, copyright 1999, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n"); - printf("PARI 2.0.17(beta), copyright (C) 1989-1999,\n"); - printf(" C. Batut, K. Belabas, D. Bernardi, H. Cohen and M. Olivier.\n"); + printf("Copyright 2000-2003, Risa/Asir committers, http://www.openxm.org/.\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"); +#endif + printf("PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n"); + printf(" H. Cohen and M. Olivier.\n"); +#endif }