=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.40 retrieving revision 1.88 diff -u -p -r1.40 -r1.88 --- OpenXM_contrib2/asir2000/parse/glob.c 2003/11/11 06:14:08 1.40 +++ OpenXM_contrib2/asir2000/parse/glob.c 2015/08/06 10:01:53 1.88 @@ -45,20 +45,17 @@ * 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.87 2015/08/04 06:20:45 noro Exp $ */ #include "ca.h" #include "al.h" #include "parse.h" #include "ox.h" -#if defined(PARI) -#include "genpari.h" -#endif -#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX) && !defined(__FreeBSD__) #include #endif -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) #include #include #else @@ -71,20 +68,20 @@ #include #endif -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) #define HISTORY asir_history #endif #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; +int little_endian,debug_mode,no_debug_on_error; char *asir_libdir; +char *asir_contrib_dir; +char *asir_private_dir; char *asir_pager; NODE usrf,sysf,noargsysf,ubinf,parif; @@ -98,10 +95,12 @@ 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; +NODE user_int_handler, user_quit_handler; - 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,21 +123,27 @@ 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; 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(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) char cppname[BUFSIZ] = "c:\\asir\\stdlib\\cpp "; #else char cppname[BUFSIZ] = "/lib/cpp "; @@ -158,10 +163,17 @@ 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"; + 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 +191,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_terse; int do_fep; -int read_exec_file; +int asir_setenv; static int buserr_sav; static char asir_history[BUFSIZ]; @@ -196,20 +210,28 @@ void ExitAsir() { /* * status = 1 abnormal termination (error() etc.) * status = 2 normal termination (end(), quit() etc.) + * status = 3 absolute termination */ 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 ) @@ -245,13 +267,14 @@ void param_init() { Obj user_defined_prompt; void prompt() { - if ( !do_quiet && !do_fep && asir_infile->fp == stdin ) + if ( !do_quiet && !do_fep && asir_infile->fp == stdin ) { fprintf(asir_out,"[%d] ",APVS->n); - else if ( do_quiet && user_defined_prompt + fflush(asir_out); + } 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); } - fflush(asir_out); } void sprompt(char *ptr) @@ -259,7 +282,7 @@ void sprompt(char *ptr) sprintf(ptr,"[%d] ",APVS->n); } -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) static int which(char *prog, char *path, char *buf, size_t size) { char *tok; @@ -292,7 +315,20 @@ static int which(char *prog, char *path, char *buf, si void cppname_init() { -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) + 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; @@ -330,11 +369,14 @@ 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; + 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") ) { @@ -347,7 +389,7 @@ void process_args(int ac,char **av) void GC_set_max_heap_size(int); GC_set_max_heap_size(atoi(*(av+1))); av += 2; ac -= 2; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) } else if ( !strcmp(*av,"-display") && (ac >= 2) ) { strcpy(displayname,*(av+1)); av += 2; ac -= 2; #endif @@ -355,12 +397,6 @@ void process_args(int ac,char **av) } else if ( !strcmp(*av,"-fep") ) { do_fep = 1; av++; ac--; #endif -#if defined(PARI) - } else if ( !strcmp(*av,"-paristack") ) { - extern int paristack; - - paristack = atoi(*(av+1)); av += 2; ac -= 2; -#endif } else { fprintf(stderr,"%s : unknown option.\n",*av); asir_terminate(1); @@ -382,7 +418,7 @@ void process_args(int ac,char **av) #include void sig_init() { -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) signal(SIGINT,int_handler); #else void register_ctrlc_handler(); @@ -403,7 +439,7 @@ void sig_init() { signal(SIGILL,ill_handler); #endif -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) signal(SIGBUS,bus_handler); #endif } @@ -423,6 +459,8 @@ void asir_reset_handler() { signal(SIGINT,old_int); } +extern int I_am_server; + void resetenv(char *s) { extern FILE *outfile; @@ -431,7 +469,7 @@ void resetenv(char *s) while ( NEXT(asir_infile) ) closecurrentinput(); resetpvs(); -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( do_server_in_X11 ) #endif show_debug_window(0); @@ -439,13 +477,10 @@ void resetenv(char *s) w_noflush_stderr(0); #endif asir_out = stdout; -#if defined(PARI) - pari_outfile = stdout; -#endif /* restore states */ reset_engine(); reset_io(); -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) reset_timer(); #endif LONGJMP(main_env,1); @@ -456,13 +491,15 @@ void fatal(int n) resetenv("return to toplevel"); } -FUNC registered_handler; extern int ox_int_received, critical_when_signal; +extern int in_gc, caught_intr; void int_handler(int sig) { extern NODE PVSS; + NODE t; + if ( do_file ) { ExitAsir(); } @@ -470,11 +507,15 @@ void int_handler(int sig) ox_int_received = 1; return; } -#if defined(VISUAL) + if ( in_gc ) { + caught_intr = 1; + return; + } +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) suspend_timer(); #endif signal(SIGINT,SIG_IGN); -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( do_server_in_X11 ) { debug(PVSS?((VS)BDY(PVSS))->usrf->f.usrf->body:0); restore_handler(); @@ -495,16 +536,22 @@ 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"); asir_terminate(1); + fprintf(stderr,"Bye\n"); + /* for terminating myself */ + asir_infile = 0; + asir_terminate(1); } else if ( !strncmp(buf,"n",1) ) { restore_handler(); return; @@ -527,18 +574,17 @@ void int_handler(int sig) debug_mode = 0; restore_handler(); if ( c == 'u' ) { - if ( registered_handler ) { - fprintf(stderr, - "Calling the registered exception handler..."); - bevalf(registered_handler,0); - fprintf(stderr, "done.\n"); + if ( user_int_handler ) { + if ( !do_terse ) + fprintf(stderr, + "Calling the registered exception callbacks..."); + for ( t = user_int_handler; t; t = NEXT(t) ) + bevalf((FUNC)BDY(t),0); + 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 @@ -551,7 +597,8 @@ 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"); break; @@ -562,7 +609,7 @@ void int_handler(int sig) } void restore_handler() { -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) resume_timer(); #endif #if defined(SIGINT) @@ -586,6 +633,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"); @@ -636,14 +691,15 @@ void set_lasterror(char *s) } SNODE error_snode; +int error_in_timer; void error(char *s) { SNODE *snp=0; -#if !defined(VISUAL) - if ( timer_is_set ) - alrm_handler(SIGVTALRM); +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) + if ( !error_in_timer && timer_is_set ) + alrm_handler(SIGNAL_FOR_TIMER); #endif fprintf(stderr,"%s\n",s); set_lasterror(s); @@ -667,20 +723,20 @@ void error(char *s) if ( debug_mode ) LONGJMP(debug_env,1); if ( CPVS != GPVS ) - if ( do_server_in_X11 || isatty(0) ) + 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"); } -void toplevel(char *s) +void goto_toplevel(char *s) { SNODE *snp=0; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( timer_is_set ) - alrm_handler(SIGVTALRM); + alrm_handler(SIGNAL_FOR_TIMER); #endif fprintf(stderr,"%s\n",s); if ( do_file ) { @@ -690,12 +746,10 @@ void toplevel(char *s) showpos_to_string(errbuf+strlen(errbuf)); ExitAsir(); } - if ( read_exec_file ) - read_exec_file = 0; resetenv("return to toplevel"); } -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) #include void set_timer(int interval) @@ -706,8 +760,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; } @@ -719,8 +773,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 @@ -728,24 +782,62 @@ void reset_timer() unsigned int get_asir_version(); char *get_asir_distribution(); -void copyright() { +char *get_gcversion() +{ + return "GC 7.2 copyright 1988-2012, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n"; +} + +char *get_pariversion() +{ + 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-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 } +void copyright() +{ + char *scopyright(); + fputs(scopyright(), stdout); +} +char *scopyright() +{ + static char *notice; + 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-2007, Risa/Asir committers, http://www.openxm.org/.\n%s%s"; + if (!notice) { + s1 = get_intervalversion(); + s2 = get_asir_distribution(); + s3 = get_gcversion(); + s4 = get_pariversion(); + d = get_asir_version(); + 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, s4); + } + return notice; +} + +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +void check_intr() +{ + extern int recv_intr; + if ( recv_intr ) { + if ( recv_intr == 1 ) { + recv_intr = 0; + int_handler(0); + } else { + recv_intr = 0; + ox_usr1_handler(0); + } + } +} +#endif