===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.65
retrieving revision 1.67
diff -u -p -r1.65 -r1.67
--- OpenXM_contrib2/asir2000/parse/eval.c	2009/03/04 09:15:36	1.65
+++ OpenXM_contrib2/asir2000/parse/eval.c	2010/05/24 01:59:52	1.67
@@ -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.66 2010/04/23 04:44:52 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -987,6 +987,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 +996,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);
@@ -1195,6 +1198,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 +1277,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;