===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/kanExport0.c,v
retrieving revision 1.14
retrieving revision 1.22
diff -u -p -r1.14 -r1.22
--- OpenXM/src/kan96xx/Kan/kanExport0.c	2003/07/14 12:49:52	1.14
+++ OpenXM/src/kan96xx/Kan/kanExport0.c	2004/05/13 04:38:28	1.22
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.13 2003/07/05 01:53:33 takayama Exp $  */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.21 2004/02/28 13:39:42 takayama Exp $  */
 #include <stdio.h>
 #include "datatype.h"
 #include "stackm.h"
@@ -19,6 +19,7 @@ int SerialCurrent = -1;  /* Current Serial number of t
 
 int ReverseOutputOrder = 1;  
 int WarningNoVectorVariable = 1;
+extern int QuoteMode;
 
 /** :arithmetic **/
 struct object KooAdd(ob1,ob2)
@@ -142,7 +143,11 @@ struct object KooAdd(ob1,ob2)
     
 
   default:
-    warningKan("KooAdd() has not supported yet these objects.\n");
+    if (QuoteMode) {
+      rob = addTree(ob1,ob2);
+    }else{
+      warningKan("KooAdd() has not supported yet these objects.\n");
+    }
     break;
   }
   return(rob);
@@ -270,7 +275,11 @@ struct object KooSub(ob1,ob2)
     break;
 
   default:
-    warningKan("KooSub() has not supported yet these objects.\n");
+    if (QuoteMode) {
+      rob = minusTree(ob1,ob2);
+    }else{
+      warningKan("KooSub() has not supported yet these objects.\n");
+    }
     break;
   }
   return(rob);
@@ -412,7 +421,11 @@ struct object KooMult(ob1,ob2)
     break;
 
   default:
-    warningKan("KooMult() has not supported yet these objects.\n");
+    if (QuoteMode) {
+      rob = timesTree(ob1,ob2);
+    }else{
+      warningKan("KooMult() has not supported yet these objects.\n");
+    }
     break;
   }
   return(rob);
@@ -451,7 +464,11 @@ struct object KoNegate(obj)
     break;
 
   default:
-    warningKan("KoNegate() has not supported yet these objects.\n");
+    if (QuoteMode) {
+      rob = unaryminusTree(obj);
+    }else{
+      warningKan("KoNegate() has not supported yet these objects.\n");
+    }
     break;
   }
   return(rob);
@@ -653,7 +670,11 @@ struct object KooDiv(ob1,ob2)
 
 
   default:
-    warningKan("KooDiv() has not supported yet these objects.\n");
+    if (QuoteMode) {
+      rob = divideTree(ob1,ob2);
+    }else{
+      warningKan("KooDiv() has not supported yet these objects.\n");
+    }
     break;
   }
   return(rob);
@@ -984,7 +1005,7 @@ struct object KdataConversion(obj,key)
     }
     break;
   case Spoly:
-    if (strcmp(key,"poly")==0) {
+    if ((strcmp(key,"poly")==0) || (strcmp(key,"numerator")==0)) {
       rob = obj;
       return(rob);
     }else if (strcmp(key,"integer")==0) {
@@ -1055,7 +1076,7 @@ struct object KdataConversion(obj,key)
     }
     break;
   case SuniversalNumber:
-    if (strcmp(key,"universalNumber")==0) {
+    if ((strcmp(key,"universalNumber")==0) || (strcmp(key,"numerator")==0)) {
       return(rob);
     }else if (strcmp(key,"integer")==0) {
       rob = KpoInteger(coeffToInt(obj.lc.universalNumber));
@@ -1137,6 +1158,9 @@ struct object KdataConversion(obj,key)
     if (strcmp(key,"orderMatrix")==0) {
       rob = oGetOrderMatrix(KopRingp(obj));
       return(rob);
+    }else if (strcmp(key,"oxRingStructure")==0) {
+      rob = oRingToOXringStructure(KopRingp(obj));
+      return(rob);
     }else{
       warningKan("Sorryl This type of data conversion of ringp has not supported yet.\n");
     }
@@ -1200,6 +1224,14 @@ struct object KpoRingp(ringp)
   return(obj);
 }
 
+struct object KpoUniversalNumber(u)
+     struct coeff *u;
+{
+  struct object obj;
+  obj.tag = SuniversalNumber;
+  obj.lc.universalNumber = u;
+  return(obj);
+}
 /*** conversion 2. Data conversions on arrays and matrices. ****/
 struct object arrayOfPOLYToArray(aa)
      struct arrayOfPOLY *aa;
@@ -1621,8 +1653,8 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5)
             }
           }
         }
-		switch_function("grade","module1v");
-		/* Warning: grading is changed to module1v!! */
+        switch_function("grade","module1v");
+        /* Warning: grading is changed to module1v!! */
       } else {
         errorKan1("%s\n","Unknown keyword to set_up_ring@");
       }
