===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.75
retrieving revision 1.79
diff -u -p -r1.75 -r1.79
--- OpenXM_contrib2/asir2000/parse/eval.c	2016/08/24 08:21:03	1.75
+++ OpenXM_contrib2/asir2000/parse/eval.c	2018/03/28 05:27:22	1.79
@@ -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.74 2015/08/14 13:51:56 fujimoto Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.78 2018/03/27 06:29:19 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -61,6 +61,7 @@
 extern JMP_BUF timer_env;
 extern FUNC cur_binf;
 extern NODE PVSS;
+extern int evalef;
 
 int f_break,f_return,f_continue;
 int evalstatline;
@@ -79,7 +80,7 @@ pointer eval(FNODE f)
 	R u;
 	DP dp;
 	unsigned int pv;
-	int c,ret;
+	int c,ret,pos;
 	FNODE f1;
 	UP2 up2;
 	UP up;
@@ -90,6 +91,7 @@ pointer eval(FNODE f)
 	GFSN gfsn;
 	RANGE range;
 	QUOTE expr,pattern;
+	Q q;
 
 #if defined(VISUAL) || defined(__MINGW32__)
 	check_intr();
@@ -168,6 +170,9 @@ pointer eval(FNODE f)
 		case I_EV:
 			evalnodebody((NODE)FA0(f),&tn); nodetod(tn,&dp); val = (pointer)dp;
 			break;
+		case I_EVM:
+			evalnodebody((NODE)FA0(f),&tn); pos = eval((FNODE)FA1(f)); nodetodpm(tn,pos,&dp); val = (pointer)dp;
+			break;
 		case I_FUNC:
 			val = evalf((FUNC)FA0(f),(FNODE)FA1(f),0); break;
 		case I_FUNC_OPT:
@@ -294,7 +299,8 @@ pointer eval(FNODE f)
 		case I_STR:
 			MKSTR(str,FA0(f)); val = (pointer)str; break;
 		case I_FORMULA:
-			 val = FA0(f); break;
+			val = FA0(f); 
+			break;
 		case I_LIST:
 			evalnodebody((NODE)FA0(f),&tn); MKLIST(t,tn); val = (pointer)t; break;
 		case I_CONS:
@@ -757,15 +763,15 @@ pointer evalstat(SNODE f)
 			}
 			break;
 		case S_BREAK:
-			if ( GPVS != CPVS )
+			if ( 1 || GPVS != CPVS )
 				f_break = 1; 
 			break;
 		case S_CONTINUE:
-			if ( GPVS != CPVS )
+			if ( 1 || GPVS != CPVS )
 				f_continue = 1; 
 			break;
 		case S_RETURN:
-			if ( GPVS != CPVS ) {
+			if ( 1 || GPVS != CPVS ) {
 				val = eval((FNODE)FA0(f)); f_return = 1;
 			}
 			break;
@@ -1632,7 +1638,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);