=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v retrieving revision 1.76 retrieving revision 1.78 diff -u -p -r1.76 -r1.78 --- OpenXM_contrib2/asir2000/parse/eval.c 2017/02/07 08:30:31 1.76 +++ OpenXM_contrib2/asir2000/parse/eval.c 2018/03/27 06:29:19 1.78 @@ -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.75 2016/08/24 08:21:03 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.77 2017/08/31 02:36:21 noro Exp $ */ #include #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; @@ -168,6 +169,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 +298,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: