===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v
retrieving revision 1.19
retrieving revision 1.25
diff -u -p -r1.19 -r1.25
--- OpenXM_contrib2/asir2000/parse/main.c	2003/03/07 03:12:31	1.19
+++ OpenXM_contrib2/asir2000/parse/main.c	2004/02/13 05:48:36	1.25
@@ -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.18 2003/02/14 22:29:18 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.24 2004/01/07 06:25:42 ohara 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;
@@ -92,6 +94,8 @@ main(int argc,char *argv[])
 	extern int read_exec_file;
 	extern int do_asirrc;
 	extern int do_file;
+	extern char *do_filename;
+	extern int asir_setenv;
 	extern FILE *in_fp;
 	extern int *StackBottom;
 	char *getenv();
@@ -102,7 +106,7 @@ main(int argc,char *argv[])
 #endif
 
 	StackBottom = &tmp;
-#if MPI
+#if defined(MPI)
 	mpi_init();
 	if ( mpi_myid ) {
 		int slave_argc;
@@ -130,7 +134,7 @@ main(int argc,char *argv[])
 		/* never return */
 		ox_main(argc,argv);
 		exit(0);
-#if DO_PLOT
+#if defined(DO_PLOT)
 	} else if ( !strncmp(binname,"ox_plot",strlen("ox_plot")) ) {
 		/* never return */
 		ox_plot_main(argc,argv);
@@ -150,11 +154,14 @@ main(int argc,char *argv[])
 	env_init();
 	endian_init();
 	GC_init();
+	cppname_init();
 	process_args(--argc,++argv);
 #if defined(PARI)
     risa_pari_init();
 #endif 
-	copyright();
+	if (!do_quiet) {
+		copyright();
+	}
 	output_init();
 	arf_init();
 	nglob_init();
@@ -187,7 +194,12 @@ main(int argc,char *argv[])
 	}
 
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
-		input_init(ifp,ifname);
+		if (!asir_setenv) {
+			input_init(ifp,ifname);
+		}else {
+			asir_infile=NULL;
+			loadasirfile(ifname);
+		}
 		if ( !SETJMP(main_env) ) {
 			read_exec_file = 1;
 			read_eval_loop();
@@ -196,22 +208,30 @@ main(int argc,char *argv[])
 		fclose(ifp);
 	}
 
-	if ( do_file )
-		input_init(in_fp,"stdin");
-	else
+	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();
+		restore_handler();
 		read_eval_loop();
 	}
 }