===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v
retrieving revision 1.13
retrieving revision 1.29
diff -u -p -r1.13 -r1.29
--- OpenXM_contrib2/asir2000/parse/main.c	2001/12/25 02:39:06	1.13
+++ OpenXM_contrib2/asir2000/parse/main.c	2006/02/25 06:33:31	1.29
@@ -45,15 +45,18 @@
  * 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.12 2001/12/20 08:18:27 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"
 
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
 
-extern JMP_BUF environnement;
+/* XXX : environment is defined in libpari.a */
+#  if !(PARI_VERSION_CODE > 131588)
+extern jmp_buf environnement;
+#  endif
 #endif
 
 extern JMP_BUF main_env;
@@ -88,20 +91,22 @@ 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;
+	extern int asir_setenv;
 	extern FILE *in_fp;
 	extern int *StackBottom;
 	char *getenv();
 	char *homedir;
 	char *ptr;
 #if !defined(VISUAL)
-	char *slash,*binname;
+	char *slash,*bslash,*binname,*p;
 #endif
 
 	StackBottom = &tmp;
-#if MPI
+	GC_init();
+#if defined(MPI)
 	mpi_init();
 	if ( mpi_myid ) {
 		int slave_argc;
@@ -116,21 +121,26 @@ main(int argc,char *argv[])
 		ox_mpi_master_init();
 #elif !defined(VISUAL)
 	slash = (char *)rindex(argv[0],'/');
+	bslash = (char *)rindex(argv[0],'\\');
 	if ( slash )
 		binname = slash+1;
+	else if ( bslash )
+		binname = bslash+1;
 	else
 		binname = argv[0];
-	if ( !strcmp(binname,"ox_asir") ) {
+	for ( p = binname; *p; p++ )
+		*p = tolower(*p);
+	if ( !strncmp(binname,"ox_asir",strlen("ox_asir")) ) {
 		/* never return */
 		ox_main(argc,argv);
 		exit(0);
-#if DO_PLOT
-	} else if ( !strcmp(binname,"ox_plot") ) {
+#if defined(DO_PLOT)
+	} else if ( !strncmp(binname,"ox_plot",strlen("ox_plot")) ) {
 		/* never return */
 		ox_plot_main(argc,argv);
 		exit(0);
 #endif
-	} else if ( !strcmp(binname,"ox_launch") ) {
+	} else if ( !strncmp(binname,"ox_launch",strlen("ox_launch")) ) {
 		/* never return */
 		launch_main(argc,argv);
 		exit(0);
@@ -143,12 +153,14 @@ main(int argc,char *argv[])
 	rtime_init();
 	env_init();
 	endian_init();
-	GC_init();
+	cppname_init();
 	process_args(--argc,++argv);
-#if PARI 
+#if defined(PARI)
     risa_pari_init();
 #endif 
-	copyright();
+	if (!do_quiet) {
+		copyright();
+	}
 	output_init();
 	arf_init();
 	nglob_init();
@@ -159,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
@@ -180,31 +194,41 @@ 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")) ) {
-		input_init(ifp,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 )
-		input_init(in_fp,"stdin");
-	else
-		input_init(stdin,"stdin");
 	prompt();
 	while ( 1 ) {
-#if PARI
+#if defined(PARI)
 		recover(0);
-		if ( SETJMP(environnement) ) {
+		/* 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();
 	}
 }