===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/kanExport0.c,v
retrieving revision 1.7
retrieving revision 1.15
diff -u -p -r1.7 -r1.15
--- OpenXM/src/kan96xx/Kan/kanExport0.c	2001/05/04 01:06:23	1.7
+++ OpenXM/src/kan96xx/Kan/kanExport0.c	2003/08/18 11:59:56	1.15
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.6 2001/04/12 06:48:25 takayama Exp $  */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.14 2003/07/14 12:49:52 takayama Exp $  */
 #include <stdio.h>
 #include "datatype.h"
 #include "stackm.h"
@@ -984,7 +984,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 +1055,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));
@@ -1537,6 +1537,10 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5)
   newRingp->schreyer = 0;
   newRingp->gbListTower = NULL;
   newRingp->outputOrder = outputVars;
+  newRingp->weightedHomogenization = 0;
+  newRingp->degreeShiftSize = 0;
+  newRingp->degreeShiftN = 0;
+  newRingp->degreeShift = NULL;
 
   if (ob5.tag != Sarray || (getoaSize(ob5) % 2) != 0) {
     errorKan1("%s\n","[(keyword) value (keyword) value ....] should be given.");
@@ -1583,6 +1587,42 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5)
           errorKan1("%s\n","A name should be given. (ringName)");
         }
         ringName = KopString(getoa(ob5,i+1));
+      } else if (strcmp(KopString(getoa(ob5,i)),"weightedHomogenization") == 0) {
+        if (getoa(ob5,i+1).tag != Sinteger) {
+          errorKan1("%s\n","A integer should be given. (weightedHomogenization)");
+        }
+        newRingp->weightedHomogenization = KopInteger(getoa(ob5,i+1));
+      } else if (strcmp(KopString(getoa(ob5,i)),"degreeShift") == 0) {
+        if (getoa(ob5,i+1).tag != Sarray) {
+          errorKan1("%s\n","An array of array should be given. (degreeShift)");
+        }
+        {
+          struct object ods;
+          struct object ods2;
+          int dssize,k,j,nn;
+          ods=getoa(ob5,i+1);
+          if ((getoaSize(ods) < 1) || (getoa(ods,0).tag != Sarray)) {
+            errorKan1("%s\n", "An array of array should be given. (degreeShift)");
+          }
+          nn = getoaSize(ods);
+          dssize = getoaSize(getoa(ods,0));
+          newRingp->degreeShiftSize = dssize;
+          newRingp->degreeShiftN = nn;
+          newRingp->degreeShift = (int *) sGC_malloc(sizeof(int)*(dssize*nn+1));
+          if (newRingp->degreeShift == NULL) errorKan1("%s\n","No more memory.");
+          for (j=0; j<nn; j++) {
+            ods2 = getoa(ods,j);
+            for (k=0; k<dssize; k++) {
+              if (getoa(ods2,k).tag == SuniversalNumber) {
+                (newRingp->degreeShift)[j*dssize+k] = coeffToInt(getoa(ods2,k).lc.universalNumber);
+              }else{
+                (newRingp->degreeShift)[j*dssize+k] = KopInteger(getoa(ods2,k));
+              }
+            }
+          }
+        }
+		switch_function("grade","module1v");
+		/* Warning: grading is changed to module1v!! */
       } else {
         errorKan1("%s\n","Unknown keyword to set_up_ring@");
       }
@@ -2022,7 +2062,47 @@ int KtoArgvbyCurryBrace(str,argv,limit)
   return(argc);
 }
 
+struct object KstringToArgv(struct object ob) {
+  struct object rob;
+  char *s;
+  int n,wc,i,inblank;
+  char **argv;
+  if (ob.tag != Sdollar)
+	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;
+	}
+  }
+  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;
+	}
+  }
 
+  rob = newObjectArray(wc);
+  for (i=0; i<wc; i++) {
+	putoa(rob,i,KpoString(argv[i]));
+	printf("%s\n",argv[i]);
+  }
+  return(rob);
+}
+
 static void checkDuplicateName(xvars,dvars,n)
      char *xvars[];
      char *dvars[];
@@ -2675,6 +2755,7 @@ errorKan1(str,message)
   extern int GotoP;
   extern int ErrorMessageMode;
   char tmpc[1024];
+  cancelAlarm();
   if (ErrorMessageMode == 1 || ErrorMessageMode == 2) {
     sprintf(tmpc,"\nERROR(kanExport[0|1].c): ");
     if (strlen(message) < 900) {
@@ -2694,7 +2775,11 @@ errorKan1(str,message)
   }
   stdOperandStack(); contextControl(CCRESTORE);
   /* fprintf(stderr,"Now. Long jump!\n"); */
+#if defined(__CYGWIN__)
+  siglongjmp(EnvOfStackMachine,1);
+#else
   longjmp(EnvOfStackMachine,1);
+#endif
 }
 
 warningKan(str)