===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/load.c,v
retrieving revision 1.17
retrieving revision 1.20
diff -u -p -r1.17 -r1.20
--- OpenXM_contrib2/asir2000/parse/load.c	2005/03/24 23:40:50	1.17
+++ OpenXM_contrib2/asir2000/parse/load.c	2006/02/08 02:11:19	1.20
@@ -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/load.c,v 1.16 2005/03/24 22:54:22 takayama Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/load.c,v 1.19 2006/02/05 08:28:04 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -103,7 +103,6 @@ char *search_executable(char *name);
 extern char *asir_libdir;
 extern char *asir_contrib_dir;
 extern char *asir_pager;
-extern int read_exec_file;
 extern int main_parser;
 extern JMP_BUF exec_env;
 
@@ -153,6 +152,7 @@ void env_init() {
 #if defined(VISUAL)
 			get_rootdir(rootname,sizeof(rootname));
 			asir_libdir = (char *)malloc(strlen(rootname)+strlen("/lib")+1);
+			sprintf(asir_libdir,"%s/lib",rootname);
 #else
 			asir_libdir = (char *)malloc(strlen(ASIR_LIBDIR)+1);
 			strcpy(asir_libdir,ASIR_LIBDIR);
@@ -384,33 +384,11 @@ void loadasirfile(char *name0)
 void execasirfile(char *name)
 {
 	loadasirfile(name);
-	read_exec_file = 1;
-	read_eval_loop();
-	read_exec_file = 0;
-}
-
-void load_and_execfile(char *name)
-{
-	FILE *fp;
-	INFILE save_asir_infile;
-	int save_prresult;
-	extern prresult;
-
-	savepvs();
-	save_asir_infile = asir_infile;
-	save_prresult = prresult;
-	fp = fopen(name,"rb");
-	input_init(fp,name);
-	if ( !SETJMP(exec_env) ) {
-		/* XXX : information for asir_teriminate() */
-		read_exec_file = 2;
+	if ( !SETJMP(asir_infile->jmpbuf) ) {
+		asir_infile->ready_for_longjmp = 1;
 		read_eval_loop();
-		read_exec_file = 0;
 	}
-	fclose(fp);
-	restorepvs();
-	asir_infile = save_asir_infile;
-	prresult = save_prresult;
+	closecurrentinput();
 }
 
 static NODE objfile = 0;