===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.36
retrieving revision 1.41
diff -u -p -r1.36 -r1.41
--- OpenXM_contrib2/asir2000/parse/eval.c	2004/10/27 08:21:47	1.36
+++ OpenXM_contrib2/asir2000/parse/eval.c	2005/09/13 06:40:46	1.41
@@ -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.35 2004/07/07 07:40:19 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.40 2005/07/27 04:35:11 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -71,11 +71,11 @@ pointer eval(FNODE f)
 	STRING str;
 	pointer val = 0;
 	pointer a,a1,a2;
-	NODE tn,ind;
+	NODE tn,ind,match;
 	R u;
 	DP dp;
 	unsigned int pv;
-	int c;
+	int c,ret;
 	FNODE f1;
 	UP2 up2;
 	UP up;
@@ -85,6 +85,7 @@ pointer eval(FNODE f)
 	GFPN gfpn;
 	GFSN gfsn;
 	RANGE range;
+	QUOTE expr,pattern;
 
 #if defined(VISUAL)
 	if ( recv_intr ) {
@@ -173,6 +174,16 @@ pointer eval(FNODE f)
 			val = evalmapf((FUNC)FA0(f),(FNODE)FA1(f)); break;
 		case I_RECMAP:
 			val = eval_rec_mapf((FUNC)FA0(f),(FNODE)FA1(f)); break;
+		case I_UNIFY:
+			MKQUOTE(expr,(FNODE)FA0(f));
+			MKQUOTE(pattern,(FNODE)FA1(f));
+			ret = quote_unify(expr,pattern,&match);
+			if ( !ret ) val = 0;
+			else {
+				do_assign(match);
+				val = (pointer)ONE;
+			}
+			break;
 		case I_IFUNC:
 			val = evalif((FNODE)FA0(f),(FNODE)FA1(f)); break;
 #if !defined(VISUAL)
@@ -223,7 +234,9 @@ pointer eval(FNODE f)
 				error("-- : not implemented yet");
 			break;
 		case I_PVAR:
-			pv = (unsigned int)FA0(f); ind = (NODE)FA1(f); GETPV(pv,a); 
+			pv = (unsigned int)FA0(f);
+			ind = (NODE)FA1(f);
+			GETPV(pv,a); 
 			if ( !ind )
 				val = a;
 			else {
@@ -428,6 +441,13 @@ pointer evalstat(SNODE f)
 					break;
 			}
 			f_break = 0; break;
+		case S_MODULE:
+			CUR_MODULE = (MODULE)FA0(f);
+			if ( CUR_MODULE )
+					MPVS = CUR_MODULE->pvs;
+			else
+					MPVS = 0;
+			break;
 		default:
 			error("evalstat : unknown id");
 			break;
@@ -691,13 +711,17 @@ pointer bevalf(FUNC f,NODE a)
 	pointer val;
 	int i,n;
 	NODE tn,sn;
-    VS pvs;
+    VS pvs,prev_mpvs;
 	char errbuf[BUFSIZ];
 
 	if ( f->id == A_UNDEF ) {
 		sprintf(errbuf,"bevalf : %s undefined",NAME(f));
 		error(errbuf);
 	}
+	if ( getsecuremode() && !PVSS && !f->secure ) {
+		sprintf(errbuf,"bevalf : %s not permitted",NAME(f));
+		error(errbuf);
+	}
 	if ( f->id != A_PARI ) {
 		for ( i = 0, tn = a; tn; i++, tn = NEXT(tn) );
 		if ( ((n = f->argc)>= 0 && i != n) || (n < 0 && i > -n) ) {
@@ -739,7 +763,13 @@ 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));
-			val = evalstat((SNODE)BDY(f->f.usrf)); 
+			if ( f->f.usrf->module ) {
+				prev_mpvs = MPVS;
+				MPVS = f->f.usrf->module->pvs;
+				val = evalstat((SNODE)BDY(f->f.usrf)); 
+				MPVS = prev_mpvs;
+			} else
+				val = evalstat((SNODE)BDY(f->f.usrf)); 
 			f_return = f_break = f_continue = 0; poppvs(); 
 			break;
 		case A_PURE:
@@ -756,11 +786,15 @@ pointer bevalf(FUNC f,NODE a)
 pointer evalif(FNODE f,FNODE a)
 {
 	Obj g;
+	FNODE t;
 
 	g = (Obj)eval(f);
 	if ( g && (OID(g) == O_P) && (VR((P)g)->attr == (pointer)V_SR) )
 		return evalf((FUNC)VR((P)g)->priv,a,0);
-	else {
+	else if ( g && OID(g) == O_QUOTEARG && ((QUOTEARG)g)->type == A_func ) {
+		t = mkfnode(2,I_FUNC,((QUOTEARG)g)->body,a);
+		return eval(t);
+	} else {
 		error("invalid function pointer");
 		/* NOTREACHED */
 		return (pointer)-1;
@@ -984,6 +1018,9 @@ void mkuf(char *name,char *fname,NODE args,SNODE body,
 	char *longname;
 	int argc;
 
+	if ( getsecuremode() ) {
+		error("defining function is not permitted in the secure mode");
+	}
 	if ( *name == ':' )
 		name += 2;
 	if ( !module ) {