=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/asir_lib.c,v retrieving revision 1.2 retrieving revision 1.9 diff -u -p -r1.2 -r1.9 --- OpenXM_contrib2/asir2000/parse/asir_lib.c 2000/08/21 08:31:45 1.2 +++ OpenXM_contrib2/asir2000/parse/asir_lib.c 2006/02/08 02:11:19 1.9 @@ -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,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/asir_lib.c,v 1.1.1.1 1999/12/03 07:39:11 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/asir_lib.c,v 1.8 2004/06/15 00:56:52 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -53,14 +53,14 @@ #include #endif -#if PARI -#include "genpari.h" - +#if defined(PARI) +# include "genpari.h" +# if !(PARI_VERSION_CODE > 131588 ) extern jmp_buf environnement; +# endif #endif extern jmp_buf env; -extern int *StackBottom; extern char *parse_strp; extern int do_file; @@ -69,20 +69,19 @@ int Call_Asir(char *,pointer *); void Init_Asir(int argc,char **argv) { - int tmp; FILE *ifp; char ifname[BUFSIZ]; extern int GC_dont_gc; - extern int read_exec_file; extern int do_asirrc; char *getenv(); static asirlib_initialized=0; if ( asirlib_initialized ) return; + GC_init(); asirlib_initialized = 1; do_file = 1; -#if PARI +#if defined(PARI) risa_pari_init(); #endif srandom((int)get_current_time()); @@ -91,14 +90,12 @@ void Init_Asir(int argc,char **argv) #if defined(THINK_C) param_init(); #endif - StackBottom = &tmp + 1; /* XXX */ rtime_init(); env_init(); endian_init(); #if !defined(VISUAL) && !defined(THINK_C) /* check_key(); */ #endif - GC_init(); process_args(--argc,++argv); copyright(); output_init(); @@ -121,11 +118,8 @@ void Init_Asir(int argc,char **argv) #endif if ( do_asirrc && (ifp = fopen(ifname,"r")) ) { input_init(ifp,ifname); - if ( !setjmp(env) ) { - read_exec_file = 1; + if ( !setjmp(asir_infile->jmpbuf) ) read_eval_loop(); - read_exec_file = 0; - } fclose(ifp); } else error(".asirrc not found"); @@ -136,12 +130,16 @@ int Call_Asir(char *cmd,pointer *result) { SNODE snode; pointer val; -#if PARI +#if defined(PARI) + void recover(int); + recover(0); +# if !(PARI_VERSION_CODE > 131588) if ( setjmp(environnement) ) { avma = top; recover(1); error("PARI error"); } +# endif #endif if ( setjmp(env) ) { *result = 0;