===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/Kclass/tree.c,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- OpenXM/src/kan96xx/Kan/Kclass/tree.c	2003/11/24 08:16:13	1.4
+++ OpenXM/src/kan96xx/Kan/Kclass/tree.c	2003/12/06 02:49:22	1.7
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/Kclass/tree.c,v 1.3 2003/11/24 06:50:16 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/Kclass/tree.c,v 1.6 2003/12/05 23:14:14 takayama Exp $ */
 #include <stdio.h>
 #include "../datatype.h"
 #include "../stackm.h"
@@ -56,7 +56,7 @@ int isTreeAdd(struct object ob) {
   if (name.tag != Sdollar) {
     errorKan1("%s\n","CLASSNAME_tree is broken. Should be string.");
   }
-  if (strcmp(KopString(name),"add") == 0) {
+  if (strcmp(KopString(name),"plus") == 0) {
     return(1);
   }else{
     return(0);
@@ -67,7 +67,11 @@ struct object addTree(struct object ob1, struct object
 {
   struct object rob,aob;
   struct object ob3,ob4;
+  struct object attr;
+  struct object keyValue;
+  struct object to;
   int i;
+  to = ob2; ob2=ob1; ob1=to; /* Exchange ob1 and ob2 */
   if (isTreeAdd(ob1) && !isTreeAdd(ob2)) {
     ob1 = KopTree(ob1);
     ob3 = getoa(ob1,2);
@@ -101,11 +105,125 @@ struct object addTree(struct object ob1, struct object
     putoa(aob,0,ob1);
     putoa(aob,1,ob2);
   }
+  attr = newObjectArray(1);
+  keyValue = newObjectArray(2);
+  putoa(keyValue,0,KpoString("cd"));
+  putoa(keyValue,1,KpoString("arith1"));
+  putoa(attr,0,keyValue);
   rob = newObjectArray(3);
-  putoa(rob,0,KpoString("add"));
-  putoa(rob,1,KpoString("basic"));
+  putoa(rob,0,KpoString("plus"));
+  putoa(rob,1,attr);
   putoa(rob,2,aob);
   return(KpoTree(rob));
+}
+struct object minusTree(struct object ob1,struct object ob2) {
+  struct object rob,aob;
+  struct object attr;
+  struct object keyValue;
+  struct object to;
+
+  rob = NullObject;
+  attr = newObjectArray(1);
+  keyValue = newObjectArray(2);
+  aob = newObjectArray(2);
+  putoa(aob,0,ob1);
+  putoa(aob,1,ob2);
+  putoa(keyValue,0,KpoString("cd"));
+  putoa(keyValue,1,KpoString("arith1"));
+  putoa(attr,0,keyValue);
+  rob = newObjectArray(3);
+  putoa(rob,0,KpoString("minus"));
+  putoa(rob,1,attr);
+  putoa(rob,2,aob);
+  return(KpoTree(rob));
+  return(rob);
+}
+struct object timesTree(struct object ob1,struct object ob2) {
+  struct object rob,aob;
+  struct object attr;
+  struct object keyValue;
+  struct object to;
+
+  rob = NullObject;
+  attr = newObjectArray(1);
+  keyValue = newObjectArray(2);
+  aob = newObjectArray(2);
+  putoa(aob,0,ob1);
+  putoa(aob,1,ob2);
+  putoa(keyValue,0,KpoString("cd"));
+  putoa(keyValue,1,KpoString("arith1"));
+  putoa(attr,0,keyValue);
+  rob = newObjectArray(3);
+  putoa(rob,0,KpoString("times"));
+  putoa(rob,1,attr);
+  putoa(rob,2,aob);
+  return(KpoTree(rob));
+  return(rob);
+}
+struct object divideTree(struct object ob1,struct object ob2) {
+  struct object rob,aob;
+  struct object attr;
+  struct object keyValue;
+  struct object to;
+
+  rob = NullObject;
+  attr = newObjectArray(1);
+  keyValue = newObjectArray(2);
+  aob = newObjectArray(2);
+  putoa(aob,0,ob1);
+  putoa(aob,1,ob2);
+  putoa(keyValue,0,KpoString("cd"));
+  putoa(keyValue,1,KpoString("arith1"));
+  putoa(attr,0,keyValue);
+  rob = newObjectArray(3);
+  putoa(rob,0,KpoString("divide"));
+  putoa(rob,1,attr);
+  putoa(rob,2,aob);
+  return(KpoTree(rob));
+  return(rob);
+}
+struct object powerTree(struct object ob1,struct object ob2) {
+  struct object rob,aob;
+  struct object attr;
+  struct object keyValue;
+  struct object to;
+
+  rob = NullObject;
+  attr = newObjectArray(1);
+  keyValue = newObjectArray(2);
+  aob = newObjectArray(2);
+  putoa(aob,0,ob1);
+  putoa(aob,1,ob2);
+  putoa(keyValue,0,KpoString("cd"));
+  putoa(keyValue,1,KpoString("arith1"));
+  putoa(attr,0,keyValue);
+  rob = newObjectArray(3);
+  putoa(rob,0,KpoString("power"));
+  putoa(rob,1,attr);
+  putoa(rob,2,aob);
+  return(KpoTree(rob));
+  return(rob);
+}
+struct object unaryminusTree(struct object ob1) {
+  struct object rob,aob;
+  struct object attr;
+  struct object keyValue;
+  struct object to;
+
+  rob = NullObject;
+  attr = newObjectArray(1);
+  keyValue = newObjectArray(2);
+  aob = newObjectArray(1);
+  putoa(aob,0,ob1);
+  putoa(keyValue,0,KpoString("cd"));
+  putoa(keyValue,1,KpoString("arith1"));
+  putoa(attr,0,keyValue);
+  rob = newObjectArray(3);
+  putoa(rob,0,KpoString("unaryminus"));
+  putoa(rob,1,attr);
+  putoa(rob,2,aob);
+  return(KpoTree(rob));
+  return(rob);
 }
 
 /* XML DOM-like interfaces */