===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.32
retrieving revision 1.35
diff -u -p -r1.32 -r1.35
--- OpenXM_contrib2/asir2000/parse/eval.c	2004/04/30 08:25:38	1.32
+++ OpenXM_contrib2/asir2000/parse/eval.c	2004/07/07 07:40:19	1.35
@@ -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.31 2004/02/09 08:23:30 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.34 2004/06/21 09:05:16 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -306,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); 
@@ -454,7 +452,6 @@ extern NODE PVSS;
 pointer evalf(FUNC f,FNODE a,FNODE opt)
 {
 	LIST args;
-	OPTLIST optlist;
 	pointer val;
 	int i,n,level;
 	NODE tn,sn,opts,opt1,dmy;
@@ -495,12 +492,7 @@ pointer evalf(FUNC f,FNODE a,FNODE opt)
 				(*f->f.binf)(&val);
 			} else {
 				args = (LIST)eval(a);
-				if ( opts ) {
-					NEWOPTLIST(optlist);
-					BDY(optlist) = opts;
-					appendtonode(BDY(args),(pointer)optlist,&dmy);
-					if ( !BDY(args) ) BDY(args) = dmy;
-				}
+				current_option = opts;
 				cur_binf = f;
 				(*f->f.binf)(args?BDY(args):0,&val);
 			}
@@ -869,6 +861,27 @@ void gen_searchf(char *name,FUNC *r)
 		searchuf(name,&val);
 	if ( !val )
 		appenduf(name,&val);
+	*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;
 }