===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.65
retrieving revision 1.76
diff -u -p -r1.65 -r1.76
--- OpenXM_contrib2/asir2000/parse/eval.c	2009/03/04 09:15:36	1.65
+++ OpenXM_contrib2/asir2000/parse/eval.c	2017/02/07 08:30:31	1.76
@@ -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/eval.c,v 1.64 2008/11/18 20:52:47 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.75 2016/08/24 08:21:03 ohara Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -57,9 +57,6 @@
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
-#if defined(PARI)
-#include "genpari.h"
-#endif
 
 extern JMP_BUF timer_env;
 extern FUNC cur_binf;
@@ -67,10 +64,9 @@ extern NODE PVSS;
 
 int f_break,f_return,f_continue;
 int evalstatline;
-int recv_intr;
 int show_crossref;
 int at_root;
-void gen_searchf_searchonly(char *name,FUNC *r);
+void gen_searchf_searchonly(char *name,FUNC *r,int global);
 LIST eval_arg(FNODE a,unsigned int quote);
 
 pointer eval(FNODE f)
@@ -95,17 +91,8 @@ pointer eval(FNODE f)
 	RANGE range;
 	QUOTE expr,pattern;
 
-#if defined(VISUAL)
-	if ( recv_intr ) {
-#include <signal.h>
-		if ( recv_intr == 1 ) {
-			recv_intr = 0;
-			int_handler(SIGINT);
-		} else {
-			recv_intr = 0;
-			ox_usr1_handler(0);
-		}
-	}
+#if defined(VISUAL) || defined(__MINGW32__)
+	check_intr();
 #endif
 	if ( !f )
 		return ( 0 );
@@ -196,7 +183,7 @@ pointer eval(FNODE f)
 			val = eval_rec_mapf((FUNC)FA0(f),(FNODE)FA1(f)); break;
 		case I_IFUNC:
 			val = evalif((FNODE)FA0(f),(FNODE)FA1(f),(FNODE)FA2(f)); break;
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 		case I_TIMER:
 			{
 				int interval;
@@ -733,15 +720,9 @@ pointer evalstat(SNODE f)
 		case S_BP:
 			if ( !nextbp && (!FA1(f) || eval((FNODE)FA1(f))) ) {
 				if ( (FNODE)FA2(f) ) {
-#if defined(PARI)
-					pari_outfile = stderr;
-#endif
 					asir_out = stderr;
 					printexpr(CO,eval((FNODE)FA2(f)));
 					putc('\n',asir_out); fflush(asir_out);
-#if defined(PARI)
-					pari_outfile = stdout;
-#endif
 					asir_out = stdout;
 				} else {
 					nextbp = 1; nextbplevel = 0; 
@@ -882,7 +863,7 @@ pointer evalf(FUNC f,FNODE a,FNODE opt)
 	FUNC f1;
 
 	if ( f->id == A_UNDEF ) {
-		gen_searchf_searchonly(f->fullname,&f1);
+		gen_searchf_searchonly(f->fullname,&f1,0);
 		if ( f1->id == A_UNDEF ) {
 			sprintf(errbuf,"evalf : %s undefined",NAME(f));
 			error(errbuf);
@@ -917,6 +898,7 @@ pointer evalf(FUNC f,FNODE a,FNODE opt)
 			} else
 				opts = 0;
 			if ( !n ) {
+				current_option = opts;
 				cur_binf = f;
 				(*f->f.binf)(&val);
 			} else {
@@ -935,7 +917,7 @@ pointer evalf(FUNC f,FNODE a,FNODE opt)
 			break;
 		case A_USR:
 			/* stack check */
-#if !defined(VISUAL) && !defined(__CYGWIN__)
+#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__CYGWIN__)
 			if ( !stack_size ) {
 				struct rlimit rl;
 				getrlimit(RLIMIT_STACK,&rl);
@@ -987,6 +969,7 @@ pointer evalf(FUNC f,FNODE a,FNODE opt)
 			for ( tn = f->f.usrf->args, sn = BDY(args); 
 				sn; tn = NEXT(tn), sn = NEXT(sn) )
 				ASSPV((int)FA0((FNODE)BDY(tn)),BDY(sn));
+			f_return = f_break = f_continue = 0;
 			if ( f->f.usrf->module ) {
 				prev_mpvs = MPVS;
 				MPVS = f->f.usrf->module->pvs;
@@ -995,6 +978,8 @@ pointer evalf(FUNC f,FNODE a,FNODE opt)
 			} else
 				val = evalstat((SNODE)BDY(f->f.usrf)); 
 			f_return = f_break = f_continue = 0; poppvs(); 
+			if ( PVSS )
+        		evalstatline = ((VS)BDY(PVSS))->at;
 			break;
 		case A_PURE:
 			args = (LIST)eval(a);
@@ -1163,6 +1148,7 @@ pointer bevalf(FUNC f,NODE a)
 	}
 	switch ( f->id ) {
 		case A_BIN:
+			current_option = 0;
 			if ( !n ) {
 				cur_binf = f;
 				(*f->f.binf)(&val);
@@ -1195,6 +1181,7 @@ pointer bevalf(FUNC f,NODE a)
 			for ( tn = f->f.usrf->args, sn = a; 
 				sn; tn = NEXT(tn), sn = NEXT(sn) )
 				ASSPV((int)FA0((FNODE)BDY(tn)),BDY(sn));
+			f_return = f_break = f_continue = 0;
 			if ( f->f.usrf->module ) {
 				prev_mpvs = MPVS;
 				MPVS = f->f.usrf->module->pvs;
@@ -1273,6 +1260,7 @@ pointer bevalf_with_opts(FUNC f,NODE a,NODE opts)
 			for ( tn = f->f.usrf->args, sn = a; 
 				sn; tn = NEXT(tn), sn = NEXT(sn) )
 				ASSPV((int)FA0((FNODE)BDY(tn)),BDY(sn));
+			f_return = f_break = f_continue = 0;
 			if ( f->f.usrf->module ) {
 				prev_mpvs = MPVS;
 				MPVS = f->f.usrf->module->pvs;
@@ -1337,7 +1325,7 @@ pointer evalpf(PF pf,NODE args,NODE dargs)
 		simplify_ins(ins,&s);
 	} else {
 		s = pf->body;
-		if ( dnode ) {
+		if ( dargs ) {
 			for ( i = 0, dnode = dargs; dnode; dnode = NEXT(dnode), i++ ) {
 				di = QTOS((Q)dnode->body);
 				for ( j = 0; j < di; j++ ) {
@@ -1428,10 +1416,9 @@ void gen_searchf(char *name,FUNC *r)
 	*r = val;
 }
 
-void gen_searchf_searchonly(char *name,FUNC *r)
+void gen_searchf_searchonly(char *name,FUNC *r,int global)
 {
 	FUNC val = 0;
-	int global = 0;
 	if ( *name == ':' ) {
 		global = 1;
 		name += 2;
@@ -1645,7 +1632,7 @@ MODULE mkmodule(char *name)
 		mod->name = (char *)MALLOC_ATOMIC(len+1);
 		strcpy(mod->name,name);
 		mod->pvs = mpvs = (VS)MALLOC(sizeof(struct oVS));
-		reallocarray((char **)&mpvs->va,(int *)&mpvs->asize,
+		asir_reallocarray((char **)&mpvs->va,(int *)&mpvs->asize,
 			(int *)&mpvs->n,(int)sizeof(struct oPV));
 		mod->usrf_list = 0;
 		MKNODE(m,mod,MODULE_LIST);