===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/asir_lib.c,v
retrieving revision 1.7
retrieving revision 1.9
diff -u -p -r1.7 -r1.9
--- OpenXM_contrib2/asir2000/parse/asir_lib.c	2004/02/13 05:48:36	1.7
+++ OpenXM_contrib2/asir2000/parse/asir_lib.c	2006/02/08 02:11:19	1.9
@@ -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.6 2003/02/14 22:29:17 ohara 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"
@@ -72,13 +72,13 @@ void Init_Asir(int argc,char **argv)
 	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 defined(PARI)
@@ -96,7 +96,6 @@ void Init_Asir(int argc,char **argv)
 #if !defined(VISUAL) && !defined(THINK_C)
 /*	check_key(); */
 #endif
-	GC_init();
 	process_args(--argc,++argv);
 	copyright();
 	output_init();
@@ -119,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");