===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v
retrieving revision 1.24
retrieving revision 1.29
diff -u -p -r1.24 -r1.29
--- OpenXM_contrib2/asir2000/parse/main.c	2004/01/07 06:25:42	1.24
+++ OpenXM_contrib2/asir2000/parse/main.c	2006/02/25 06:33:31	1.29
@@ -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/main.c,v 1.23 2003/12/23 06:30:14 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.28 2006/02/08 02:11:19 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -54,7 +54,9 @@
 #include "genpari.h"
 
 /* XXX : environment is defined in libpari.a */
+#  if !(PARI_VERSION_CODE > 131588)
 extern jmp_buf environnement;
+#  endif
 #endif
 
 extern JMP_BUF main_env;
@@ -89,7 +91,6 @@ main(int argc,char *argv[])
 	FILE *ifp;
 	char ifname[BUFSIZ];
 	extern int GC_dont_gc;
-	extern int read_exec_file;
 	extern int do_asirrc;
 	extern int do_file;
 	extern char *do_filename;
@@ -104,6 +105,7 @@ main(int argc,char *argv[])
 #endif
 
 	StackBottom = &tmp;
+	GC_init();
 #if defined(MPI)
 	mpi_init();
 	if ( mpi_myid ) {
@@ -151,7 +153,6 @@ main(int argc,char *argv[])
 	rtime_init();
 	env_init();
 	endian_init();
-	GC_init();
 	cppname_init();
 	process_args(--argc,++argv);
 #if defined(PARI)
@@ -170,6 +171,8 @@ main(int argc,char *argv[])
 	pf_init();
 	sysf_init();
 	parif_init();
+	order_init();
+	/* XXX set the default ordering */
 #if defined(VISUAL)
 	init_socket();
 #endif
@@ -191,42 +194,40 @@ main(int argc,char *argv[])
 		sprintf(ifname,"%s/." ASIRRCNAME,homedir);
 	}
 
+	if ( do_file ) {
+		asir_infile=NULL;
+		loadasirfile(do_filename);
+	} else {
+		/* the bottom of the input stack */
+		input_init(stdin,"stdin");
+	}
+
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
-		if (!asir_setenv) {
-			input_init(ifp,ifname);
-		}else {
-			asir_infile=NULL;
-			loadasirfile(ifname);
-		}
-		if ( !SETJMP(main_env) ) {
-			read_exec_file = 1;
-			read_eval_loop();
-			read_exec_file = 0;
-		}
 		fclose(ifp);
+		if ( !SETJMP(main_env) )
+			execasirfile(ifname);
 	}
 
-	if ( do_file ) {
-		if (!asir_setenv) {
-			input_init(in_fp,"stdin");
-		}else {
-			asir_infile=NULL;
-			loadasirfile(do_filename);
-		}
-	}else
-		input_init(stdin,"stdin");
 	prompt();
 	while ( 1 ) {
 #if defined(PARI)
 		recover(0);
 		/* XXX environement is defined in libpari.a */
+#  if !(PARI_VERSION_CODE > 131588)
 		if ( setjmp(environnement) ) {
 			avma = top; recover(1);
 			resetenv("");
 		}
+#  endif
 #endif
 		if ( SETJMP(main_env) )
 			prompt();
+		if ( !do_file ) {
+			if ( SETJMP(asir_infile->jmpbuf) )
+				prompt();
+			else
+				asir_infile->ready_for_longjmp = 1;
+		}
 		restore_handler();
 		read_eval_loop();
 	}