===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v
retrieving revision 1.20
retrieving revision 1.32
diff -u -p -r1.20 -r1.32
--- OpenXM_contrib2/asir2000/parse/main.c	2003/03/07 06:39:59	1.20
+++ OpenXM_contrib2/asir2000/parse/main.c	2006/09/26 05:35:26	1.32
@@ -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.19 2003/03/07 03:12:31 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.31 2006/09/25 04:57:55 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;
@@ -73,8 +75,11 @@ extern JMP_BUF main_env;
 double get_current_time();
 void init_socket();
 void recover();
+void set_stacksize();
+void batch_loop();
 
 extern int mpi_nprocs,mpi_myid;
+extern int do_batch;
 
 #if defined(VISUAL_LIB)
 void Main(int argc,char *argv[])
@@ -89,9 +94,10 @@ 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();
@@ -101,7 +107,9 @@ main(int argc,char *argv[])
 	char *slash,*bslash,*binname,*p;
 #endif
 
+	set_stacksize();
 	StackBottom = &tmp;
+	GC_init();
 #if defined(MPI)
 	mpi_init();
 	if ( mpi_myid ) {
@@ -149,12 +157,14 @@ main(int argc,char *argv[])
 	rtime_init();
 	env_init();
 	endian_init();
-	GC_init();
+	cppname_init();
 	process_args(--argc,++argv);
 #if defined(PARI)
     risa_pari_init();
 #endif 
-	copyright();
+	if (!do_batch && !do_quiet) {
+		copyright();
+	}
 	output_init();
 	arf_init();
 	nglob_init();
@@ -165,6 +175,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
@@ -186,32 +198,43 @@ 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_batch )
+		batch_loop();
 
-	if ( do_file )
-		input_init(in_fp,"stdin");
-	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();
 	}
 }
@@ -222,3 +245,80 @@ main(int argc,char *argv[])
 void set_error(int code,char *reason,char *action)
 {}
 #endif
+
+void set_stacksize()
+{
+#if !defined(VISUAL)
+	struct rlimit rlim;
+	int c,m;
+
+	getrlimit(RLIMIT_STACK,&rlim);
+	if ( rlim.rlim_cur < (1<<26) ) {
+		rlim.rlim_cur = MIN(1<<26,rlim.rlim_max);
+		setrlimit(RLIMIT_STACK,&rlim);
+	}
+#endif
+}
+
+void batch_loop()
+{
+	char *inbuf;
+	int i,c,size;
+
+	input_init(0,"string");
+
+	size = 2;
+	inbuf = (char *)malloc(size);
+	while ( 1 ) {
+		for ( i = 0; ; i++ ) {
+			c = w_fgetc(stdin);
+			if ( c == '0xff' ) {
+				inbuf[i] = 0;
+				break;
+			} else
+				inbuf[i] = c;
+			if ( i == size-1 ) {
+				size *= 2;
+				inbuf = realloc(inbuf,size);
+			}
+		}
+		execute_string(inbuf);
+	}
+}
+
+/* a function for batch-loop mode */
+
+extern char *parse_strp;
+
+int execute_string(char *cmd)
+{
+	SNODE snode;
+	pointer val;
+#if defined(PARI)
+	recover(0);
+	/* environement is defined in libpari.a */
+# if !(PARI_VERSION_CODE > 131588 )
+	if ( setjmp(environnement) ) {
+		avma = top; recover(1);
+		resetenv("");
+	}
+# endif
+#endif
+	parse_strp = cmd;
+	asir_infile->ln = 1;
+	if ( mainparse(&snode) ) {
+		return -1;
+	}
+	val = evalstat(snode);
+	if ( NEXT(asir_infile) ) {
+		while ( NEXT(asir_infile) ) {
+			if ( mainparse(&snode) ) {
+				return -1;
+			}
+			nextbp = 0;
+			val = evalstat(snode);
+		}
+	}
+	printexpr(CO,val);
+	return 0;
+}