===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/pf.c,v
retrieving revision 1.9
retrieving revision 1.18
diff -u -p -r1.9 -r1.18
--- OpenXM_contrib2/asir2000/builtin/pf.c	2004/12/17 03:09:08	1.9
+++ OpenXM_contrib2/asir2000/builtin/pf.c	2013/06/14 04:47:17	1.18
@@ -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/builtin/pf.c,v 1.8 2004/06/27 03:15:57 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/pf.c,v 1.17 2011/09/14 06:41:20 noro Exp $ 
 */
 #include "ca.h"
 #include "math.h"
@@ -62,20 +62,23 @@ void make_itri(void);
 void make_tri(void);
 void make_exp(void);
 void simplify_pow(PFINS,Obj *);
+FNODE partial_eval(FNODE f);
 
-void Pfunctor(),Pargs(),Pfunargs(),Pvtype(),Pcall(),Pdeval();
+void Pfunctor(),Pargs(),Pfunargs(),Pvtype(),Pcall(),Pdeval(),Pfunargs_ext();
 void Pregister_handler();
 void Peval_quote();
-void Pmapat();
+void Pmapat(), Pmap();
 void Padd_handler();
 void Plist_handler();
 void Pclear_handler();
 
 struct ftab puref_tab[] = {
 	{"mapat",Pmapat,-99999999},
+	{"map",Pmap,-99999999},
 	{"functor",Pfunctor,1},
 	{"args",Pargs,1},
 	{"funargs",Pfunargs,1},
+	{"funargs_ext",Pfunargs_ext,1},
 	{"register_handler",Pregister_handler,1},
 	{"add_handler",Padd_handler,2},
 	{"list_handler",Plist_handler,1},
@@ -83,7 +86,7 @@ struct ftab puref_tab[] = {
 	{"call",Pcall,2},
 	{"vtype",Pvtype,1},
 	{"deval",Pdeval,1},
-	{"eval_quote",Peval_quote,1},
+	{"eval_quote",Peval_quote,-2},
 	{0,0,0},
 };
 
@@ -306,8 +309,8 @@ Obj *rp;
 }
 
 #define ISPFINS(p)\
-(p)&&(ID(p) == O_P)&&((int)VR((P)p)->attr!=V_PF)&&\
-UNIQ(DEG(DC((P)p)))&&UNIQ(COEF(DC((P)p)))
+((p)&&(ID(p) == O_P)&&((int)VR((P)p)->attr==V_PF)&&\
+UNIQ(DEG(DC((P)p)))&&UNIQ(COEF(DC((P)p))))
 
 void Pfunctor(arg,rp)
 NODE arg;
@@ -386,6 +389,43 @@ LIST *rp;
 	}
 }
 
+void Pfunargs_ext(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	P p;
+	P f;
+	FUNC t;
+	PF pf;
+	PFINS ins;
+	PFAD ad;
+	NODE n,n0,d,d0,a,a0;
+	LIST alist,dlist;
+	Q q;
+	int i;
+
+	p = (P)ARG0(arg);
+	if ( !ISPFINS(p) )
+		*rp = 0;
+	else {
+		ins = (PFINS)VR(p)->priv; ad = ins->ad; pf = ins->pf;
+		t = (FUNC)MALLOC(sizeof(struct oFUNC));
+		t->name = t->fullname = pf->name; t->id = A_PURE; t->argc = pf->argc;
+		t->f.puref = pf;
+		makesrvar(t,&f);
+
+		d0 = a0 = 0;
+		for ( i = 0; i < pf->argc; i++ ) {
+			NEXTNODE(d0,d); STOQ(ad[i].d,q); BDY(d) = (pointer)q;
+			NEXTNODE(a0,a); BDY(a) = (pointer)ad[i].arg;
+		}
+		NEXT(d) = 0; NEXT(a) = 0; MKLIST(alist,a0); MKLIST(dlist,d0);
+
+		n0 = mknode(3,f,dlist,alist);
+		MKLIST(*rp,n0);	
+	}
+}
+
 void Pvtype(arg,rp)
 NODE arg;
 Q *rp;
@@ -525,6 +565,11 @@ void Pcall(NODE arg,Obj *rp)
 {
 	P p;
 	V v;
+    NODE n,n1;
+    LIST list;
+    VECT vect;
+    pointer *a;
+    int len,i;
 
 	p = (P)ARG0(arg);
 	if ( !p || OID(p) != 2 )
@@ -532,9 +577,26 @@ void Pcall(NODE arg,Obj *rp)
 	v = VR(p);
 	if ( (int)v->attr != V_SR )	
 		error("call : no such function");
-
-	else
-		*rp = (Obj)bevalf((FUNC)v->priv,BDY((LIST)ARG1(arg)));
+	else {
+        list = (LIST) ARG1(arg);
+        if ( list ) {
+            switch (OID(list)) {
+            case O_VECT:
+                vect = (VECT)list; len = vect->len; a = BDY(vect);
+                for ( i = len - 1, n = 0; i >= 0; i-- ) {
+                    MKNODE(n1,a[i],n); n = n1;
+                }
+                MKLIST(list,n);
+                /* falling next case */
+            case O_LIST:
+                *rp = (Obj)bevalf_with_opts((FUNC)v->priv,BDY(list),current_option);
+                return;
+            default:
+                break;
+            }
+        }           
+        error("call : invalid argument");
+	}
 }
 
 /* at=position of arg to be used for iteration */
@@ -552,7 +614,10 @@ void Pmapat(NODE arg,Obj *rp)
 	int len,row,col,i,j,pos;
 	Obj iter;
 	pointer val;
+	NODE option;
 
+	option = current_option;
+
 	if ( argc(arg) < 3 )
 		error("mapat : too few arguments");
 
