=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.8 retrieving revision 1.32 diff -u -p -r1.8 -r1.32 --- OpenXM_contrib2/asir2000/parse/glob.c 2000/08/21 08:31:46 1.8 +++ OpenXM_contrib2/asir2000/parse/glob.c 2003/03/07 03:12:31 1.32 @@ -23,7 +23,7 @@ * shall be made on your publication or presentation in any form of the * results obtained by use of the SOFTWARE. * (4) In the event that you modify the SOFTWARE, you shall notify FLL by - * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification * for such modification or the source code of the modified part of the * SOFTWARE. * @@ -45,53 +45,47 @@ * 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.7 2000/07/13 05:09:03 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.31 2003/02/14 22:29:18 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(THINK_C) && !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) +#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) #include -#else -#if defined(THINK_C) && !defined(__MWERKS__) -#include #endif -#endif #if defined(VISUAL) #include #include #endif -#if defined(SYSV) +#if defined(SYSV) && !defined(_IBMR2) #include #endif -#if defined(THINK_C) || defined(VISUAL) #if defined(VISUAL) #define HISTORY asir_history -#else -#define HISTORY "history" #endif -#endif + #define MAXHIST 100 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; @@ -101,7 +95,9 @@ FILE *ox_istream,*ox_ostream; int do_server_in_X11; Obj LastVal; char LastError[BUFSIZ]; +int timer_is_set; + 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}, @@ -137,7 +133,7 @@ F F_FALSE = &oF_FALSE; #if defined(__SVR4) && defined(sun) char cppname[BUFSIZ] = "/usr/ccs/lib/cpp "; #else -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__) char cppname[BUFSIZ] = "/usr/bin/cpp "; #else #if defined(VISUAL) @@ -166,29 +162,20 @@ void glob_init() { 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; sprintf(asirname,"%s/asir_symtab",asir_libdir); -#if defined(THINK_C) - initVol(); -#endif } -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; int do_message; @@ -211,33 +198,36 @@ 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 INET && !defined(THINK_C) #if MPI if ( !mpi_myid ) close_allconnections(); mpi_finalize(); #else +#if defined(SIGPIPE) + signal(SIGPIPE,SIG_IGN); +#endif close_allconnections(); #endif -#endif - if ( kernelmode ) - fputc(0xff,asir_out); if ( asir_out ) fflush(asir_out); -#if defined(THINK_C) && !defined(__MWERKS__) - *((int *)0x8) = buserr_sav; - while ( NEXT(asir_infile) ) - closecurrentinput(); - console_options.pause_atexit = 0; - resetDir(); - write_hist(HISTORY); +#if FEP + if ( do_fep ) { + stifle_history(MAXHIST); + write_history(asir_history); + } #endif ExitAsir(); } @@ -246,45 +236,6 @@ int status; void param_init() { unsigned int et = 0xff; extern int paristack; -#if defined(THINK_C) - char name[BUFSIZ]; - int c; - int val; - FILE *fp; - int stacksize; - -#include - GC_free_space_divisor = 4; stacksize = 0x40000; - if ( fp = fopen("params","r") ) { - while ( 1 ) { - c = fgetc(fp); - if ( c == EOF ) - break; - else - ungetc(c,fp); - fscanf(fp,"%s %d",name,&val); - if ( !strcmp(name,"stacksize") ) - stacksize = val; - else if ( !strcmp(name,"adj") ) - GC_free_space_divisor = val; -#if PARI - else if ( !strcmp(name,"paristack") ) - paristack = val; -#endif - } - fclose(fp); - } -#if defined(__MWERKS__) - { - Ptr al; - al = LMGetApplLimit(); - LMSetApplLimit(al-stacksize); - } -#else - ApplLimit = (Ptr)((char *)ApplLimit-stacksize); - console_options.title = "\pAsir"; -#endif -#endif if ( *((char *)&et) ) little_endian = 1; else @@ -293,31 +244,19 @@ void param_init() { void prompt() { if ( !no_prompt && !do_fep && asir_infile->fp == stdin ) - fprintf(asir_out,"[%d]%c",APVS->n,kernelmode?0xfe:' '); + fprintf(asir_out,"[%d] ",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 0 && !defined(THINK_C) && !defined(VISUAL) && !defined(_PA_RISC1_1) -static struct tchars tc; -static char oldeof; -struct winsize wsize; -int ttywidth; -char *upperbuf,*lowerbuf; -#endif - FILE *in_fp; -void process_args(ac,av) -int ac; -char **av; +void process_args(int ac,char **av) { -#if !defined(THINK_C) do_asirrc = 1; #if !MPI do_message = 1; @@ -347,14 +286,14 @@ char **av; } do_file = 1; av += 2; ac -= 2; - } else if ( !strcmp(*av,"-kernel") ) { - kernelmode = 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) ) { void GC_set_max_heap_size(int); @@ -363,7 +302,11 @@ char **av; } else if ( !strcmp(*av,"-display") && (ac >= 2) ) { strcpy(displayname,*(av+1)); av += 2; ac -= 2; #endif -#if PARI +#if FEP + } else if ( !strcmp(*av,"-fep") ) { + do_fep = 1; av++; ac--; +#endif +#if defined(PARI) } else if ( !strcmp(*av,"-paristack") ) { extern int paristack; @@ -374,11 +317,17 @@ char **av; asir_terminate(1); } } +#if FEP + if ( do_fep ) { + char *home; + home = (char *)getenv("HOME"); + if (!home) + home = "."; + sprintf (asir_history, "%s/.asir_history",home); + read_history(asir_history); + using_history(); + } #endif -#if (defined(THINK_C) && !defined(__MWERKS__)) - init_hist(MAXHIST); - read_hist(HISTORY); -#endif } #include @@ -387,38 +336,27 @@ 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 -#if defined(THINK_C) - buserr_sav = *((int *)0x8); - *((int *)0x8) = (int)bus_handler; -#else /* THINK_C */ - #if !defined(VISUAL) signal(SIGBUS,bus_handler); #endif - -#if 0 -#if !defined(VISUAL) && !defined(_PA_RISC1_1) - signal(SIGWINCH,winch_handler); -#endif -#endif - -#endif /* THINK_C */ } static void (*old_int)(int); @@ -436,8 +374,7 @@ void asir_reset_handler() { signal(SIGINT,old_int); } -void resetenv(s) -char *s; +void resetenv(char *s) { extern FILE *outfile; @@ -453,17 +390,19 @@ char *s; w_noflush_stderr(0); #endif asir_out = stdout; -#if PARI +#if defined(PARI) pari_outfile = stdout; #endif /* restore states */ reset_engine(); reset_io(); - longjmp(env,1); +#if !defined(VISUAL) + reset_timer(); +#endif + LONGJMP(main_env,1); } -void fatal(n) -int n; +void fatal(int n) { resetenv("return to toplevel"); } @@ -471,8 +410,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; @@ -483,12 +421,10 @@ int sig; ox_int_received = 1; return; } -#if defined(THINK_C) || defined(VISUAL) - suspend_timer(); signal(SIGINT,SIG_IGN); +#if defined(VISUAL) + suspend_timer(); #endif -#if defined(_PA_RISC1_1) || defined(linux) || defined(VISUAL) || defined(__svr4__) signal(SIGINT,SIG_IGN); -#endif #if !defined(VISUAL) if ( do_server_in_X11 ) { debug(PVSS?((VS)BDY(PVSS))->usrf->f.usrf->body:0); @@ -509,8 +445,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); @@ -542,8 +476,6 @@ int sig; } if ( debug_mode ) debug_mode = 0; - if ( kernelmode ) - fputc('\0',stderr); restore_handler(); if ( c == 'u' ) { if ( registered_handler ) { @@ -567,8 +499,6 @@ int sig; restore_handler(); return; case 'c': - if ( kernelmode ) - fputc('\0',stderr); restore_handler(); return; break; case 'w': @@ -583,41 +513,37 @@ int sig; } void restore_handler() { -#if defined(THINK_C) || defined(VISUAL) - resume_timer(); signal(SIGINT,int_handler); +#if defined(VISUAL) + resume_timer(); #endif -#if defined(_PA_RISC1_1) || defined(linux) || defined(__svr4__) +#if defined(SIGINT) signal(SIGINT,int_handler); #endif } -void segv_handler(sig) -int sig; +void segv_handler(int sig) { -#if defined(THINK_C) || defined(_PA_RISC1_1) || defined(linux) || defined(VISUAL) || defined(__svr4__) +#if defined(SIGSEGV) signal(SIGSEGV,segv_handler); -#endif error("internal error (SEGV)"); +#endif } -void ill_handler(sig) -int sig; +void ill_handler(int sig) { -#if defined(THINK_C) || defined(_PA_RISC1_1) || defined(linux) || defined(VISUAL) || defined(__svr4__) +#if defined(SIGILL) signal(SIGILL,ill_handler); -#endif error("illegal instruction (ILL)"); +#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); @@ -625,87 +551,36 @@ int sig; #endif } -void fpe_handler(sig) -int sig; +void fpe_handler(int sig) { -#if defined(THINK_C) || defined(_PA_RISC1_1) || defined(linux) || defined(VISUAL) || defined(__svr4__) +#if defined(SIGFPE) signal(SIGFPE,fpe_handler); -#endif error("internal error (FPE)"); -} - -void winch_handler(sig) -int sig; -{ -#if 0 -#if !defined(THINK_C) && !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(__svr4__) - if ( isatty(1) ) { - struct winsize t; - - if ( ioctl(1,TIOCGWINSZ,&t) == -1 ) - perror("TIOCGWINSZ"); - if ( t.ws_col != wsize.ws_col || t.ws_row != wsize.ws_row ) { - resize_buffer(); - if ( killpg(getpgrp(0),SIGWINCH) == -1 ) - perror("killpg"); - } - } #endif -#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 } void resize_buffer() { -#if 0 && !defined(THINK_C) && !defined(VISUAL) && !defined(_PA_RISC1_1) - if ( isatty(1) ) { - if ( ioctl(1,TIOCGWINSZ,&wsize) == -1 ) - perror("TIOCGWINSZ"); - if ( wsize.ws_col > 2 ) { - ttywidth = wsize.ws_col - 2; - upperbuf = (char *)MALLOC(wsize.ws_col); - lowerbuf = (char *)MALLOC(wsize.ws_col); - } - } -#endif } void tty_init() { -#if 0 && !defined(THINK_C) && !defined(VISUAL) && !defined(_PA_RISC1_1) - if ( isatty(0) ) { - if ( ioctl(0,TIOCGETC,&tc) == -1 ) - perror("TIOCGETC"); - oldeof = tc.t_eofc; tc.t_eofc = 0xff; - if ( ioctl(0,TIOCSETC,&tc) == -1 ) - perror("TIOCSETC"); - setpgrp(0, getpid()); - } - resize_buffer(); -#endif } void tty_reset() { -#if 0 && !defined(THINK_C) && !defined(VISUAL) && !defined(_PA_RISC1_1) - if ( oldeof ) { - tc.t_eofc = oldeof; - if ( ioctl(0,TIOCSETC,&tc) == -1 ) - perror("TIOCSETC"); - } -#endif } extern int evalstatline; -void set_lasterror(s) -char *s; +void set_lasterror(char *s) { strncpy(LastError,s,BUFSIZ); LastError[BUFSIZ-1] = 0; @@ -713,11 +588,14 @@ char *s; SNODE error_snode; -void error(s) -char *s; +void error(char *s) { SNODE *snp; +#if !defined(VISUAL) + if ( timer_is_set ) + alrm_handler(SIGVTALRM); +#endif fprintf(stderr,"%s\n",s); set_lasterror(s); if ( CPVS != GPVS ) { @@ -738,7 +616,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); @@ -750,8 +628,7 @@ char *s; #if !defined(VISUAL) #include -void set_timer(interval) -int interval; +void set_timer(int interval) { struct itimerval it; @@ -761,6 +638,7 @@ int interval; it.it_value.tv_usec = 0; setitimer(ITIMER_VIRTUAL,&it,0); signal(SIGVTALRM,alrm_handler); + timer_is_set = 1; } void reset_timer() @@ -773,14 +651,31 @@ void reset_timer() it.it_value.tv_usec = 0; setitimer(ITIMER_VIRTUAL,&it,0); signal(SIGVTALRM,SIG_IGN); + timer_is_set = 0; } #endif unsigned int get_asir_version(); +char *get_asir_distribution(); void copyright() { - printf("This is Risa/Asir, Version %d.\n",get_asir_version()); - printf("Copyright (C) FUJITSU LABORATORIES LIMITED.\n"); - printf("1994-1999. All rights reserved.\n"); +#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"); +#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 } +