=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/kanExport0.c,v retrieving revision 1.18 retrieving revision 1.47 diff -u -p -r1.18 -r1.47 --- OpenXM/src/kan96xx/Kan/kanExport0.c 2003/08/26 12:46:05 1.18 +++ OpenXM/src/kan96xx/Kan/kanExport0.c 2006/12/21 05:29:49 1.47 @@ -1,5 +1,7 @@ -/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.17 2003/08/23 02:28:38 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.46 2005/09/27 06:10:43 takayama Exp $ */ #include +#include +#include #include "datatype.h" #include "stackm.h" #include "extern.h" @@ -19,6 +21,7 @@ int SerialCurrent = -1; /* Current Serial number of t int ReverseOutputOrder = 1; int WarningNoVectorVariable = 1; +extern int QuoteMode; /** :arithmetic **/ struct object KooAdd(ob1,ob2) @@ -29,7 +32,8 @@ struct object KooAdd(ob1,ob2) POLY r; int s,i; objectp f1,f2,g1,g2; - struct object nn,dd; + struct object nn = OINIT; + struct object dd = OINIT; switch (Lookup[ob1.tag][ob2.tag]) { case SintegerSinteger: @@ -142,7 +146,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); @@ -156,7 +164,8 @@ struct object KooSub(ob1,ob2) int s,i; objectp f1,f2,g1,g2; extern struct coeff *UniversalZero; - struct object nn,dd; + struct object nn = OINIT; + struct object dd = OINIT; switch (Lookup[ob1.tag][ob2.tag]) { case SintegerSinteger: @@ -270,7 +279,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); @@ -283,7 +296,8 @@ struct object KooMult(ob1,ob2) POLY r; int i,s; objectp f1,f2,g1,g2; - struct object dd,nn; + struct object dd = OINIT; + struct object nn = OINIT; switch (Lookup[ob1.tag][ob2.tag]) { @@ -412,7 +426,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); @@ -425,7 +443,7 @@ struct object KoNegate(obj) { struct object rob = NullObject; extern struct ring SmallRing; - struct object tob; + struct object tob = OINIT; switch(obj.tag) { case Sinteger: rob = obj; @@ -451,7 +469,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); @@ -463,7 +485,7 @@ struct object KoInverse(obj) struct object rob = NullObject; extern struct coeff *UniversalOne; objectp onep; - struct object tob; + struct object tob = OINIT; switch(obj.tag) { case Spoly: tob.tag = SuniversalNumber; @@ -529,11 +551,11 @@ struct object KaoMult(aa,bb) POLY tmp; POLY fik; POLY gkj; - struct object rob; + struct object rob = OINIT; int r1,r2; int rsize; - struct object tob; - struct object ob1; + struct object tob = OINIT; + struct object ob1 = OINIT; extern struct ring SmallRing; m = getoaSize(aa); m2 = getoaSize(bb); @@ -593,7 +615,9 @@ struct object KaoMult(aa,bb) r1 = isMatrix(aa,m,n); r2 = isMatrix(bb,m2,n2); if (r1 == -1 || r2 == -1) { /* Object multiplication. Elements are not polynomials. */ - struct object ofik,ogkj,otmp; + struct object ofik = OINIT; + struct object ogkj = OINIT; + struct object otmp = OINIT; rob = newObjectArray(m); for (i=0; i KopDouble(obj2) ) return(KpoInteger(1)); else return(KpoInteger(0)); break; + case Sarray: + { + int i,m1,m2; + struct object rr = OINIT; + m1 = getoaSize(obj1); m2 = getoaSize(obj2); + for (i=0; i< (m1>m2?m2:m1); i++) { + rr=KooGreater(getoa(obj1,i),getoa(obj2,i)); + if (KopInteger(rr) == 1) return rr; + rr=KooGreater(getoa(obj2,i),getoa(obj1,i)); + if (KopInteger(rr) == 1) return KpoInteger(0); + } + if (m1 > m2) return KpoInteger(1); + else return KpoInteger(0); + } + break; default: errorKan1("%s\n","KooGreater() has not supported these objects yet."); break; @@ -817,6 +868,21 @@ struct object KooLess(obj1,obj2) if ( KopDouble(obj1) < KopDouble(obj2) ) return(KpoInteger(1)); else return(KpoInteger(0)); break; + case Sarray: + { + int i,m1,m2; + struct object rr = OINIT; + m1 = getoaSize(obj1); m2 = getoaSize(obj2); + for (i=0; i< (m1>m2?m2:m1); i++) { + rr=KooLess(getoa(obj1,i),getoa(obj2,i)); + if (KopInteger(rr) == 1) return rr; + rr=KooLess(getoa(obj2,i),getoa(obj1,i)); + if (KopInteger(rr) == 1) return KpoInteger(0); + } + if (m1 < m2) return KpoInteger(1); + else return KpoInteger(0); + } + break; default: errorKan1("%s\n","KooLess() has not supported these objects yet."); break; @@ -831,11 +897,12 @@ struct object KdataConversion(obj,key) { char tmps[128]; /* Assume that double is not more than 128 digits */ char intstr[100]; /* Assume that int is not more than 100 digits */ - struct object rob; + struct object rob = OINIT; extern struct ring *CurrentRingp; extern struct ring SmallRing; int flag; - struct object rob1,rob2; + struct object rob1 = OINIT; + struct object rob2 = OINIT; char *s; int i; double f; @@ -868,6 +935,10 @@ struct object KdataConversion(obj,key) return(rob); }else if (strcmp(key,"poly") == 0) { rob = KpoPOLY(ZERO); + return rob; + }else if (strcmp(key,"array") == 0) { + rob = newObjectArray(0); + return rob; }else{ warningKan("Sorry. The data conversion from null to this data type has not supported yet.\n"); } @@ -893,8 +964,7 @@ struct object KdataConversion(obj,key) strcpy(rob.lc.str,intstr); return(rob); }else if (strcmp(key,"universalNumber")==0) { - rob.tag = SuniversalNumber; - rob.lc.universalNumber = intToCoeff(obj.lc.ival,&SmallRing); + rob = KintToUniversalNumber(obj.lc.ival); return(rob); }else if (strcmp(key,"double") == 0) { rob = KpoDouble((double) (obj.lc.ival)); @@ -965,7 +1035,7 @@ struct object KdataConversion(obj,key) if (strcmp(key,"array") == 0) { return(rob); }else if (strcmp(key,"list") == 0) { - rob = *( arrayToList(obj) ); + rob = KarrayToList(obj); return(rob); }else if (strcmp(key,"arrayOfPOLY")==0) { rob = KpoArrayOfPOLY(arrayToArrayOfPOLY(obj)); @@ -979,8 +1049,19 @@ struct object KdataConversion(obj,key) }else if (strcmp(key,"null") == 0) { rob = NullObject; return(rob); + }else if (strcmp(key,"byteArray") == 0) { + rob = newByteArray(getoaSize(obj),obj); + return(rob); }else { - warningKan("Sorry. This type of data conversion has not supported yet.\n"); + { /* Automatically maps the elements. */ + int n,i; + n = getoaSize(obj); + rob = newObjectArray(n); + for (i=0; in; a = aa->array; r = newObjectArray(size); @@ -1223,8 +1354,8 @@ struct object arrayOfPOLYToArray(aa) struct object matrixOfPOLYToArray(pmat) struct matrixOfPOLY *pmat; { - struct object r; - struct object tmp; + struct object r = OINIT; + struct object tmp = OINIT; int i,j; int m,n; POLY *mat; @@ -1247,7 +1378,7 @@ struct arrayOfPOLY *arrayToArrayOfPOLY(oa) POLY *a; int size; int i; - struct object tmp; + struct object tmp = OINIT; struct arrayOfPOLY *ap; if (oa.tag != Sarray) errorKan1("KarrayToArrayOfPOLY(): %s", @@ -1275,7 +1406,8 @@ struct matrixOfPOLY *arrayToMatrixOfPOLY(oa) int i,j; struct matrixOfPOLY *ma; - struct object tmp,tmp2; + struct object tmp = OINIT; + struct object tmp2 = OINIT; if (oa.tag != Sarray) errorKan1("KarrayToMatrixOfPOLY(): %s", "Argument is not array\n"); m = getoaSize(oa); @@ -1313,8 +1445,8 @@ int objArrayToOrderMatrix(oA,order,n,oasize) { int size; int k,j; - struct object tmpOa; - struct object obj; + struct object tmpOa = OINIT; + struct object obj = OINIT; if (oA.tag != Sarray) { warningKan("The argument should be of the form [ [...] [...] ... [...]]."); return(-1); @@ -1399,10 +1531,10 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) ob4 = Order matrix ob5 = [(keyword) value (keyword) value ....] */ -#define RP_LIMIT 500 +#define RP_LIMIT 5000 { int i; - struct object ob; + struct object ob = OINIT; int c,l,m,n; int cc,ll,mm,nn; int p; @@ -1425,7 +1557,7 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) extern char *F_mpMult; char *fmp_mult_saved; char *mpMultName = NULL; - struct object rob; + struct object rob = OINIT; struct ring *savedCurrentRingp; /* To get the ring structure. */ @@ -1496,7 +1628,8 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) outputVars[i] = i; } } - + + ob4 = Kto_int32(ob4); /* order matrix */ oasize = getoaSize(ob4); order = (int *)sGC_malloc(sizeof(int)*((2*n)*oasize+1)); if (order == (int *)NULL) errorKan1("%s\n","No memory."); @@ -1526,6 +1659,7 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) newRingp->cc = cc; newRingp->x = xvars; newRingp->D = dvars; + newRingp->Dsmall = makeDsmall(dvars,n); /* You don't need to set order and orderMatrixSize here. It was set by setOrder(). */ setFromTo(newRingp); @@ -1541,6 +1675,8 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) newRingp->degreeShiftSize = 0; newRingp->degreeShiftN = 0; newRingp->degreeShift = NULL; + newRingp->partialEcart = 0; + newRingp->partialEcartGlobalVarX = NULL; if (ob5.tag != Sarray || (getoaSize(ob5) % 2) != 0) { errorKan1("%s\n","[(keyword) value (keyword) value ....] should be given."); @@ -1597,8 +1733,8 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) errorKan1("%s\n","An array of array should be given. (degreeShift)"); } { - struct object ods; - struct object ods2; + struct object ods = OINIT; + struct object ods2 = OINIT; int dssize,k,j,nn; ods=getoa(ob5,i+1); if ((getoaSize(ods) < 1) || (getoa(ods,0).tag != Sarray)) { @@ -1621,8 +1757,38 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) } } } - switch_function("grade","module1v"); - /* Warning: grading is changed to module1v!! */ + } else if (strcmp(KopString(getoa(ob5,i)),"partialEcartGlobalVarX") == 0) { + if (getoa(ob5,i+1).tag != Sarray) { + errorKan1("%s\n","An array of array should be given. (partialEcart)"); + } + { + struct object odv = OINIT; + struct object ovv = OINIT; + int k,j,nn; + char *vname; + odv=getoa(ob5,i+1); + nn = getoaSize(odv); + newRingp->partialEcart = nn; + newRingp->partialEcartGlobalVarX = (int *) sGC_malloc(sizeof(int)*nn+1); + if (newRingp->partialEcartGlobalVarX == NULL) errorKan1("%s\n","No more memory."); + for (j=0; jpartialEcartGlobalVarX)[j] = -1; + for (j=0; jpartialEcartGlobalVarX)[j] = k; break; + }else{ + if (k == n-1) errorKan1("%s\n","partialEcartGlobalVarX: no such variable."); + } + } + } + } + + switch_function("grade","module1v"); + /* Warning: grading is changed to module1v!! */ } else { errorKan1("%s\n","Unknown keyword to set_up_ring@"); } @@ -1675,8 +1841,8 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) struct object KsetVariableNames(struct object ob,struct ring *rp) { int n,i; - struct object ox; - struct object otmp; + struct object ox = OINIT; + struct object otmp = OINIT; char **xvars; char **dvars; if (ob.tag != Sarray) { @@ -1721,7 +1887,7 @@ struct object KswitchFunction(ob1,ob2) struct object ob1,ob2; { char *ans ; - struct object rob; + struct object rob = OINIT; int needWarningForAvoidTheSameRing = 0; extern int AvoidTheSameRing; if ((ob1.tag != Sdollar) || (ob2.tag != Sdollar)) { @@ -1763,14 +1929,14 @@ struct object KoReplace(of,rule) struct object of; struct object rule; { - struct object rob; + struct object rob = OINIT; POLY f; POLY lRule[N0*2]; POLY rRule[N0*2]; POLY r; int i; int n; - struct object trule; + struct object trule = OINIT; if (rule.tag != Sarray) { @@ -1826,7 +1992,7 @@ struct object Kparts(f,v) { POLY ff; POLY vv; - struct object obj; + struct object obj = OINIT; struct matrixOfPOLY *co; /* check the data type */ if (f.tag != Spoly || v.tag != Spoly) @@ -1843,7 +2009,7 @@ struct object Kparts2(f,v) { POLY ff; POLY vv; - struct object obj; + struct object obj = OINIT; struct matrixOfPOLY *co; /* check the data type */ if (f.tag != Spoly || v.tag != Spoly) @@ -1891,7 +2057,8 @@ struct object Ksp(ob1,ob2) struct object ob1,ob2; { struct spValue sv; - struct object rob,cob; + struct object rob = OINIT; + struct object cob = OINIT; POLY f; if (ob1.tag != Spoly || ob2.tag != Spoly) errorKan1("%s\n","Ksp(): The arguments must be polynomials."); @@ -1921,7 +2088,7 @@ struct object Keval(obj) { char *key; int size; - struct object rob; + struct object rob = OINIT; rob = NullObject; if (obj.tag != Sarray) @@ -1966,8 +2133,8 @@ char *KremoveSpace(str) struct object KtoRecords(ob) struct object ob; { - struct object obj; - struct object tmp; + struct object obj = OINIT; + struct object tmp = OINIT; int i; int size; char **argv; @@ -2063,46 +2230,96 @@ int KtoArgvbyCurryBrace(str,argv,limit) } struct object KstringToArgv(struct object ob) { - struct object rob; + struct object rob = OINIT; char *s; 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 ' ')) { - 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 ' ')) { - 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; im->ringp)))); - } + 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 if (strcmp(key,"exponents")==0) { + if (size == 3) { + obj1 = getoa(obj,1); + obj2 = getoa(obj,2); + rob = KgetExponents(obj1,obj2); + }else if (size == 2) { + obj1 = getoa(obj,1); + obj2 = KpoInteger(2); + rob = KgetExponents(obj1,obj2); + }else{ + errorKan1("%s\n","[(exponents) f type] gbext"); + } }else { errorKan1("%s\n","gbext : unknown tag."); } @@ -2392,9 +2637,12 @@ struct object KmpzExtension(struct object obj) { char *key; int size; - struct object keyo; + struct object keyo = OINIT; struct object rob = NullObject; - struct object obj0,obj1,obj2,obj3; + struct object obj0 = OINIT; + struct object obj1 = OINIT; + struct object obj2 = OINIT; + struct object obj3 = OINIT; MP_INT *f; MP_INT *g; MP_INT *h; @@ -2417,6 +2665,12 @@ struct object KmpzExtension(struct object obj) if (size != 3) errorKan1("%s\n","[(gcd) universalNumber universalNumber] mpzext."); obj1 = getoa(obj,1); obj2 = getoa(obj,2); + if (obj1.tag != SuniversalNumber) { + obj1 = KdataConversion(obj1,"universalNumber"); + } + if (obj2.tag != SuniversalNumber) { + obj2 = KdataConversion(obj2,"universalNumber"); + } if (obj1.tag != SuniversalNumber || obj2.tag != SuniversalNumber) errorKan1("%s\n","[(gcd) universalNumber universalNumber] mpzext."); if (! is_this_coeff_MP_INT(obj1.lc.universalNumber) || @@ -2433,6 +2687,12 @@ struct object KmpzExtension(struct object obj) if (size != 3) errorKan1("%s\n","[(tdiv_qr) universalNumber universalNumber] mpzext."); obj1 = getoa(obj,1); obj2 = getoa(obj,2); + if (obj1.tag != SuniversalNumber) { + obj1 = KdataConversion(obj1,"universalNumber"); + } + if (obj2.tag != SuniversalNumber) { + obj2 = KdataConversion(obj2,"universalNumber"); + } if (obj1.tag != SuniversalNumber || obj2.tag != SuniversalNumber) errorKan1("%s\n","[(tdiv_qr) universalNumber universalNumber] mpzext."); if (! is_this_coeff_MP_INT(obj1.lc.universalNumber) || @@ -2491,6 +2751,9 @@ struct object KmpzExtension(struct object obj) /* One arg functions */ if (size != 2) errorKan1("%s\n","[key num] mpzext"); obj1 = getoa(obj,1); + if (obj1.tag != SuniversalNumber) { + obj1 = KdataConversion(obj1,"universalNumber"); + } if (obj1.tag != SuniversalNumber) errorKan1("%s\n","[key num] mpzext : num must be a universalNumber."); if (! is_this_coeff_MP_INT(obj1.lc.universalNumber)) @@ -2512,6 +2775,12 @@ struct object KmpzExtension(struct object obj) if (size != 3) errorKan1("%s\n","[key num1 num2] mpzext."); obj1 = getoa(obj,1); obj2 = getoa(obj,2); + if (obj1.tag != SuniversalNumber) { + obj1 = KdataConversion(obj1,"universalNumber"); + } + if (obj2.tag != SuniversalNumber) { + obj2 = KdataConversion(obj2,"universalNumber"); + } if (obj1.tag != SuniversalNumber || obj2.tag != SuniversalNumber) errorKan1("%s\n","[key num1 num2] mpzext."); if (! is_this_coeff_MP_INT(obj1.lc.universalNumber) || @@ -2543,6 +2812,15 @@ struct object KmpzExtension(struct object obj) /* three args */ if (size != 4) errorKan1("%s\n","[key num1 num2 num3] mpzext"); obj1 = getoa(obj,1); obj2 = getoa(obj,2); obj3 = getoa(obj,3); + if (obj1.tag != SuniversalNumber) { + obj1 = KdataConversion(obj1,"universalNumber"); + } + if (obj2.tag != SuniversalNumber) { + obj2 = KdataConversion(obj2,"universalNumber"); + } + if (obj3.tag != SuniversalNumber) { + obj3 = KdataConversion(obj3,"universalNumber"); + } if (obj1.tag != SuniversalNumber || obj2.tag != SuniversalNumber || obj3.tag != SuniversalNumber ) { @@ -2561,6 +2839,28 @@ struct object KmpzExtension(struct object obj) mpz_powm(r1,f,g,h); rob.tag = SuniversalNumber; rob.lc.universalNumber = mpintToCoeff(r1,SmallRingp); + } else if (strcmp(key,"lcm")==0) { + if (size != 3) errorKan1("%s\n","[(lcm) universalNumber universalNumber] mpzext."); + obj1 = getoa(obj,1); + obj2 = getoa(obj,2); + if (obj1.tag != SuniversalNumber) { + obj1 = KdataConversion(obj1,"universalNumber"); + } + if (obj2.tag != SuniversalNumber) { + obj2 = KdataConversion(obj2,"universalNumber"); + } + if (obj1.tag != SuniversalNumber || obj2.tag != SuniversalNumber) + errorKan1("%s\n","[lcm num1 num2] mpzext."); + if (! is_this_coeff_MP_INT(obj1.lc.universalNumber) || + ! is_this_coeff_MP_INT(obj2.lc.universalNumber)) { + errorKan1("%s\n","[(lcm) universalNumber universalNumber] mpzext."); + } + f = coeff_to_MP_INT(obj1.lc.universalNumber); + g = coeff_to_MP_INT(obj2.lc.universalNumber); + r1 = newMP_INT(); + mpz_lcm(r1,f,g); + rob.tag = SuniversalNumber; + rob.lc.universalNumber = mpintToCoeff(r1,SmallRingp); }else { errorKan1("%s\n","mpzExtension(): Unknown tag."); } @@ -2571,7 +2871,7 @@ struct object KmpzExtension(struct object obj) /** : context */ struct object KnewContext(struct object superObj,char *name) { struct context *cp; - struct object ob; + struct object ob = OINIT; if (superObj.tag != Sclass) { errorKan1("%s\n","The argument of KnewContext must be a Class.Context"); } @@ -2590,10 +2890,10 @@ struct object KcreateClassIncetance(struct object ob1, struct object ob3) { /* [class-tag super-obj] size [class-tag] cclass */ - struct object ob4; + struct object ob4 = OINIT; int size,size2,i; - struct object ob5; - struct object rob; + struct object ob5 = OINIT; + struct object rob = OINIT; if (ob1.tag != Sarray) errorKan1("%s\n","cclass: The first argument must be an array."); @@ -2646,8 +2946,8 @@ struct object KpoDouble(double a) { double toDouble0(struct object ob) { double r; int r3; - struct object ob2; - struct object ob3; + struct object ob2 = OINIT; + struct object ob3 = OINIT; switch(ob.tag) { case Sinteger: return( (double) (KopInteger(ob)) ); @@ -2676,7 +2976,7 @@ double toDouble0(struct object ob) { } struct object KpoGradedPolySet(struct gradedPolySet *grD) { - struct object rob; + struct object rob = OINIT; rob.tag = Sclass; rob.lc.ival = CLASSNAME_GradedPolySet; rob.rc.voidp = (void *) grD; @@ -2693,10 +2993,14 @@ static char *getspace0(int a) { return(s); } struct object KdefaultPolyRing(struct object ob) { - struct object rob; + struct object rob = OINIT; int i,j,k,n; - struct object ob1,ob2,ob3,ob4,ob5; - struct object t1; + struct object ob1 = OINIT; + struct object ob2 = OINIT; + struct object ob3 = OINIT; + struct object ob4 = OINIT; + struct object ob5 = OINIT; + struct object t1 = OINIT; char *s1; extern struct ring *CurrentRingp; static struct ring *a[N0]; @@ -2767,11 +3071,244 @@ struct object KdefaultPolyRing(struct object ob) { } +struct object Krest(struct object ob) { + struct object rob; + struct object *op; + int n,i; + if (ob.tag == Sarray) { + n = getoaSize(ob); + if (n == 0) return ob; + rob = newObjectArray(n-1); + for (i=1; i 0) { + ba = (unsigned char *) sGC_malloc(size); + if (ba == NULL) errorKan1("%s\n","No more memory."); + } + rob.tag = SbyteArray; rob.lc.bytes = ba; rob.rc.ival = size; + if (obj.tag == SbyteArray) { + n = getByteArraySize(obj); + ba2 = KopByteArray(obj); + for (i=0; i<(n 0) { + ba = (unsigned char *) sGC_malloc(size); + if (ba == NULL) errorKan1("%s\n","No more memory."); + } + rob.tag = SbyteArray; rob.lc.bytes = ba; rob.rc.ival = size; + for (i=0; i