=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.37 retrieving revision 1.57 diff -u -p -r1.37 -r1.57 --- OpenXM_contrib2/asir2000/parse/glob.c 2003/09/12 01:12:41 1.37 +++ OpenXM_contrib2/asir2000/parse/glob.c 2005/07/12 02:37:32 1.57 @@ -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.36 2003/05/16 07:56:16 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.56 2005/03/24 23:40:50 takayama 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__) +#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX) #include #endif @@ -83,8 +83,9 @@ 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_pager; NODE usrf,sysf,noargsysf,ubinf,parif; @@ -100,8 +101,9 @@ int do_server_in_X11; Obj LastVal; 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}, @@ -134,6 +136,11 @@ 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; @@ -147,6 +154,7 @@ char asirname[BUFSIZ]; char displayname[BUFSIZ]; int Verbose; +int do_quiet; void glob_init() { int i; @@ -161,6 +169,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 +192,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_fep; -int no_prompt; int read_exec_file; +int asir_setenv; static int buserr_sav; static char asir_history[BUFSIZ]; @@ -201,6 +216,7 @@ void ExitAsir() { void asir_terminate(int status) { int t; + NODE n; if ( read_exec_file ) { t = read_exec_file; @@ -210,6 +226,12 @@ void asir_terminate(int status) else LONGJMP(exec_env,status); } else { + 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"); + } tty_reset(); #if defined(MPI) if ( !mpi_myid ) @@ -241,11 +263,18 @@ 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 ) { fprintf(asir_out,"[%d] ",APVS->n); - fflush(asir_out); + 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); + } } void sprompt(char *ptr) @@ -302,6 +331,7 @@ void process_args(int ac,char **av) #if !defined(MPI) do_message = 1; #endif + do_quiet = 0; while ( ac > 0 ) { if ( !strcmp(*av,"-heap") && (ac >= 2) ) { void GC_expand_hp(int); @@ -320,19 +350,23 @@ 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,"-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) ) { @@ -448,13 +482,14 @@ void fatal(int n) resetenv("return to toplevel"); } -FUNC registered_handler; extern int ox_int_received, critical_when_signal; void int_handler(int sig) { extern NODE PVSS; + NODE t; + if ( do_file ) { ExitAsir(); } @@ -496,7 +531,8 @@ void int_handler(int sig) fgets(buf,BUFSIZ,stdin); if ( !strncmp(buf,"y",1) ) { read_exec_file = 0; - fprintf(stderr,"Bye\n"); asir_terminate(1); + fprintf(stderr,"Bye\n"); + asir_terminate(1); } else if ( !strncmp(buf,"n",1) ) { restore_handler(); return; @@ -519,10 +555,11 @@ void int_handler(int sig) debug_mode = 0; restore_handler(); if ( c == 'u' ) { - if ( registered_handler ) { + if ( user_int_handler ) { fprintf(stderr, - "Calling the registered exception handler..."); - bevalf(registered_handler,0); + "Calling the registered exception callbacks..."); + for ( t = user_int_handler; t; t = NEXT(t) ) + bevalf((FUNC)BDY(t),0); fprintf(stderr, "done.\n"); } } @@ -543,7 +580,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; @@ -628,13 +666,14 @@ 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 ) + if ( !error_in_timer && timer_is_set ) alrm_handler(SIGVTALRM); #endif fprintf(stderr,"%s\n",s); @@ -659,14 +698,35 @@ 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; 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) @@ -699,24 +759,46 @@ void reset_timer() unsigned int get_asir_version(); char *get_asir_distribution(); -void copyright() { -#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"); +char *get_pariversion() +{ #if PARI #if 0 - printf("PARI 2.2.4, copyright (C) 2002 The PARI Group.\n"); + 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 - printf("PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n"); - printf(" H. Cohen and M. Olivier.\n"); + 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) + return " + Interval Arithmetic"; +#else + return ""; +#endif +} +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-2005, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 copyright 1988-2005, 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() +{ + 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-2005, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 copyright 1988-2005, 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; +}