@@ -577,7 +642,7 @@ void Pmapat(NODE arg,Obj *rp)
 	NEXTNODE(r0,r);
 	iter = BDY(t); rest = NEXT(t);
 	if ( !iter ) {
-		*rp = bevalf(f,node);
+		*rp = bevalf_with_opts(f,node,option);
 		return;
 	}
 	switch ( OID(iter) ) {
@@ -585,7 +650,7 @@ void Pmapat(NODE arg,Obj *rp)
 			v = (VECT)iter; len = v->len; MKVECT(rv,len);
 			for ( i = 0; i < len; i++ ) {
 				BDY(r) = BDY(v)[i]; NEXT(r) = rest;
-				BDY(rv)[i] = bevalf(f,r0);
+				BDY(rv)[i] = bevalf_with_opts(f,r0,option);
 			}
 			*rp = (Obj)rv;
 			break;
@@ -594,7 +659,7 @@ void Pmapat(NODE arg,Obj *rp)
 			for ( i = 0; i < row; i++ )
 				for ( j = 0; j < col; j++ ) {
 					BDY(r) = BDY(m)[i][j]; NEXT(r) = rest;
-					BDY(rm)[i][j] = bevalf(f,r0);
+					BDY(rm)[i][j] = bevalf_with_opts(f,r0,option);
 				}
 			*rp = (Obj)rm;
 			break;
@@ -602,7 +667,7 @@ void Pmapat(NODE arg,Obj *rp)
 			n = BDY((LIST)iter);
 			for ( t0 = t = 0; n; n = NEXT(n) ) {
 				BDY(r) = BDY(n); NEXT(r) = rest;
-				NEXTNODE(t0,t); BDY(t) = bevalf(f,r0);
+				NEXTNODE(t0,t); BDY(t) = bevalf_with_opts(f,r0,option);
 			}
 			if ( t0 )
 				NEXT(t) = 0;
@@ -610,11 +675,85 @@ void Pmapat(NODE arg,Obj *rp)
 			*rp = (Obj)rl;
 			break;
 		default:
-			*rp = bevalf(f,node);
+			*rp = bevalf_with_opts(f,node,option);
 			break;
 	}
 }
 
+/* An implementation of 'map' as builtin function. */
+void Pmap(NODE arg,Obj *rp)
+{
+	LIST args;
+	NODE node,rest,t0,t,n,r,r0;
+	P fpoly;
+	V fvar;
+	FUNC f;
+	VECT v,rv;
+	MAT m,rm;
+	LIST rl;
+	int len,row,col,i,j;
+	Obj iter;
+	pointer val;
+	NODE option;
+
+	option = current_option;
+
+	if ( argc(arg) < 2 )
+		error("mapat : too few arguments");
+
+	fpoly = (P)ARG0(arg);
+	if ( !fpoly || OID(fpoly) != O_P )
+		error("map : invalid function specification");
+	fvar = VR(fpoly);
+	if ( fvar->attr != (pointer)V_SR || !(f=(FUNC)fvar->priv) )
+		error("map : invalid function specification");
+
+	node = NEXT(arg);
+	len = length(node);
+	if ( 0 >= len )
+		error("evalmapf : invalid position");
+	r0 = 0;
+	NEXTNODE(r0,r);
+	iter = BDY(node); rest = NEXT(node);
+	if ( !iter ) {
+		*rp = bevalf_with_opts(f,node,option);
+		return;
+	}
+	switch ( OID(iter) ) {
+		case O_VECT:
+			v = (VECT)iter; len = v->len; MKVECT(rv,len);
+			for ( i = 0; i < len; i++ ) {
+				BDY(r) = BDY(v)[i]; NEXT(r) = rest;
+				BDY(rv)[i] = bevalf_with_opts(f,r0,option);
+			}
+			*rp = (Obj)rv;
+			break;
+		case O_MAT:
+			m = (MAT)iter; row = m->row; col = m->col; MKMAT(rm,row,col);
+			for ( i = 0; i < row; i++ )
+				for ( j = 0; j < col; j++ ) {
+					BDY(r) = BDY(m)[i][j]; NEXT(r) = rest;
+					BDY(rm)[i][j] = bevalf_with_opts(f,r0,option);
+				}
+			*rp = (Obj)rm;
+			break;
+		case O_LIST:
+			n = BDY((LIST)iter);
+			for ( t0 = t = 0; n; n = NEXT(n) ) {
+				BDY(r) = BDY(n); NEXT(r) = rest;
+				NEXTNODE(t0,t); BDY(t) = bevalf_with_opts(f,r0,option);
+			}
+			if ( t0 )
+				NEXT(t) = 0;
+			MKLIST(rl,t0);
+			*rp = (Obj)rl;
+			break;
+		default:
+			*rp = bevalf_with_opts(f,node,option);
+			break;
+	}
+}
+
 void Pdeval(arg,rp)
 NODE arg;
 Obj *rp;
@@ -627,6 +766,19 @@ void Peval_quote(arg,rp)
 NODE arg;
 Obj *rp;
 {
-	asir_assert(ARG0(arg),O_QUOTE,"eval_quote");
-	*rp = eval((FNODE)BDY((QUOTE)ARG0(arg)));
+	FNODE a;
+	QUOTE q;
+	Obj f;
+
+	f = (Obj)ARG0(arg);
+	if ( !f || OID(f) != O_QUOTE ) {
+		*rp = f;
+		return;
+	}
+	if ( argc(arg) == 2 && ARG1(arg) ) {
+		a = partial_eval((FNODE)BDY((QUOTE)ARG0(arg)));
+		MKQUOTE(q,a);
+		*rp = (Obj)q;
+	} else
+		*rp = eval((FNODE)BDY((QUOTE)ARG0(arg)));
 }