===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/pf.c,v
retrieving revision 1.7
retrieving revision 1.10
diff -u -p -r1.7 -r1.10
--- OpenXM_contrib2/asir2000/builtin/pf.c	2004/06/22 09:17:21	1.7
+++ OpenXM_contrib2/asir2000/builtin/pf.c	2005/09/08 08:37:02	1.10
@@ -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.6 2003/02/14 22:29:07 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/pf.c,v 1.9 2004/12/17 03:09:08 noro Exp $ 
 */
 #include "ca.h"
 #include "math.h"
@@ -63,17 +63,24 @@ void make_tri(void);
 void make_exp(void);
 void simplify_pow(PFINS,Obj *);
 
-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 Padd_handler();
+void Plist_handler();
+void Pclear_handler();
 
 struct ftab puref_tab[] = {
 	{"mapat",Pmapat,-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},
+	{"clear_handler",Pclear_handler,1},
 	{"call",Pcall,2},
 	{"vtype",Pvtype,1},
 	{"deval",Pdeval,1},
@@ -284,9 +291,15 @@ Obj *rp;
 	pf = ins->pf; ad = ins->ad; a0 = ad[0].arg; a1 = ad[1].arg;	
 	if ( !a1 )
 		*rp = (Obj)ONE;
-	else if ( !a0 )
-		*rp = 0;
-	else if ( NUM(a1) && INT(a1) )
+	else if ( !a0 ) {
+		if ( RATN(a1) && SGN((Q)a1)>0 )
+			*rp = 0;
+		else if ( RATN(a1) && SGN((Q)a1) < 0 )
+			error("simplify_pow : division by 0");
+		else {
+			instov(ins,&v); MKV(v,t); *rp = (Obj)t;
+		}
+	} else if ( NUM(a1) && INT(a1) )
 		arf_pwr(CO,a0,a1,rp);
 	else {
 		instov(ins,&v); MKV(v,t); *rp = (Obj)t;
@@ -294,8 +307,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;
@@ -374,6 +387,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;
@@ -387,7 +437,7 @@ Q *rp;
 		STOQ((int)VR(p)->attr,*rp);
 }
 
-extern FUNC registered_handler;
+extern NODE user_int_handler,user_quit_handler;
 
 void Pregister_handler(arg,rp)
 NODE arg;
@@ -395,12 +445,15 @@ Q *rp;
 {
 	P p;
 	V v;
+	NODE n;
 	FUNC func;
 
 	p = (P)ARG0(arg);
-	if ( !p )
-		registered_handler = 0;
-	else if ( OID(p) != 2 )
+	if ( !p ) {
+		user_int_handler = 0;
+		*rp = 0;
+		return;
+	} else if ( OID(p) != 2 )
 		error("register_hanlder : invalid argument");
 	v = VR(p);
 	if ( (int)v->attr != V_SR )	
@@ -410,10 +463,100 @@ Q *rp;
 		if ( func->argc )
 			error("register_hanlder : the function must be with no argument");
 		else {
-			registered_handler = func;
+			MKNODE(n,(pointer)func,user_int_handler);
+			user_int_handler = n;
 			*rp = ONE;
-		}	
+		}
 	}
+}
+
+void Padd_handler(arg,rp)
+NODE arg;
+Q *rp;
+{
+	P p;
+	V v;
+	NODE n;
+	FUNC func;
+	char *name;
+	NODE *hlistp;
+
+	asir_assert(ARG0(arg),O_STR,"add_handler");
+	name = BDY((STRING)ARG0(arg));
+	p = (P)ARG1(arg);
+	if ( !strcmp(name,"intr") )
+		hlistp = &user_int_handler;
+	else if ( !strcmp(name,"quit") )
+		hlistp = &user_quit_handler;
+	else
+		error("add_handler : invalid keyword (must be \"intr\" or \"quit\")");
+	if ( !p ) {
+		*hlistp = 0; *rp = 0;
+		return;
+	}
+	if ( OID(p) == 2 ) {
+		v = VR(p);
+		if ( (int)v->attr != V_SR )	
+			error("add_hanlder : no such function");
+		func = (FUNC)v->priv;
+	} else if ( OID(p) == O_STR ) {
+		gen_searchf_searchonly(BDY((STRING)p),&func);
+		if ( !func )
+			error("add_hanlder : no such function");
+	}
+	if ( func->argc )
+		error("register_hanlder : the function must be with no argument");
+	else {
+		MKNODE(n,(pointer)func,*hlistp);
+		*hlistp = n;
+		*rp = ONE;
+	}
+}
+
+void Plist_handler(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	NODE r0,r,t;
+	char *name;
+	NODE hlist;
+	STRING fname;
+
+	asir_assert(ARG0(arg),O_STR,"list_handler");
+	name = BDY((STRING)ARG0(arg));
+	if ( !strcmp(name,"intr") )
+		hlist = user_int_handler;
+	else if ( !strcmp(name,"quit") )
+		hlist = user_quit_handler;
+	else
+		error("list_handler : invalid keyword (must be \"intr\" or \"quit\")");
+	for ( r0 = 0, t = hlist; t; t = NEXT(t) ) {
+		NEXTNODE(r0,r);
+		MKSTR(fname,((FUNC)BDY(t))->fullname);
+		BDY(r) = (pointer)fname;
+	}
+	if ( r0 ) NEXT(r) = 0;
+	MKLIST(*rp,r0);
+}
+
+void Pclear_handler(arg,rp)
+NODE arg;
+Q *rp;
+{
+	NODE r0,r,t;
+	char *name;
+	NODE hlist;
+	STRING fname;
+
+	asir_assert(ARG0(arg),O_STR,"clear_handler");
+	name = BDY((STRING)ARG0(arg));
+	if ( !strcmp(name,"intr") )
+		user_int_handler = 0;
+	else if ( !strcmp(name,"quit") )
+		user_quit_handler = 0;
+	else
+		error("clear_handler : invalid keyword (must be \"intr\" or \"quit\")");
+	*rp = 0;
 }
 
 void Pcall(NODE arg,Obj *rp)