Changeset 4bebba in git
 Timestamp:
 May 10, 2007, 9:48:36 AM (16 years ago)
 Branches:
 (u'jengelhdatetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')
 Children:
 009d804796df43404d81c335304a5d0d04f0705f
 Parents:
 2a4de844a903a486ebd9eb9e66e636b0c391710c
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

Singular/ipshell.cc
r2a4de8 r4bebba 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: ipshell.cc,v 1.15 6 20070503 13:52:25wienand Exp $ */4 /* $Id: ipshell.cc,v 1.157 20070510 07:48:36 wienand Exp $ */ 5 5 /* 6 6 * ABSTRACT: … … 554 554 } 555 555 556 #ifdef HAVE_RING2TOM 556 #ifdef HAVE_RING2TOM_OLD 557 557 // avoid to test the "special" char: 1, 0, 1, 2 558 558 int Is2toM(int p) /* brute force !!!! */ … … 4366 4366 { 4367 4367 int ch; 4368 #if defined(HAVE_RING2TOM) defined(HAVE_RINGMODN) 4369 int cring = 0; 4368 #ifdef HAVE_RINGS 4369 int ringtype = 0; 4370 unsigned long ringflaga = 0; 4371 unsigned int ringflagb = 0; 4370 4372 #endif 4371 4373 int float_len=0; … … 4422 4424 } 4423 4425 ch = module; 4424 cring = 2; 4426 ringtype = 2; 4427 ringflaga = module; 4425 4428 } 4426 4429 #endif … … 4429 4432 && (strcmp(pn>name,"modpow")==0)) 4430 4433 { 4431 long base = 0;4432 longexp = 0;4434 unsigned long base = 0; 4435 unsigned int exp = 0; 4433 4436 if ((pn>next!=NULL) && (pn>next>Typ()==INT_CMD)) 4434 4437 { … … 4437 4440 if ((pn>next!=NULL) && (pn>next>Typ()==INT_CMD)) 4438 4441 { 4439 exp = (unsigned long) pn>next>Data();4442 exp = (unsigned int) (unsigned long) pn>next>Data(); 4440 4443 pn=pn>next; 4441 4444 } … … 4449 4452 if (base == 2) 4450 4453 { 4451 cring = 1; // Use Z/2^ch 4454 ringtype = 1; // Use Z/2^ch 4455 ringflaga = exp; 4452 4456 Print("Beta: using Z/2^%d", ch); 4453 4457 PrintLn(); … … 4455 4459 else 4456 4460 { 4457 cring = base; 4461 ringtype = 3; 4462 ringflaga = base; 4463 ringflagb = exp; 4464 // ch = base**exp 4458 4465 Werror("p^n not yet implemented"); 4459 4466 goto rInitError; … … 4483 4490 */ 4484 4491 if ((ch!=1) 4485 #if defined(HAVE_RING2TOM) defined(HAVE_RINGMODN)4486 && ( cring== 0)4492 #ifdef HAVE_RINGS 4493 && (ringtype == 0) 4487 4494 #endif 4488 4495 ) … … 4520 4527 R = (ring) omAlloc0Bin(sip_sring_bin); 4521 4528 R>ch = ch; 4522 #ifdef HAVE_RING2TOM 4523 R>cring = cring; 4529 #ifdef HAVE_RINGS 4530 R>ringtype = ringtype; 4531 R>ringflaga = ringflaga; 4532 R>ringflagb = ringflagb; 4524 4533 #endif 4525 4534 if (ch == 1)
Note: See TracChangeset
for help on using the changeset viewer.