===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.10
retrieving revision 1.13
diff -u -p -r1.10 -r1.13
--- OpenXM_contrib2/asir2000/parse/eval.c	2001/08/21 01:39:39	1.10
+++ OpenXM_contrib2/asir2000/parse/eval.c	2001/09/03 07:01:10	1.13
@@ -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.9 2001/08/20 09:50:34 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.12 2001/09/03 01:04:28 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -82,8 +82,10 @@ FNODE f;
 	FNODE f1;
 	UP2 up2;
 	UP up;
+	UM um;
 	GF2N gf2n;
 	GFPN gfpn;
+	GFSN gfsn;
 
 #if defined(VISUAL)
 	if ( recv_intr ) {
@@ -259,12 +261,20 @@ FNODE f;
 			break;
 		case I_GFPNGEN:
 			up = UPALLOC(1);
-			up->d=1;
-			up->c[0] = 0;
-			up->c[1] = (Num)ONELM;
+			DEG(up)=1;
+			COEF(up)[0] = 0;
+			COEF(up)[1] = (Num)ONELM;
 			MKGFPN(up,gfpn);
 			val = (pointer)gfpn;
 			break;
+		case I_GFSNGEN:
+			um = UMALLOC(1);
+			DEG(um) = 1;
+			COEF(um)[0] = 0;
+			COEF(um)[1] = _onesf();
+			MKGFSN(um,gfsn);
+			val = (pointer)gfsn;
+			break;
 		case I_STR:
 			MKSTR(str,FA0(f)); val = (pointer)str; break;
 		case I_FORMULA:
@@ -445,9 +455,11 @@ FNODE opt;
 	LIST args;
 	pointer val;
 	int i,n,level;
-	NODE tn,sn,opts;
+	NODE tn,sn,opts,opt1;
     VS pvs;
 	char errbuf[BUFSIZ];
+	static int stack_size;
+	static void *stack_base;
 
 	if ( f->id == A_UNDEF ) {
 		sprintf(errbuf,"evalf : %s undefined",NAME(f));
@@ -479,10 +491,32 @@ FNODE opt;
 			cur_binf = 0;
 			break;
 		case A_USR:
+			/* stack check */
+#if !defined(VISUAL)
+			if ( !stack_size ) {
+				struct rlimit rl;
+				getrlimit(RLIMIT_STACK,&rl);
+				stack_size = rl.rlim_cur;
+			}
+			if ( !stack_base )
+				stack_base = (void *)GC_get_stack_base();
+			if ( (stack_base - (void *)&args) +0x100000 > stack_size )
+				error("stack overflow");
+#endif
 			args = (LIST)eval(a);
-			if ( opt )
+			if ( opt ) {
 				opts = BDY((LIST)eval(opt));
-			else
+				/* 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;
     		pvs = f->f.usrf->pvs;
     		if ( PVSS ) {
@@ -767,6 +801,24 @@ NODE *dnp;
 	NEXT(n) = 0; *dnp = n0;
 }
 
+void gen_searchf(name,r)
+char *name;
+FUNC *r;
+{
+	FUNC val;
+
+	searchf(sysf,name,&val);
+	if ( !val )
+		searchf(ubinf,name,&val);
+	if ( !val )
+		searchpf(name,&val);
+	if ( !val )
+		searchf(usrf,name,&val);
+	if ( !val )
+		appenduf(name,&val);
+	*r = val;
+}
+
 void searchf(fn,name,r)
 NODE fn;
 char *name;
@@ -863,14 +915,21 @@ char *key;
 {
 	NODE opts,opt;
 	Obj value;
+	LIST r;
 	extern Obj VOIDobj;
 
 	opts = CPVS->opt;
-	for ( ; opts; opts = NEXT(opts) ) {
-		opt = BDY((LIST)BDY(opts));
-		if ( !strcmp(key,BDY((STRING)BDY(opt))) )
-			return (Obj)BDY(NEXT(opt));
+	if ( !key ) {
+		MKLIST(r,opts);
+		return (Obj)r;
+	} else {
+		for ( ; opts; opts = NEXT(opts) ) {
+			asir_assert(BDY(opts),O_LIST,"getopt_from_cvps");
+			opt = BDY((LIST)BDY(opts));
+			if ( !strcmp(key,BDY((STRING)BDY(opt))) )
+				return (Obj)BDY(NEXT(opt));
+		}
+		return VOIDobj;
 	}
-	return VOIDobj;
 
 }