=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/kanExport0.c,v retrieving revision 1.12 retrieving revision 1.15 diff -u -p -r1.12 -r1.15 --- OpenXM/src/kan96xx/Kan/kanExport0.c 2003/06/26 13:00:10 1.12 +++ 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.11 2003/06/26 08:14:46 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.14 2003/07/14 12:49:52 takayama Exp $ */ #include #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)); @@ -1621,6 +1621,8 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) } } } + switch_function("grade","module1v"); + /* Warning: grading is changed to module1v!! */ } else { errorKan1("%s\n","Unknown keyword to set_up_ring@"); } @@ -2060,6 +2062,46 @@ 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 ' ')) { + 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 ' ')) { + 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