===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/Kclass/indeterminate.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- OpenXM/src/kan96xx/Kan/Kclass/indeterminate.c	2001/09/01 01:37:48	1.6
+++ OpenXM/src/kan96xx/Kan/Kclass/indeterminate.c	2003/11/21 02:10:37	1.7
@@ -1,6 +1,6 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/Kclass/indeterminate.c,v 1.5 2001/05/04 01:06:29 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/Kclass/indeterminate.c,v 1.6 2001/09/01 01:37:48 takayama Exp $ */
 /* Kclass/indeterminate.c    */
-/* This file handles   indeterminate, tree, recursivePolynomial,
+/* This file handles   indeterminate, recursivePolynomial,
     polynomialInOneVariable
 */
 #include <stdio.h>
@@ -43,109 +43,8 @@ void fprintIndeterminate(FILE *fp,struct object op)
   printObject(KopIndeterminate(op),0,fp);
 }
 
-
+/* Functions for trees are moved to tree.c */
 /* ---------------------------------------------------- */
-/* Data conversion function : see KclassDataConversion*/
-struct object KpoTree(struct object ob) {
-  struct object rob;
-  struct object ob1,ob2,ob3;
-  struct object *newobp;
-  rob.tag = Sclass;
-  rob.lc.ival = CLASSNAME_tree;
-  newobp = (struct object *) sGC_malloc(sizeof(struct object));
-  if (newobp == NULL) errorKan1("%s\n","Kclass/indeterminate.c, no more memory.");
-  if (ob.tag != Sarray) {
-    errorKan1("%s\n","Kclass/indeterminate.c, only properly formatted list object can be transformed into tree. [name, cdname, arglist].");
-  }
-  if (getoaSize(ob) < 3) {
-    errorKan1("%s\n","Kclass/indeterminate.c, the length must 3 or more than 3. [name, cdname, arglist].");
-  }
-  ob1 = getoa(ob,0); ob2 = getoa(ob,1); ob3 = getoa(ob,2);
-  if (ob1.tag != Sdollar || ob2.tag != Sarray || ob3.tag != Sarray) {
-    errorKan1("%s\n","Kclass/indeterminate.c, [string name, list attributes, list arglist].");
-  }
-  *newobp = ob;
-  rob.rc.voidp = newobp;
-  return(rob);
-}
-
-
-/* Printing function : see fprintClass */
-void fprintTree(FILE *fp,struct object op)
-{
-  printObject(KopTree(op),0,fp);
-}
-
-int isTreeAdd(struct object ob) {
-  struct object name;
-  if (ob.tag != Sclass) {
-    return(0);
-  }
-  if (ectag(ob) != CLASSNAME_tree) {
-    return(0);
-  }
-  ob = KopTree(ob);
-  if (ob.tag != Sarray) {
-    errorKan1("%s\n","CLASSNAME_tree is broken. Should be array.");
-  }
-  name = getoa(ob,0);
-  if (name.tag != Sdollar) {
-    errorKan1("%s\n","CLASSNAME_tree is broken. Should be string.");
-  }
-  if (strcmp(KopString(name),"add") == 0) {
-    return(1);
-  }else{
-    return(0);
-  }
-}
-
-struct object addTree(struct object ob1, struct object ob2)
-{
-  struct object rob,aob;
-  struct object ob3,ob4;
-  int i;
-  if (isTreeAdd(ob1) && !isTreeAdd(ob2)) {
-    ob1 = KopTree(ob1);
-    ob3 = getoa(ob1,2);
-    aob = newObjectArray(getoaSize(ob3)+1);
-    for (i=0; i<getoaSize(ob3); i++) {
-      putoa(aob,i,getoa(ob3,i));
-    }
-    putoa(aob,getoaSize(ob3),ob2);
-  }else if (!isTreeAdd(ob1) && isTreeAdd(ob2)) {
-    ob2 = KopTree(ob2);
-    ob3 = getoa(ob2,2);
-    aob = newObjectArray(getoaSize(ob3)+1);
-    putoa(aob,0,ob1);
-    for (i=0; i<getoaSize(ob3); i++) {
-      putoa(aob,1+i,getoa(ob3,i));
-    }
-  }else if (isTreeAdd(ob1) && isTreeAdd(ob2)) {
-    ob1 = KopTree(ob1);
-    ob2 = KopTree(ob2);
-    ob3 = getoa(ob1,2);
-    ob4 = getoa(ob2,2);
-    aob = newObjectArray(getoaSize(ob3)+getoaSize(ob4));
-    for (i=0; i<getoaSize(ob3); i++) {
-      putoa(aob,i,getoa(ob3,i));
-    }
-    for (i=0; i<getoaSize(ob4); i++) {
-      putoa(aob,getoaSize(ob3)+i,getoa(ob4,i));
-    }
-  }else{
-    aob = newObjectArray(2);
-    putoa(aob,0,ob1);
-    putoa(aob,1,ob2);
-  }
-  rob = newObjectArray(3);
-  putoa(rob,0,KpoString("add"));
-  putoa(rob,1,KpoString("basic"));
-  putoa(rob,2,aob);
-  return(KpoTree(rob));
-}
-
-
-/*------------------------------------------*/
 
 struct object KpoRecursivePolynomial(struct object ob) {
   struct object rob;