===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/rat.c,v
retrieving revision 1.2
retrieving revision 1.5
diff -u -p -r1.2 -r1.5
--- OpenXM_contrib2/asir2000/builtin/rat.c	2000/08/21 08:31:21	1.2
+++ OpenXM_contrib2/asir2000/builtin/rat.c	2013/02/15 07:05:49	1.5
@@ -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,17 +45,19 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/rat.c,v 1.1.1.1 1999/12/03 07:39:07 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/rat.c,v 1.4 2003/12/23 10:39:57 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
-void Pnm(), Pdn(), Pderiv();
+void Pnm(), Pdn(), Pderiv(), Pederiv(), Prderiv();
 
 struct ftab rat_tab[] = {
 	{"nm",Pnm,1},
 	{"dn",Pdn,1},
 	{"diff",Pderiv,-99999999},
+	{"ediff",Pederiv,-99999999},
+	{"rdiff",Prderiv,-99999999},
 	{0,0,0},
 };
 
@@ -142,6 +144,58 @@ Obj *rp;
 		if ( !(v = (P)BDY(n)) || OID(v) != O_P )
 			error("diff : invalid argument");
 		derivr(CO,a,VR(v),&t); a = t;
+	}
+	*rp = a;
+}
+
+/* simple derivation with reduction */
+void Prderiv(arg,rp)
+NODE arg;
+Obj *rp;
+{
+	Obj a,t;
+	LIST l;
+	P v;
+	NODE n;
+
+	if ( !arg ) {
+		*rp = 0; return;
+	}
+	asir_assert(ARG0(arg),O_R,"rdiff");
+	a = (Obj)ARG0(arg);
+	n = NEXT(arg);
+	if ( n && (l = (LIST)ARG0(n)) && OID(l) == O_LIST )
+		n = BDY(l);
+	for ( ; n; n = NEXT(n) ) {
+		if ( !(v = (P)BDY(n)) || OID(v) != O_P )
+			error("rdiff : invalid argument");
+		simple_derivr(CO,a,VR(v),&t); a = t;
+	}
+	*rp = a;
+}
+
+/* Euler derivation */
+void Pederiv(arg,rp)
+NODE arg;
+Obj *rp;
+{
+	Obj a,t;
+	LIST l;
+	P v;
+	NODE n;
+
+	if ( !arg ) {
+		*rp = 0; return;
+	}
+	asir_assert(ARG0(arg),O_P,"ediff");
+	reductr(CO,(Obj)ARG0(arg),&a);
+	n = NEXT(arg);
+	if ( n && (l = (LIST)ARG0(n)) && OID(l) == O_LIST )
+		n = BDY(l);
+	for ( ; n; n = NEXT(n) ) {
+		if ( !(v = (P)BDY(n)) || OID(v) != O_P )
+			error("diff : invalid argument");
+		ediffp(CO,a,VR(v),&t); a = t;
 	}
 	*rp = a;
 }