===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/pf.c,v
retrieving revision 1.2
retrieving revision 1.6
diff -u -p -r1.2 -r1.6
--- OpenXM_contrib2/asir2000/builtin/pf.c	2000/08/21 08:31:20	1.2
+++ OpenXM_contrib2/asir2000/builtin/pf.c	2003/02/14 22:29:07	1.6
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -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.1.1.1 1999/12/03 07:39:07 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/pf.c,v 1.5 2001/10/09 01:36:06 noro Exp $ 
 */
 #include "ca.h"
 #include "math.h"
@@ -65,6 +65,7 @@ void simplify_pow(PFINS,Obj *);
 
 void Pfunctor(),Pargs(),Pfunargs(),Pvtype(),Pcall(),Pdeval();
 void Pregister_handler();
+void Peval_quote();
 
 struct ftab puref_tab[] = {
 	{"functor",Pfunctor,1},
@@ -74,10 +75,11 @@ struct ftab puref_tab[] = {
 	{"call",Pcall,2},
 	{"vtype",Pvtype,1},
 	{"deval",Pdeval,1},
+	{"eval_quote",Peval_quote,1},
 	{0,0,0},
 };
 
-#if PARI
+#if defined(PARI)
 int p_pi(),p_e();
 int p_log(),p_exp(),p_pow();
 int p_sin(),p_cos(),p_tan(),p_asin(),p_acos(),p_atan();
@@ -361,7 +363,7 @@ LIST *rp;
 		t->name = pf->name; t->id = A_PURE; t->argc = pf->argc;
 		t->f.puref = pf;
 		makesrvar(t,&f);
-		n0 = 0; NEXTNODE(n0,n); BDY(n) = (pointer)f;
+		n = n0 = 0; NEXTNODE(n0,n); BDY(n) = (pointer)f;
 		for ( i = 0; i < pf->argc; i++ ) {
 			NEXTNODE(n0,n); BDY(n) = (pointer)ad[i].arg;
 		}
@@ -438,3 +440,10 @@ Obj *rp;
 	devalr(CO,(Obj)ARG0(arg),rp);
 }
 
+void Peval_quote(arg,rp)
+NODE arg;
+Obj *rp;
+{
+	asir_assert(ARG0(arg),O_QUOTE,"eval_quote");
+	*rp = eval((FNODE)BDY((QUOTE)ARG0(arg)));
+}