Changeset 2d2e40 in git
- Timestamp:
- Dec 5, 2011, 2:54:08 PM (11 years ago)
- Branches:
- (u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
- Children:
- 1f03abac6bde42c766ce63555d33ee5bf00aa447
- Parents:
- 1f2d3b43da540e3165c73bc71f9dd23f9ec5170f
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/iparith.cc
r1f2d3b r2d2e40 208 208 static BOOLEAN jjLOAD(leftv res, leftv v, BOOLEAN autoexport = FALSE); 209 209 static int iiTabIndex(const jjValCmdTab dArithTab, const int len, const int op); 210 #ifdef MDEBUG211 #define jjMakeSub(A) jjDBMakeSub(A,__FILE__,__LINE__)212 static Subexpr jjDBMakeSub(leftv e,const char *f,const int l);213 #else214 210 static Subexpr jjMakeSub(leftv e); 215 #endif216 211 217 212 /*============= vars ======================*/ … … 534 529 } 535 530 poly u_p=(poly)u->CopyD(POLY_CMD); 536 int dummy;537 531 if ((u_p!=NULL) 538 532 && ((v_i!=0) && … … 822 816 poly a; 823 817 poly b; 824 int dummy;825 818 if (v->next==NULL) 826 819 { … … 1625 1618 else p=(intvec*)v->Data(); 1626 1619 int rl=c->nr+1; 1627 poly r=NULL,h;1628 1620 ideal result; 1629 1621 ideal *x=(ideal *)omAlloc(rl*sizeof(ideal)); … … 1887 1879 return FALSE; 1888 1880 } 1889 static BOOLEAN jjEXPORTTO(leftv res, leftv u, leftv v)1881 static BOOLEAN jjEXPORTTO(leftv, leftv u, leftv v) 1890 1882 { 1891 1883 //Print("exportto %s -> %s\n",v->Name(),u->Name() ); 1892 1884 return iiExport(v,0,(idhdl)u->data); 1893 1885 } 1894 static BOOLEAN jjERROR(leftv res, leftv u)1886 static BOOLEAN jjERROR(leftv, leftv u) 1895 1887 { 1896 1888 WerrorS((char *)u->Data()); … … 2418 2410 return FALSE; 2419 2411 } 2420 static BOOLEAN jjLOAD2(leftv res, leftv u,leftv v)2412 static BOOLEAN jjLOAD2(leftv res, leftv, leftv v) 2421 2413 { 2422 2414 return jjLOAD(res, v,TRUE); … … 2506 2498 return jjMONITOR2(res,v,NULL); 2507 2499 } 2508 static BOOLEAN jjMONITOR2(leftv res, leftv u,leftv v)2500 static BOOLEAN jjMONITOR2(leftv, leftv u,leftv v) 2509 2501 { 2510 2502 #if 0 … … 2571 2563 return err; 2572 2564 } 2573 static BOOLEAN jjNEWSTRUCT2(leftv res, leftv u, leftv v)2565 static BOOLEAN jjNEWSTRUCT2(leftv, leftv u, leftv v) 2574 2566 { 2575 2567 // u: the name of the new type … … 2953 2945 return TRUE; 2954 2946 } 2955 int l=0;2956 //resolvente r;2957 2947 syStrategy r; 2958 2948 intvec *weights=NULL; … … 3391 3381 #define jjWRONG2 (proc2)jjWRONG 3392 3382 #define jjWRONG3 (proc3)jjWRONG 3393 static BOOLEAN jjWRONG(leftv res, leftv u)3383 static BOOLEAN jjWRONG(leftv, leftv) 3394 3384 { 3395 3385 return TRUE; … … 3405 3395 return FALSE; 3406 3396 } 3407 static BOOLEAN jjNULL(leftv res, leftv u)3397 static BOOLEAN jjNULL(leftv, leftv) 3408 3398 { 3409 3399 return FALSE; … … 3419 3409 // return FALSE; 3420 3410 //} 3421 static BOOLEAN jjPLUSPLUS(leftv res, leftv u)3411 static BOOLEAN jjPLUSPLUS(leftv, leftv u) 3422 3412 { 3423 3413 if (IDTYP((idhdl)u->data)==INT_CMD) … … 3745 3735 return FALSE; 3746 3736 } 3747 static BOOLEAN jjDUMP(leftv res, leftv v)3737 static BOOLEAN jjDUMP(leftv, leftv v) 3748 3738 { 3749 3739 si_link l = (si_link)v->Data(); … … 3771 3761 return (co<=0); 3772 3762 } 3773 static BOOLEAN jjEXECUTE(leftv res, leftv v)3763 static BOOLEAN jjEXECUTE(leftv, leftv v) 3774 3764 { 3775 3765 char * d = (char *)v->Data(); … … 3841 3831 } 3842 3832 #endif 3843 static BOOLEAN jjGETDUMP(leftv res, leftv v)3833 static BOOLEAN jjGETDUMP(leftv, leftv v) 3844 3834 { 3845 3835 si_link l = (si_link)v->Data(); … … 3909 3899 return FALSE; 3910 3900 } 3911 static BOOLEAN jjHILBERT(leftv res, leftv v)3901 static BOOLEAN jjHILBERT(leftv, leftv v) 3912 3902 { 3913 3903 #ifdef HAVE_RINGS … … 4076 4066 return FALSE; 4077 4067 } 4078 static BOOLEAN jjIS_RINGVAR0(leftv res, leftv v)4068 static BOOLEAN jjIS_RINGVAR0(leftv res, leftv) 4079 4069 { 4080 4070 res->data = (char *)0; … … 4253 4243 A list [P, L, U] is returned. */ 4254 4244 matrix mat = (const matrix)v->Data(); 4255 int rr = mat->rows();4256 int cc = mat->cols();4257 4245 matrix pMat; 4258 4246 matrix lMat; … … 4273 4261 { 4274 4262 omUpdateInfo(); 4275 long d;4276 4263 switch(((int)(long)v->Data())) 4277 4264 { … … 4364 4351 return FALSE; 4365 4352 } 4366 static BOOLEAN jjOpenClose(leftv res, leftv v)4353 static BOOLEAN jjOpenClose(leftv, leftv v) 4367 4354 { 4368 4355 si_link l=(si_link)v->Data(); … … 4392 4379 return FALSE; 4393 4380 } 4394 static BOOLEAN jjPARDEG(leftv res, leftv v)4381 static BOOLEAN jjPARDEG(leftv res, leftv) 4395 4382 { 4396 4383 if (rField_is_Extension(currRing)) … … 4510 4497 char *s= (char *)v->Data(); 4511 4498 int i = 1; 4512 int l = strlen(s);4513 4499 for(i=0; i<sArithBase.nCmdUsed; i++) 4514 4500 { … … 4646 4632 static BOOLEAN jjSQR_FREE(leftv res, leftv u) 4647 4633 { 4648 intvec *v=NULL;4649 4634 singclap_factorize_retry=0; 4650 4635 ideal f=singclap_sqrfree((poly)(u->CopyD()),currRing); … … 4879 4864 return FALSE; 4880 4865 } 4881 static BOOLEAN jjLOAD(leftv res, leftv v, BOOLEAN autoexport)4866 static BOOLEAN jjLOAD(leftv, leftv v, BOOLEAN autoexport) 4882 4867 { 4883 4868 char * s=(char *)v->CopyD(); … … 5842 5827 return FALSE; 5843 5828 } 5844 static BOOLEAN jjNEWSTRUCT3(leftv res, leftv u, leftv v, leftv w)5829 static BOOLEAN jjNEWSTRUCT3(leftv, leftv u, leftv v, leftv w) 5845 5830 { 5846 5831 // u: the name of the new type … … 5850 5835 (const char *)w->Data()); 5851 5836 if (d!=NULL) newstruct_setup((const char *)u->Data(),d); 5852 return d==NULL;5837 return (d==NULL); 5853 5838 } 5854 5839 static BOOLEAN jjPREIMAGE(leftv res, leftv u, leftv v, leftv w) … … 6268 6253 /* must be ordered: first operations for chars (infix ops), 6269 6254 * then alphabetically */ 6270 static BOOLEAN jjBREAK0(leftv res, leftvv)6255 static BOOLEAN jjBREAK0(leftv, leftv) 6271 6256 { 6272 6257 #ifdef HAVE_SDB … … 6275 6260 return FALSE; 6276 6261 } 6277 static BOOLEAN jjBREAK1(leftv res, leftv v)6262 static BOOLEAN jjBREAK1(leftv, leftv v) 6278 6263 { 6279 6264 #ifdef HAVE_SDB … … 6316 6301 } 6317 6302 6318 static BOOLEAN jjCOEF_M(leftv res, leftv v)6303 static BOOLEAN jjCOEF_M(leftv, leftv v) 6319 6304 { 6320 6305 if((v->Typ() != VECTOR_CMD) … … 6888 6873 return FALSE; 6889 6874 } 6890 static BOOLEAN jjNAMES0(leftv res, leftv v)6875 static BOOLEAN jjNAMES0(leftv res, leftv) 6891 6876 { 6892 6877 res->data=(void *)ipNameList(IDROOT); … … 7013 6998 } 7014 6999 } 7015 static BOOLEAN jjRESERVED0(leftv res, leftvv)7000 static BOOLEAN jjRESERVED0(leftv, leftv) 7016 7001 { 7017 7002 int i=1; … … 7068 7053 return FALSE; 7069 7054 } 7070 static BOOLEAN jjTEST(leftv res, leftv v)7055 static BOOLEAN jjTEST(leftv, leftv v) 7071 7056 { 7072 7057 do … … 7382 7367 7383 7368 7384 #ifdef MDEBUG7385 static Subexpr jjDBMakeSub(leftv e,const char *f,const int l)7386 #else7387 7369 static Subexpr jjMakeSub(leftv e) 7388 #endif7389 7370 { 7390 7371 assume( e->Typ()==INT_CMD ); … … 8235 8216 int iiInitArithmetic() 8236 8217 { 8237 int i;8238 8218 //printf("iiInitArithmetic()\n"); 8239 8219 memset(&sArithBase, 0, sizeof(sArithBase)); … … 8269 8249 } 8270 8250 8271 /*---------------------------------------------------------------------*/8272 /**8273 * @brief append newitem of size sizeofitem to the list named list.8274 8275 @param[in,out] list8276 @param[in,out] item_count8277 @param[in] sizeofitem8278 @param[in] newitem8279 8280 @retval 0 success8281 @retval -1 failure8282 **/8283 /*---------------------------------------------------------------------*/8284 int iiArithAddItem2list(8285 void **list,8286 long *item_count,8287 long sizeofitem,8288 void *newitem8289 )8290 {8291 int count = *item_count;8292 8293 //TRACE(0, "add_item_to_list(%p, %p, %ld, %p)\n", list, item_count,8294 // sizeofitem, newitem);8295 8296 if(count==0)8297 {8298 *list = (void *)omAlloc(sizeofitem);8299 }8300 else8301 {8302 *list = (void *)omRealloc(*list, (count+1) * sizeofitem);8303 }8304 if((*list)==NULL) return -1;8305 8306 //memset((*list)+count*sizeofitem, 0, sizeofitem);8307 //memcpy((*list)+count*sizeofitem, newitem, sizeofitem);8308 8309 /* erhoehe counter um 1 */8310 (count)++;8311 *item_count = count;8312 return 0;8313 }8314 8315 8251 int iiArithFindCmd(const char *szName) 8316 8252 { -
libpolys/coeffs/ffields.cc
r1f2d3b r2d2e40 205 205 * number -> int 206 206 */ 207 int nfInt (number & n, const coeffs r)207 int nfInt (number &, const coeffs ) 208 208 { 209 209 return 0; -
libpolys/coeffs/longrat.cc
r1f2d3b r2d2e40 1268 1268 { 1269 1269 int in=mpz_fdiv_ui(n->n,(unsigned long)p); 1270 long s , t;1270 long s; 1271 1271 1272 1272 long u, v, u0, v0, u1, v1, u2, v2, q, r; … … 2458 2458 2459 2459 2460 static number nlInitMPZ(mpz_t m, const coeffs r)2460 static number nlInitMPZ(mpz_t m, const coeffs) 2461 2461 { 2462 2462 number z = ALLOC_RNUMBER(); -
libpolys/polys/ext_fields/algext.cc
r1f2d3b r2d2e40 571 571 return (number)p; 572 572 } 573 CanonicalForm naConvSingNFactoryN( number n, BOOLEAN setChar, const coeffs cf )573 CanonicalForm naConvSingNFactoryN( number n, BOOLEAN /*setChar*/, const coeffs cf ) 574 574 { 575 575 naTest(n); … … 639 639 #endif 640 640 641 number naCopyExt(number a, const coeffs src, const coeffs dst)641 number naCopyExt(number a, const coeffs src, const coeffs) 642 642 { 643 643 fraction fa=(fraction)a; -
libpolys/polys/matpol.cc
r1f2d3b r2d2e40 728 728 } 729 729 730 static void mp_FinalClean(matrix a, const ring R)730 static void mp_FinalClean(matrix a, const ring) 731 731 { 732 732 omFreeSize((ADDRESS)a->m,a->nrows*a->ncols*sizeof(poly)); … … 1457 1457 /// entries of a are minors and go to result (only if not in R) 1458 1458 void mp_MinorToResult(ideal result, int &elems, matrix a, int r, int c, 1459 ideal R, const ring ri)1459 ideal R, const ring) 1460 1460 { 1461 1461 poly *q1; -
libpolys/polys/monomials/p_polys.cc
r1f2d3b r2d2e40 3307 3307 * NOTE: this only works for Frank's alg. & trans. fields 3308 3308 */ 3309 poly n_PermNumber(const number z, const int *par_perm, const int OldPar, const ring src, const ring dst)3309 poly n_PermNumber(const number z, const int *par_perm, const int , const ring src, const ring dst) 3310 3310 { 3311 3311 #if 0 -
libpolys/polys/monomials/ring.cc
r1f2d3b r2d2e40 1604 1604 #ifdef HAVE_PLURAL 1605 1605 if (rIsPluralRing(r)) 1606 if( nc_rCopy(res, r, true) ) ;1606 if( nc_rCopy(res, r, true) ) {} 1607 1607 #endif 1608 1608 -
libpolys/polys/nc/ncSACache.h
r1f2d3b r2d2e40 88 88 }; 89 89 90 virtual void History(const EHistoryType t, const CExponent a, const CExponent b, const poly p = NULL)90 virtual void History(const EHistoryType , const CExponent a, const CExponent b, const poly p = NULL) 91 91 { 92 92 PrintS("CCacheHash::History(a, b, [p])!\n"); -
libpolys/polys/simpleideals.cc
r1f2d3b r2d2e40 1230 1230 if (cp>mod->rank) 1231 1231 { 1232 Print("## inv. rank %ld -> % d\n",mod->rank,cp);1232 Print("## inv. rank %ld -> %ld\n",mod->rank,cp); 1233 1233 int k,l,o=mod->rank; 1234 1234 mod->rank=cp; -
libpolys/polys/sparsmat.cc
r1f2d3b r2d2e40 528 528 poly sparse_mat::smDet() 529 529 { 530 int y;531 530 poly res = NULL; 532 531 … … 938 937 smpoly res, a, b; 939 938 poly ha, hr, x, y; 940 int e, ip, ir, ia , lev;939 int e, ip, ir, ia; 941 940 942 941 if ((c == NULL) || (r == NULL)) … … 1985 1984 static void sm_ExpMultDiv(poly t, const poly b, const poly c, const ring R) 1986 1985 { 1987 int i;1988 1986 p_Test(t,R); 1989 1987 p_LmTest(b,R); … … 2372 2370 { 2373 2371 sparse_number_mat *linsolv; 2374 ring origR;2375 2372 ring tmpR; 2376 2373 ideal rr;
Note: See TracChangeset
for help on using the changeset viewer.