===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.52
retrieving revision 1.59
diff -u -p -r1.52 -r1.59
--- OpenXM_contrib2/asir2000/parse/eval.c	2005/10/19 04:52:59	1.52
+++ OpenXM_contrib2/asir2000/parse/eval.c	2005/12/11 07:21:43	1.59
@@ -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.51 2005/10/12 03:31:04 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.58 2005/12/11 05:27:30 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -65,6 +65,7 @@ int evalstatline;
 int recv_intr;
 int show_crossref;
 void gen_searchf_searchonly(char *name,FUNC *r);
+LIST eval_arg(FNODE a,unsigned int quote);
 
 pointer eval(FNODE f)
 {
@@ -178,6 +179,9 @@ pointer eval(FNODE f)
 			val = evalf((FUNC)FA0(f),(FNODE)FA1(f),0); break;
 		case I_FUNC_OPT:
 			val = evalf((FUNC)FA0(f),(FNODE)FA1(f),(FNODE)FA2(f)); break;
+		case I_FUNC_QARG:
+			tn = BDY(eval_arg((FNODE)FA1(f),(unsigned int)0xffffffff));
+			val = bevalf((FUNC)FA0(f),tn); break;
 		case I_PFDERIV:
 			val = evalf_deriv((FUNC)FA0(f),(FNODE)FA1(f),(FNODE)FA2(f)); break;
 		case I_MAP:
@@ -445,6 +449,8 @@ FNODE fnode_to_bin(FNODE f,int dir)
 		case I_NARYOP: 
 			fun = (ARF)FA0(f);
 			len = length((NODE)FA1(f));
+			if ( len==1 ) return BDY((NODE)(FA1(f)));
+
 			arg = (FNODE *)ALLOCA(len*sizeof(FNODE));
 			for ( i = 0, t = (NODE)FA1(f); i < len; i++, t = NEXT(t) )
 				arg[i] = fnode_to_bin((FNODE)BDY(t),dir);
@@ -506,7 +512,10 @@ FNODE partial_eval(FNODE f)
 {
 	FNODE a0,a1,a2;
 	NODE n;
+	Obj obj;
+	QUOTE q;
 	pointer val;
+	FUNC func;
 
 	if ( !f )
 		return f;
@@ -538,10 +547,20 @@ FNODE partial_eval(FNODE f)
 			return mkfnode(3,f->id,a0,a1,a2);
 			break;
 
-		/* function */
+		/* XXX : function is evaluated with QUOTE args */
 		case I_FUNC:
 			a1 = partial_eval((FNODE)FA1(f));
-			return mkfnode(2,f->id,FA0(f),a1);
+			func = (FUNC)FA0(f);
+			if ( func->id == A_UNDEF || func->id != A_USR ) {
+				a1 =  mkfnode(2,I_FUNC,func,a1);
+				return a1;
+			} else {
+				n = BDY(eval_arg(a1,(unsigned int)0xffffffff));
+				obj = bevalf(func,n);
+				objtoquote(obj,&q);
+				return BDY(q);
+			}
+			break;
 
 		case I_LIST: case I_EV:
 			n = partial_eval_node((NODE)FA0(f));
@@ -575,10 +594,10 @@ NODE partial_eval_node(NODE n)
 	return r0;
 }
 
-NODE rewrite_fnode_node(NODE n,NODE arg);
-FNODE rewrite_fnode(FNODE f,NODE arg);
+NODE rewrite_fnode_node(NODE n,NODE arg,int qarg);
+FNODE rewrite_fnode(FNODE f,NODE arg,int qarg);
 
-FNODE rewrite_fnode(FNODE f,NODE arg)
+FNODE rewrite_fnode(FNODE f,NODE arg,int qarg)
 {
 	FNODE a0,a1,a2,value;
 	NODE n,t,pair;
@@ -590,39 +609,39 @@ FNODE rewrite_fnode(FNODE f,NODE arg)
 	switch ( f->id ) {
 		case I_NOT: case I_PAREN: case I_MINUS:
 		case I_CAR: case I_CDR:
-			a0 = rewrite_fnode((FNODE)FA0(f),arg);
+			a0 = rewrite_fnode((FNODE)FA0(f),arg,qarg);
 			return mkfnode(1,f->id,a0);
 
 		case I_BOP: case I_COP: case I_LOP:
-			a1 = rewrite_fnode((FNODE)FA1(f),arg);
-			a2 = rewrite_fnode((FNODE)FA2(f),arg);
+			a1 = rewrite_fnode((FNODE)FA1(f),arg,qarg);
+			a2 = rewrite_fnode((FNODE)FA2(f),arg,qarg);
 			return mkfnode(3,f->id,FA0(f),a1,a2);
 
 		case I_AND: case I_OR:
-			a0 = rewrite_fnode((FNODE)FA0(f),arg);
-			a1 = rewrite_fnode((FNODE)FA1(f),arg);
+			a0 = rewrite_fnode((FNODE)FA0(f),arg,qarg);
+			a1 = rewrite_fnode((FNODE)FA1(f),arg,qarg);
 			return mkfnode(2,f->id,a0,a1);
 
 		/* ternary operators */
 		case I_CE:
-			a0 = rewrite_fnode((FNODE)FA0(f),arg);
-			a1 = rewrite_fnode((FNODE)FA1(f),arg);
-			a2 = rewrite_fnode((FNODE)FA2(f),arg);
+			a0 = rewrite_fnode((FNODE)FA0(f),arg,qarg);
+			a1 = rewrite_fnode((FNODE)FA1(f),arg,qarg);
+			a2 = rewrite_fnode((FNODE)FA2(f),arg,qarg);
 			return mkfnode(3,f->id,a0,a1,a2);
 			break;
 
 		/* nary operators */
 		case I_NARYOP:
-			n = rewrite_fnode_node((NODE)FA1(f),arg);
+			n = rewrite_fnode_node((NODE)FA1(f),arg,qarg);
 			return mkfnode(2,f->id,FA0(f),n);
 
 		/* and function */
 		case I_FUNC:
-			a1 = rewrite_fnode((FNODE)FA1(f),arg);
-			return mkfnode(2,f->id,FA0(f),a1);
+			a1 = rewrite_fnode((FNODE)FA1(f),arg,qarg);
+			return mkfnode(2,qarg?I_FUNC_QARG:f->id,FA0(f),a1);
 
 		case I_LIST: case I_EV:
-			n = rewrite_fnode_node((NODE)FA0(f),arg);
+			n = rewrite_fnode_node((NODE)FA0(f),arg,qarg);
 			return mkfnode(1,f->id,n);
 
 		case I_STR: case I_FORMULA:
@@ -633,7 +652,8 @@ FNODE rewrite_fnode(FNODE f,NODE arg)
 			pv = (int)FA0(f);
 			for ( t = arg; t; t = NEXT(t) ) {
 				pair = (NODE)BDY(t);
-				ind = (int)BDY(pair); value = (FNODE)BDY(NEXT(pair));
+				ind = (int)BDY(pair);
+				value = (FNODE)BDY(NEXT(pair));
 				if ( pv == ind )
 					return value;
 			}
@@ -645,13 +665,13 @@ FNODE rewrite_fnode(FNODE f,NODE arg)
 	}
 }
 
-NODE rewrite_fnode_node(NODE n,NODE arg)
+NODE rewrite_fnode_node(NODE n,NODE arg,int qarg)
 {
 	NODE r0,r,t;
 
 	for ( r0 = 0, t = n; t; t = NEXT(t) ) {
 		NEXTNODE(r0,r);
-		BDY(r) = rewrite_fnode((FNODE)BDY(t),arg);
+		BDY(r) = rewrite_fnode((FNODE)BDY(t),arg,qarg);
 	}
 	if ( r0 ) NEXT(r) = 0;
 	return r0;
@@ -1209,7 +1229,7 @@ pointer evalif(FNODE f,FNODE a)
 pointer evalpf(PF pf,NODE args,NODE dargs)
 {
 	Obj s,s1;
-	int i;
+	int i,di,j;
 	NODE node,dnode;
 	PFINS ins;
 	PFAD ad;
@@ -1228,8 +1248,16 @@ pointer evalpf(PF pf,NODE args,NODE dargs)
 		}
 		simplify_ins(ins,&s);
 	} else {
-		for ( i = 0, s = pf->body, node = args; 
-			node; node = NEXT(node), i++ ) {
+		s = pf->body;
+		if ( dnode ) {
+			for ( i = 0, dnode = dargs; dnode; dnode = NEXT(dnode), i++ ) {
+				di = QTOS((Q)dnode->body);
+				for ( j = 0; j < di; j++ ) {
+					derivr(CO,s,pf->args[i],&s1); s = s1;
+				}
+			}
+		}
+		for ( i = 0, node = args; node; node = NEXT(node), i++ ) {
 			substr(CO,0,s,pf->args[i],(Obj)node->body,&s1); s = s1;
 		}
 	}