=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.53 retrieving revision 1.83 diff -u -p -r1.53 -r1.83 --- OpenXM_contrib2/asir2000/parse/glob.c 2004/12/17 03:09:08 1.53 +++ OpenXM_contrib2/asir2000/parse/glob.c 2012/12/17 07:20:45 1.83 @@ -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.52 2004/12/15 22:51:40 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.82 2012/05/30 02:24:33 ohara 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__) && !defined(__INTERIX) +#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX) && !defined(__FreeBSD__) #include #endif @@ -77,14 +77,13 @@ #define MAXHIST 100 -extern int GC_free_space_divisor; -extern int GC_free_space_numerator; extern FILE *asir_out; INFILE asir_infile; JMP_BUF main_env,debug_env,timer_env,exec_env; int little_endian,debug_mode,no_debug_on_error; char *asir_libdir; +char *asir_contrib_dir; char *asir_pager; NODE usrf,sysf,noargsysf,ubinf,parif; @@ -98,6 +97,7 @@ FUNC parse_targetf; FILE *ox_istream,*ox_ostream; int do_server_in_X11; Obj LastVal; +LIST LastStackTrace; char LastError[BUFSIZ]; int timer_is_set; NODE current_option; @@ -125,10 +125,11 @@ struct oVL oVLIST[52]; VL CO = oVLIST; VL ALG; -struct oVS oGPVS,oAPVS,oEPVS; +struct oVS oGPVS,oAPVS,oEPVS,oPPVS; VS GPVS = &oGPVS; VS APVS = &oAPVS; VS EPVS = &oEPVS; +VS PPVS = &oPPVS; VS CPVS,MPVS; NODE MODULE_LIST; @@ -164,8 +165,9 @@ void glob_init() { VR(&oVLIST[i]) = &oVAR[i]; NEXT(&oVLIST[i]) = 0; reallocarray((char **)&GPVS->va,(int *)&GPVS->asize,(int *)&GPVS->n,(int)sizeof(struct oPV)); reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV)); + reallocarray((char **)&PPVS->va,(int *)&PPVS->asize,(int *)&PPVS->n,(int)sizeof(struct oPV)); CPVS = GPVS; - MKNODE(ONENODE,mkfnode(1,I_FORMULA,ONE),0); + MKNODE(ONENODE,mkfnode(1,I_FORMULA,ONE),NULLP); 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"; @@ -193,8 +195,8 @@ int do_asirrc; int do_file; char *do_filename; int do_message; +int do_terse; int do_fep; -int read_exec_file; int asir_setenv; static int buserr_sav; static char asir_history[BUFSIZ]; @@ -210,6 +212,7 @@ void ExitAsir() { /* * status = 1 abnormal termination (error() etc.) * status = 2 normal termination (end(), quit() etc.) + * status = 3 absolute termination */ void asir_terminate(int status) @@ -217,14 +220,20 @@ void asir_terminate(int status) int t; NODE n; - if ( read_exec_file ) { - t = read_exec_file; - read_exec_file = 0; - if ( t == 1 ) - LONGJMP(main_env,status); - else - LONGJMP(exec_env,status); - } else { + /* called from engine in Windows */ + if ( status == 3 ) asir_infile = 0; + + if ( asir_infile && asir_infile->ready_for_longjmp ) + LONGJMP(asir_infile->jmpbuf,status); + else { + if ( user_quit_handler ) { + if ( !do_terse ) + fprintf(stderr,"Calling the registered quit callbacks..."); + for ( n = user_quit_handler; n; n = NEXT(n) ) + bevalf((FUNC)BDY(n),0); + if ( !do_terse ) + fprintf(stderr, "done.\n"); + } tty_reset(); #if defined(MPI) if ( !mpi_myid ) @@ -244,12 +253,6 @@ void asir_terminate(int status) write_history(asir_history); } #endif - if ( user_quit_handler ) { - fprintf(stderr,"Calling the registered quit callbacks..."); - for ( n = user_quit_handler; n; n = NEXT(n) ) - bevalf((FUNC)BDY(n),0); - fprintf(stderr, "done.\n"); - } ExitAsir(); } } @@ -315,6 +318,19 @@ static int which(char *prog, char *path, char *buf, si void cppname_init() { #if !defined(VISUAL) + char *oxhome; + char oxcpp[BUFSIZ]; +#define OXCPP "/bin/ox_cpp" + + if ( oxhome = getenv("OpenXM_HOME") ) { + if ( strlen(oxhome)+strlen(OXCPP)= 2) ) { char *slash; - slash = strrchr(*(av+1),'/'); if ( slash ) { *slash = 0; - GC_free_space_numerator = atoi(slash+1); + nm = atoi(slash+1); + }else { + nm = 1; } - GC_free_space_divisor = atoi(*(av+1)); + dv = atoi(*(av+1)); + Risa_GC_set_adj(nm,dv); av += 2; ac -= 2; } else if ( !strcmp(*av,"-cpp") && (ac >= 2) ) { strcpy(cppname,*(av+1)); av += 2; ac -= 2; @@ -352,7 +371,7 @@ void process_args(int ac,char **av) do_quiet = 1; in_fp = fopen(*(av+1),"r"); if ( !in_fp ) { - fprintf(stderr,"%s does not exist!",*(av+1)); + fprintf(stderr,"%s does not exist!\n",*(av+1)); asir_terminate(1); } do_file = 1; @@ -448,6 +467,8 @@ void asir_reset_handler() { signal(SIGINT,old_int); } +extern int I_am_server; + void resetenv(char *s) { extern FILE *outfile; @@ -482,6 +503,7 @@ void fatal(int n) } extern int ox_int_received, critical_when_signal; +extern int in_gc, caught_intr; void int_handler(int sig) { @@ -496,6 +518,10 @@ void int_handler(int sig) ox_int_received = 1; return; } + if ( in_gc ) { + caught_intr = 1; + return; + } #if defined(VISUAL) suspend_timer(); #endif @@ -521,16 +547,21 @@ void int_handler(int sig) fprintf(stderr,"interrupt ?(q/t/c/d/u/w/?) "); fflush(stderr); buf[0] = '\n'; - while ( buf[0] == '\n' ) + while ( !feof(stdin) && buf[0] == '\n' ) fgets(buf,BUFSIZ,stdin); + if ( feof(stdin) ) { + clearerr(stdin); + continue; + } switch ( c = buf[0] ) { case 'q': while ( 1 ) { fprintf(stderr,"Abort this session? (y or n) "); fflush(stderr); fgets(buf,BUFSIZ,stdin); if ( !strncmp(buf,"y",1) ) { - read_exec_file = 0; fprintf(stderr,"Bye\n"); + /* for terminating myself */ + asir_infile = 0; asir_terminate(1); } else if ( !strncmp(buf,"n",1) ) { restore_handler(); @@ -555,18 +586,16 @@ void int_handler(int sig) restore_handler(); if ( c == 'u' ) { if ( user_int_handler ) { - fprintf(stderr, - "Calling the registered exception callbacks..."); + if ( !do_terse ) + fprintf(stderr, + "Calling the registered exception callbacks..."); for ( t = user_int_handler; t; t = NEXT(t) ) bevalf((FUNC)BDY(t),0); - fprintf(stderr, "done.\n"); + if ( !do_terse ) + fprintf(stderr, "done.\n"); } } - if ( read_exec_file ) { - read_exec_file = 0; - resetenv("initialization aborted; return to toplevel"); - } else - resetenv("return to toplevel"); + resetenv("return to toplevel"); break; case 'd': #if 0 @@ -615,6 +644,14 @@ void ill_handler(int sig) #endif } +#if defined(__DARWIN__) +#define SIGNAL_FOR_TIMER SIGALRM +#define ITIMER_TYPE ITIMER_REAL +#else +#define SIGNAL_FOR_TIMER SIGVTALRM +#define ITIMER_TYPE ITIMER_VIRTUAL +#endif + void alrm_handler(int sig) { fprintf(stderr,"interval timer expired (VTALRM)\n"); @@ -673,7 +710,7 @@ void error(char *s) #if !defined(VISUAL) if ( !error_in_timer && timer_is_set ) - alrm_handler(SIGVTALRM); + alrm_handler(SIGNAL_FOR_TIMER); #endif fprintf(stderr,"%s\n",s); set_lasterror(s); @@ -699,8 +736,8 @@ void error(char *s) if ( CPVS != GPVS ) if ( !no_debug_on_error && (do_server_in_X11 || isatty(0)) ) bp(error_snode); - if ( read_exec_file ) - read_exec_file = 0; + if ( I_am_server ) + showpos_to_list(&LastStackTrace); resetenv("return to toplevel"); } @@ -710,7 +747,7 @@ void toplevel(char *s) #if !defined(VISUAL) if ( timer_is_set ) - alrm_handler(SIGVTALRM); + alrm_handler(SIGNAL_FOR_TIMER); #endif fprintf(stderr,"%s\n",s); if ( do_file ) { @@ -720,8 +757,6 @@ void toplevel(char *s) showpos_to_string(errbuf+strlen(errbuf)); ExitAsir(); } - if ( read_exec_file ) - read_exec_file = 0; resetenv("return to toplevel"); } @@ -736,8 +771,8 @@ void set_timer(int interval) it.it_interval.tv_usec = 0; it.it_value.tv_sec = interval; it.it_value.tv_usec = 0; - setitimer(ITIMER_VIRTUAL,&it,0); - signal(SIGVTALRM,alrm_handler); + setitimer(ITIMER_TYPE,&it,0); + signal(SIGNAL_FOR_TIMER,alrm_handler); timer_is_set = 1; } @@ -749,8 +784,8 @@ void reset_timer() it.it_interval.tv_usec = 0; it.it_value.tv_sec = 0; it.it_value.tv_usec = 0; - setitimer(ITIMER_VIRTUAL,&it,0); - signal(SIGVTALRM,SIG_IGN); + setitimer(ITIMER_TYPE,&it,0); + signal(SIGNAL_FOR_TIMER,SIG_IGN); timer_is_set = 0; } #endif @@ -758,14 +793,20 @@ void reset_timer() unsigned int get_asir_version(); char *get_asir_distribution(); +char *get_gcversion() +{ + return "GC 7.2 copyright 1988-2012, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n"; +} + 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 PARIVERSION", Copyright (C) 2000-2005 The PARI Group.\n"; +#else return "PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n H. Cohen and M. Olivier.\n"; #endif +#endif return ""; } @@ -780,24 +821,25 @@ char *get_intervalversion() 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"; - printf(format, get_intervalversion(), get_asir_version(), get_asir_distribution(), get_pariversion()); + char *scopyright(); + fputs(scopyright(), stdout); } char *scopyright() { static char *notice; - char *s1, *s2, *s3; + char *s1, *s2, *s3, *s4; 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"; + char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2007, Risa/Asir committers, http://www.openxm.org/.\n%s%s"; if (!notice) { s1 = get_intervalversion(); s2 = get_asir_distribution(); - s3 = get_pariversion(); + s3 = get_gcversion(); + s4 = get_pariversion(); d = get_asir_version(); - len = (strlen(format)-8)+strlen(s1)+strlen(s2)+strlen(s3)+sizeof(int)*3; + len = (strlen(format)-8)+strlen(s1)+strlen(s2)+strlen(s3)+strlen(s4)+sizeof(int)*3; notice = MALLOC(len+1); - sprintf(notice, format, s1, d, s2, s3); + sprintf(notice, format, s1, d, s2, s3, s4); } return notice; }