===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.28
retrieving revision 1.37
diff -u -p -r1.28 -r1.37
--- OpenXM_contrib2/asir2000/parse/eval.c	2003/05/24 10:42:18	1.28
+++ OpenXM_contrib2/asir2000/parse/eval.c	2004/11/22 02:26:56	1.37
@@ -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.27 2003/05/20 06:15:01 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.36 2004/10/27 08:21:47 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -84,6 +84,7 @@ pointer eval(FNODE f)
 	GF2N gf2n;
 	GFPN gfpn;
 	GFSN gfsn;
+	RANGE range;
 
 #if defined(VISUAL)
 	if ( recv_intr ) {
@@ -305,8 +306,6 @@ pointer eval(FNODE f)
 				MKLIST(t,NEXT(BDY((LIST)a))); val = (pointer)t;
 			}
 			break;
-		case I_PROC:
-			val = (pointer)FA0(f); break;
 		case I_INDEX:
 			a = eval((FNODE)FA0(f)); ind = (NODE)FA1(f);
 			evalnodebody(ind,&tn); getarray(a,tn,&val); 
@@ -455,8 +454,8 @@ pointer evalf(FUNC f,FNODE a,FNODE opt)
 	LIST args;
 	pointer val;
 	int i,n,level;
-	NODE tn,sn,opts,opt1;
-    VS pvs,prev_mpvs;
+	NODE tn,sn,opts,opt1,dmy;
+    	VS pvs,prev_mpvs;
 	char errbuf[BUFSIZ];
 	static unsigned int stack_size;
 	static void *stack_base;
@@ -465,6 +464,10 @@ pointer evalf(FUNC f,FNODE a,FNODE opt)
 		sprintf(errbuf,"evalf : %s undefined",NAME(f));
 		error(errbuf);
 	}
+	if ( getsecuremode() && !PVSS && !f->secure ) {
+		sprintf(errbuf,"evalf : %s not permitted",NAME(f));
+		error(errbuf);
+	}
 	if ( f->id != A_PARI ) {
 		for ( i = 0, tn = a?(NODE)FA0(a):0; tn; i++, tn = NEXT(tn) );
 		if ( ((n = f->argc)>= 0 && i != n) || (n < 0 && i > -n) ) {
@@ -474,11 +477,26 @@ pointer evalf(FUNC f,FNODE a,FNODE opt)
 	}
 	switch ( f->id ) {
 		case A_BIN:
+			if ( opt ) {
+				opts = BDY((LIST)eval(opt));
+				/* opts = ["opt1",arg1],... */
+				opt1 = BDY((LIST)BDY(opts));
+				if ( !strcmp(BDY((STRING)BDY(opt1)),"option_list") ) {
+					/*
+					 * the special option specification:
+					 *  option_list=[["o1","a1"],...]
+					 */
+					asir_assert(BDY(NEXT(opt1)),O_LIST,"evalf");
+					opts = BDY((LIST)BDY(NEXT(opt1)));
+				}
+			} else
+				opts = 0;
 			if ( !n ) {
 				cur_binf = f;
 				(*f->f.binf)(&val);
 			} else {
 				args = (LIST)eval(a);
+				current_option = opts;
 				cur_binf = f;
 				(*f->f.binf)(args?BDY(args):0,&val);
 			}
@@ -680,6 +698,10 @@ pointer bevalf(FUNC f,NODE a)
 		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) ) {
@@ -830,8 +852,12 @@ void searchuf(char *name,FUNC *r)
 void gen_searchf(char *name,FUNC *r)
 {
 	FUNC val = 0;
-
-	if ( CUR_MODULE )
+	int global = 0;
+	if ( *name == ':' ) {
+		global = 1;
+		name += 2;
+	}
+	if ( CUR_MODULE && !global )
 		searchf(CUR_MODULE->usrf_list,name,&val);
 	if ( !val )
 		searchf(sysf,name,&val);
@@ -846,6 +872,27 @@ void gen_searchf(char *name,FUNC *r)
 	*r = val;
 }
 
+void gen_searchf_searchonly(char *name,FUNC *r)
+{
+	FUNC val = 0;
+	int global = 0;
+	if ( *name == ':' ) {
+		global = 1;
+		name += 2;
+	}
+	if ( CUR_MODULE && !global )
+		searchf(CUR_MODULE->usrf_list,name,&val);
+	if ( !val )
+		searchf(sysf,name,&val);
+	if ( !val )
+		searchf(ubinf,name,&val);
+	if ( !val )
+		searchpf(name,&val);
+	if ( !val )
+		searchuf(name,&val);
+	*r = val;
+}
+
 void searchf(NODE fn,char *name,FUNC *r)
 {
 	NODE tn;
@@ -941,6 +988,8 @@ void mkuf(char *name,char *fname,NODE args,SNODE body,
 	char *longname;
 	int argc;
 
+	if ( *name == ':' )
+		name += 2;
 	if ( !module ) {
 		searchf(sysf,name,&f);
 		if ( f ) {