@@ -2068,37 +2100,37 @@ struct object KstringToArgv(struct object ob) {
   int n,wc,i,inblank;
   char **argv;
   if (ob.tag != Sdollar)
-	errorKan1("%s\n","KstringToArgv(): the argument must be a string.");
+    errorKan1("%s\n","KstringToArgv(): the argument must be a string.");
   n = strlen(KopString(ob));
   s = (char *) sGC_malloc(sizeof(char)*(n+2));
   if (s == NULL) errorKan1("%s\n","KstringToArgv(): No memory.");
   strcpy(s,KopString(ob));
   inblank = 1;  wc = 0; 
   for (i=0; i<n; i++) {
-	if (inblank && (s[i] > ' ')) {
-	  wc++; inblank = 0;
-	}else if ((!inblank) && (s[i] <= ' ')) {
-	  inblank = 1;
-	}
+    if (inblank && (s[i] > ' ')) {
+      wc++; inblank = 0;
+    }else if ((!inblank) && (s[i] <= ' ')) {
+      inblank = 1;
+    }
   }
   argv = (char **) sGC_malloc(sizeof(char *)*(wc+2));
   argv[0] = NULL;
   inblank = 1;  wc = 0; 
   for (i=0; i<n; i++) {
-	if (inblank && (s[i] > ' ')) {
-	  argv[wc] = &(s[i]); argv[wc+1]=NULL;
-	  wc++; inblank = 0;
-	}else if ((inblank == 0) && (s[i] <= ' ')) {
-	  inblank = 1; s[i] = 0;
-	}else if (inblank && (s[i] <= ' ')) {
-	  s[i] = 0;
-	}
+    if (inblank && (s[i] > ' ')) {
+      argv[wc] = &(s[i]); argv[wc+1]=NULL;
+      wc++; inblank = 0;
+    }else if ((inblank == 0) && (s[i] <= ' ')) {
+      inblank = 1; s[i] = 0;
+    }else if (inblank && (s[i] <= ' ')) {
+      s[i] = 0;
+    }
   }
 
   rob = newObjectArray(wc);
   for (i=0; i<wc; i++) {
-	putoa(rob,i,KpoString(argv[i]));
-	printf("%s\n",argv[i]);
+    putoa(rob,i,KpoString(argv[i]));
+    /* printf("%s\n",argv[i]); */
   }
   return(rob);
 }
@@ -2124,6 +2156,16 @@ static void checkDuplicateName(xvars,dvars,n)
   }
 }
 
+struct object KooPower(struct object ob1,struct object ob2) {
+  struct object rob;
+  /* Bug. It has not yet been implemented. */
+  if (QuoteMode) {
+    rob = powerTree(ob1,ob2);
+  }else{
+    warningKan("KooDiv2() has not supported yet these objects.\n");
+  }
+  return(rob);
+}
 
 
 
@@ -2186,7 +2228,11 @@ struct object KooDiv2(ob1,ob2)
     break;
 
   default:
-    warningKan("KooDiv2() has not supported yet these objects.\n");
+    if (QuoteMode) {
+      rob = divideTree(ob1,ob2);
+    }else{
+      warningKan("KooDiv2() has not supported yet these objects.\n");
+    }
     break;
   }
   return(rob);
@@ -2242,6 +2288,7 @@ struct object KgbExtension(struct object obj)
   POLY f;
   int m,i;
   struct pairOfPOLY pf;
+  struct coeff *cont;
 
   if (obj.tag != Sarray) errorKan1("%s\n","KgbExtension(): The argument must be an array.");
   size = getoaSize(obj);
@@ -2321,6 +2368,13 @@ struct object KgbExtension(struct object obj)
       errorKan1("%s\n","The datatype of the argument mismatch: [(isConstant) polynomial] gbext");
     }
     return(KpoInteger(isConstant(KopPOLY(obj1))));
+  }else if (strcmp(key,"isConstantAll")==0) {
+    if (size != 2) errorKan1("%s\n","[(isConstantAll) poly ] gbext bool");
+    obj1 = getoa(obj,1);
+    if (obj1.tag != Spoly) {
+      errorKan1("%s\n","The datatype of the argument mismatch: [(isConstantAll) polynomial] gbext");
+    }
+    return(KpoInteger(isConstantAll(KopPOLY(obj1))));
   }else if (strcmp(key,"schreyerSkelton") == 0) {
     if (size != 2) errorKan1("%s\n","[(schreyerSkelton) array_of_poly ] gbext array");
     obj1 = getoa(obj,1);
@@ -2355,6 +2409,25 @@ struct object KgbExtension(struct object obj)
     obj1 = getoa(obj,1);
     if (obj1.tag != Spoly) errorKan1("%s\n","[(isOrdered) poly] gbext poly");
     return(KisOrdered(obj1));
+  }else if (strcmp(key,"reduceContent")==0) {
+    if (size != 2) errorKan1("%s\n","[(reduceContent)  poly1 ] gbext.");
+    obj1 = getoa(obj,1);
+    if (obj1.tag != Spoly)
+      errorKan1("%s\n","[(reduceContent)  poly1 ] gbext.");
+    f1 = KopPOLY(obj1);
+    rob = newObjectArray(2);
+    f1 = reduceContentOfPoly(f1,&cont);
+    putoa(rob,0,KpoPOLY(f1));
+    if (f1 == POLYNULL) {
+      putoa(rob,1,KpoPOLY(f1));
+    }else{
+      putoa(rob,1,KpoPOLY(newCell(cont,newMonomial(f1->m->ringp))));
+    }
+  }else if (strcmp(key,"ord_ws_all")==0) {
+    if (size != 3) errorKan1("%s\n","[(ord_ws_all) fv wv] gbext");
+    obj1 = getoa(obj,1);
+    obj2 = getoa(obj,2);
+    rob  = KordWsAll(obj1,obj2);
   }else {
     errorKan1("%s\n","gbext : unknown tag.");
   }
@@ -2781,6 +2854,7 @@ errorKan1(str,message)
   longjmp(EnvOfStackMachine,1);
 #endif
 }
+
 
 warningKan(str)
      char *str;