Changeset 1bc7201 in git

Timestamp:

Oct 19, 2012, 6:38:35 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

c879eea1669e963fb4c7287a3963abb287d00a49

Parents:

b37b3984a12e1552c7bafc9fd5a7849240ea79806bbe944402dfca102dcc3e036c4f2f119be41e44

Message:

Merge pull request #192 from mmklee/algExtGCD_sw

Alg ext gcd sw

Files:

• Singular/extra.cc (modified) (9 diffs)
• Singular/feOpt.cc (modified) (1 diff)
• Singular/iparith.cc (modified) (9 diffs)
• Singular/ipassign.cc (modified) (16 diffs)
• Singular/ipshell.cc (modified) (7 diffs)
• Singular/links/ndbm.cc (modified) (2 diffs)
• Singular/links/silink.cc (modified) (7 diffs)
• Singular/links/ssiLink.cc (modified) (9 diffs)
• Singular/misc_ip.cc (modified) (13 diffs)
• Singular/walk.cc (modified) (31 diffs)
• Singular/walk_ip.cc (modified) (4 diffs)
• Tst/Short/bug_55.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_55.stat (modified) (1 diff)
• Tst/Short/bug_qring.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_qring.stat (modified) (1 diff)
• dyn_modules/syzextra/myNF.cc (modified) (3 diffs)
• factory/algext.cc (modified) (6 diffs)
• factory/cf_chinese.cc (modified) (1 diff)
• factory/cf_gcd_smallp.cc (modified) (1 diff)
• factory/facFqBivarUtil.cc (modified) (1 diff)
• factory/facFqSquarefree.h (modified) (1 diff)
• factory/facHensel.cc (modified) (5 diffs)
• factory/facMul.cc (modified) (1 diff)
• factory/fac_ezgcd.cc (modified) (1 diff)
• kernel/fast_maps.cc (modified) (1 diff)
• kernel/ideals.cc (modified) (8 diffs)
• kernel/kInline.h (modified) (1 diff)
• kernel/kstd1.cc (modified) (11 diffs)
• kernel/kstd2.cc (modified) (11 diffs)
• kernel/nc.cc (modified) (5 diffs)
• kernel/syz.cc (modified) (13 diffs)
• kernel/syz1.cc (modified) (19 diffs)
• kernel/syz2.cc (modified) (8 diffs)
• kernel/syz3.cc (modified) (9 diffs)
• kernel/walkMain.cc (modified) (17 diffs)
• libpolys/misc/mylimits.h (modified) (2 diffs)
• libpolys/misc/options.c (modified) (1 diff)
• libpolys/misc/options.h (modified) (2 diffs)
• libpolys/polys/monomials/p_polys.cc (modified) (5 diffs)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

Singular/extra.cc

@@ -439 +439 @@
           #endif
           #ifdef TEST_MAC_ORDER
-            TEST_FOR("MAC_ORDER");
+            TEST_FOR("MAC_ORDER")
           #endif
           // unconditional since 3-1-0-6
-            TEST_FOR("Namespaces");
+            TEST_FOR("Namespaces")
           #ifdef HAVE_DYNAMIC_LOADING
-            TEST_FOR("DynamicLoading");
+            TEST_FOR("DynamicLoading")
           #endif
           #ifdef HAVE_EIGENVAL
-            TEST_FOR("eigenval");
+            TEST_FOR("eigenval")
           #endif
           #ifdef HAVE_GMS
-            TEST_FOR("gms");
+            TEST_FOR("gms")
           #endif
           #ifdef OM_NDEBUG
-            TEST_FOR("om_ndebug");
+            TEST_FOR("om_ndebug")
           #endif
           #ifdef NDEBUG
-            TEST_FOR("ndebug");
+            TEST_FOR("ndebug")
           #endif
             ;
@@ -2297 +2297 @@
            test_PosInL=NULL;
          }
-         verbose|=Sy_bit(23);
+         si_opt_2|=Sy_bit(23);
          return FALSE;
       }
@@ -2648 +2648 @@
         if ((h!=NULL) &&(h->Typ()==IDEAL_CMD))
         {
-          int i=0;
           if (h->next!=NULL)
           {
@@ -2670 +2669 @@
         if ((h!=NULL) &&(h->Typ()==IDEAL_CMD))
         {
-          int i=0;
           if (h->next!=NULL)
           {
@@ -3064 +3062 @@
       if (strcmp(sys_cmd, "minor")==0)
       {
-        ring r = currRing;
         matrix a = (matrix) h->Data();
         h = h->next;
@@ -3321 +3318 @@
       {
         int start,end;
-        int is;
         if ((h!=NULL) && (h->Typ()==POLY_CMD))
         {
@@ -3426 +3422 @@
       if (strcmp(sys_cmd, "unifastmult")==0)
       {
-        ring r = currRing;
         poly f = (poly)h->Data();
         h=h->next;
@@ -3437 +3432 @@
       if (strcmp(sys_cmd, "multifastmult")==0)
       {
-        ring r = currRing;
         poly f = (poly)h->Data();
         h=h->next;
@@ -3466 +3460 @@
       if (strcmp(sys_cmd, "normalpower")==0)
       {
-        ring r = currRing;
         poly f = (poly)h->Data();
         h=h->next;

Singular/feOpt.cc

@@ -219 +219 @@
       case FE_OPT_QUIET:
         if (feOptSpec[FE_OPT_QUIET].value)
-          verbose &= ~(Sy_bit(0)|Sy_bit(V_LOAD_LIB));
-        else
-          verbose |= Sy_bit(V_LOAD_LIB)|Sy_bit(0);
+          si_opt_2 &= ~(Sy_bit(0)|Sy_bit(V_LOAD_LIB));
+        else
+          si_opt_2 |= Sy_bit(V_LOAD_LIB)|Sy_bit(0);
         return NULL;
 

Singular/iparith.cc

@@ -2490 +2490 @@
 static BOOLEAN jjLIFT(leftv res, leftv u, leftv v)
 {
-  BITSET save_test=test;
   int ul= IDELEMS((ideal)u->Data());
   int vl= IDELEMS((ideal)v->Data());
@@ -2497 +2496 @@
   if (m==NULL) return TRUE;
   res->data = (char *)id_Module2formatedMatrix(m,ul,vl,currRing);
-  test=save_test;
   return FALSE;
 }
@@ -3416 +3414 @@
       }
     }
-    BITSET save_test=test;
-    test|=Sy_bit(OPT_SB_1);
+    BITSET save1;
+    SI_SAVE_OPT1(save1);
+    si_opt_1|=Sy_bit(OPT_SB_1);
     /* ii0 appears to be the position of the first element of il that
        does not belong to the old SB ideal */
     result=kStd(i1,currQuotient,hom,&w,NULL,0,ii0);
-    test=save_test;
+    SI_RESTORE_OPT1(save1);
     idDelete(&i1);
     idSkipZeroes(result);
@@ -6413 +6412 @@
 {
   if (w->rtyp!=IDHDL) return TRUE;
-  BITSET save_test=test;
   int ul= IDELEMS((ideal)u->Data());
   int vl= IDELEMS((ideal)v->Data());
@@ -6421 +6419 @@
   if (m==NULL) return TRUE;
   res->data = (char *)id_Module2formatedMatrix(m,ul,vl,currRing);
-  test=save_test;
   return FALSE;
 }
@@ -7237 +7234 @@
     Kstd1_deg=(int)(long)u3->Data();
     kModW=(intvec *)u4->Data();
-    BITSET save=verbose;
-    verbose|=Sy_bit(V_DEG_STOP);
+    BITSET save2;
+    SI_SAVE_OPT2(save2);
+    si_opt_2|=Sy_bit(V_DEG_STOP);
     u2->next=NULL;
     BOOLEAN r=jjCALL2ARG(res,u);
     kModW=NULL;
     Kstd1_deg=save_d;
-    verbose=save;
+    SI_RESTORE_OPT2(save2);
     u->next->next=u3;
     return r;
@@ -7651 +7649 @@
     i0=idInit(1,i1->rank);
     i0->m[0]=(poly)v->Data();
-    BOOLEAN cleanup_i0=TRUE;
+    cleanup_i0=TRUE;
   }
   else if (r==IDEAL_CMD)/* IDEAL */
@@ -7685 +7683 @@
     }
   }
-  BITSET save_test=test;
-  test|=Sy_bit(OPT_SB_1);
+  BITSET save1;
+  SI_SAVE_OPT1(save1);
+  si_opt_1|=Sy_bit(OPT_SB_1);
   result=kStd(i1,
               currQuotient,
@@ -7695 +7694 @@
               IDELEMS(i1)-ii0,      // new ideal
               vw);                  // weights of vars
-  test=save_test;
+  SI_RESTORE_OPT1(save1);
   idDelete(&i1);
   idSkipZeroes(result);

Singular/ipassign.cc

@@ -92 +92 @@
   Kstd1_deg=(int)((long)(a->Data()));
   if (Kstd1_deg!=0)
-    test |=Sy_bit(OPT_DEGBOUND);
+    si_opt_1 |=Sy_bit(OPT_DEGBOUND);
   else
-    test &=(~Sy_bit(OPT_DEGBOUND));
-  return FALSE;
-}
-static BOOLEAN jjMAXMULT(leftv res, leftv a)
+    si_opt_1 &=(~Sy_bit(OPT_DEGBOUND));
+  return FALSE;
+}
+static BOOLEAN jjMAXMULT(leftv, leftv a)
 {
   Kstd1_mu=(int)((long)(a->Data()));
   if (Kstd1_mu!=0)
-    test |=Sy_bit(OPT_MULTBOUND);
+    si_opt_1 |=Sy_bit(OPT_MULTBOUND);
   else
-    test &=(~Sy_bit(OPT_MULTBOUND));
+    si_opt_1 &=(~Sy_bit(OPT_MULTBOUND));
   return FALSE;
 }
@@ -381 +381 @@
   return FALSE;
 }
-static BOOLEAN jiA_NUMBER(leftv res, leftv a, Subexpr e)
+static BOOLEAN jiA_NUMBER(leftv res, leftv a, Subexpr)
 {
   number p=(number)a->CopyD(NUMBER_CMD);
@@ -430 +430 @@
   return FALSE;
 }
-static BOOLEAN jiA_LIST_RES(leftv res, leftv a,Subexpr e)
+static BOOLEAN jiA_LIST_RES(leftv res, leftv a,Subexpr)
 {
   syStrategy r=(syStrategy)a->CopyD(RESOLUTION_CMD);
@@ -441 +441 @@
   return FALSE;
 }
-static BOOLEAN jiA_LIST(leftv res, leftv a,Subexpr e)
+static BOOLEAN jiA_LIST(leftv res, leftv a,Subexpr)
 {
   lists l=(lists)a->CopyD(LIST_CMD);
@@ -565 +565 @@
   return FALSE;
 }
-static BOOLEAN jiA_PROC(leftv res, leftv a, Subexpr e)
+static BOOLEAN jiA_PROC(leftv res, leftv a, Subexpr)
 {
   extern procinfo *iiInitSingularProcinfo(procinfo *pi, const char *libname,
@@ -585 +585 @@
   return FALSE;
 }
-static BOOLEAN jiA_INTVEC(leftv res, leftv a, Subexpr e)
+static BOOLEAN jiA_INTVEC(leftv res, leftv a, Subexpr)
 {
   //if ((res->data==NULL) || (res->Typ()==a->Typ()))
@@ -608 +608 @@
 #endif
 }
-static BOOLEAN jiA_BIGINTMAT(leftv res, leftv a, Subexpr e)
+static BOOLEAN jiA_BIGINTMAT(leftv res, leftv a, Subexpr)
 {
   if (res->data!=NULL) delete ((bigintmat *)res->data);
@@ -615 +615 @@
   return FALSE;
 }
-static BOOLEAN jiA_IDEAL(leftv res, leftv a, Subexpr e)
+static BOOLEAN jiA_IDEAL(leftv res, leftv a, Subexpr)
 {
   if (res->data!=NULL) idDelete((ideal*)&res->data);
@@ -633 +633 @@
   return FALSE;
 }
-static BOOLEAN jiA_RESOLUTION(leftv res, leftv a, Subexpr e)
+static BOOLEAN jiA_RESOLUTION(leftv res, leftv a, Subexpr)
 {
   if (res->data!=NULL) syKillComputation((syStrategy)res->data);
@@ -640 +640 @@
   return FALSE;
 }
-static BOOLEAN jiA_MODUL_P(leftv res, leftv a, Subexpr e)
+static BOOLEAN jiA_MODUL_P(leftv res, leftv a, Subexpr)
 {
   if (res->data!=NULL) idDelete((ideal*)&res->data);
@@ -655 +655 @@
   return FALSE;
 }
-static BOOLEAN jiA_IDEAL_M(leftv res, leftv a, Subexpr e)
+static BOOLEAN jiA_IDEAL_M(leftv res, leftv a, Subexpr)
 {
   if (res->data!=NULL) idDelete((ideal*)&res->data);
@@ -667 +667 @@
   return FALSE;
 }
-static BOOLEAN jiA_LINK(leftv res, leftv a, Subexpr e)
+static BOOLEAN jiA_LINK(leftv res, leftv a, Subexpr)
 {
   si_link l=(si_link)res->data;
@@ -691 +691 @@
 }
 // assign map -> map
-static BOOLEAN jiA_MAP(leftv res, leftv a, Subexpr e)
+static BOOLEAN jiA_MAP(leftv res, leftv a, Subexpr)
 {
   if (res->data!=NULL)
@@ -704 +704 @@
 }
 // assign ideal -> map
-static BOOLEAN jiA_MAP_ID(leftv res, leftv a, Subexpr e)
+static BOOLEAN jiA_MAP_ID(leftv res, leftv a, Subexpr)
 {
   map f=(map)res->data;
@@ -812 +812 @@
   return FALSE;
 }
-static BOOLEAN jiA_PACKAGE(leftv res, leftv a, Subexpr e)
+static BOOLEAN jiA_PACKAGE(leftv res, leftv a, Subexpr)
 {
   res->data=(void *)a->CopyD(PACKAGE_CMD);
@@ -1880 +1880 @@
   }
 }
-BOOLEAN jjIMPORTFROM(leftv res, leftv u, leftv v)
+BOOLEAN jjIMPORTFROM(leftv, leftv u, leftv v)
 {
   //Print("importfrom %s::%s ->.\n",v->Name(),u->Name() );

Singular/ipshell.cc

@@ -426 +426 @@
   BOOLEAN all = typ<0;
   BOOLEAN really_all=FALSE;
-  BOOLEAN do_packages=FALSE;
-
-  if ( typ == -1 ) do_packages=TRUE;
+
   if ( typ==0 )
   {
@@ -508 +506 @@
     if (ii < 32)
     {
-      test &= ~Sy_bit(ii);
+      si_opt_1 &= ~Sy_bit(ii);
     }
     else if (ii < 64)
     {
-      verbose &= ~Sy_bit(ii-32);
+      si_opt_2 &= ~Sy_bit(ii-32);
     }
     else
@@ -523 +521 @@
     {
       Warn("Gerhard, use the option command");
-      test |= Sy_bit(ii);
+      si_opt_1 |= Sy_bit(ii);
     }
     else if (Sy_bit(ii) & validOpts)
-      test |= Sy_bit(ii);
+      si_opt_1 |= Sy_bit(ii);
   }
   else if (i<64)
   {
     ii=i-32;
-    verbose |= Sy_bit(ii);
+    si_opt_2 |= Sy_bit(ii);
   }
   else
@@ -2530 +2528 @@
           {
             par_perm_size=rPar(orig_ring);
-            BITSET save_test=test;
 
 //            if ((orig_ring->minpoly != NULL) || (orig_ring->qideal != NULL))
@@ -2537 +2534 @@
 
             nSetChar(currRing->cf);
-            test=save_test;
           }
           else
@@ -5055 +5051 @@
   int float_len2=0;
   ring R = NULL;
-  BOOLEAN ffChar=FALSE;
+  //BOOLEAN ffChar=FALSE;
 
   /* ch -------------------------------------------------------*/
@@ -5251 +5247 @@
   else
   {
-    sleftv* p = pn;
     Werror("Wrong or unknown ground field specification");
 #ifndef NDEBUG
+    sleftv* p = pn;
     while (p != NULL)
     {

Singular/links/ndbm.cc

@@ -61 +61 @@
 static  datum makdatum(char buf[PBLKSIZ], int n);
 static  int finddatum(char buf[PBLKSIZ], datum item);
-static  long hashinc(register DBM *db, long hash);
 static  long dcalchash(datum item);
 static  int delitem(char buf[PBLKSIZ], int n);
@@ -449 +448 @@
 };
 
-static long hashinc(register DBM *db, long hash)
-{
-  long bit;
-
-  hash &= db->dbm_hmask;
-  bit = db->dbm_hmask+1;
-  for (;;)
-  {
-    bit >>= 1;
-    if (bit == 0)
-      return (0L);
-    if ((hash & bit) == 0)
-      return (hash | bit);
-    hash &= ~bit;
-  }
-}
-
 static long dcalchash(datum item)
 {

Singular/links/silink.cc

@@ -236 +236 @@
 leftv slRead(si_link l, leftv a)
 {
-  char *mode;
   leftv v = NULL;
   if( ! SI_LINK_R_OPEN_P(l)) // open r ?
@@ -381 +380 @@
 
 /* =============== ASCII ============================================= */
-BOOLEAN slOpenAscii(si_link l, short flag, leftv h)
+BOOLEAN slOpenAscii(si_link l, short flag, leftv)
 {
   const char *mode;
@@ -546 +545 @@
 
   if (currRingHdl != rh) rSetHdl(rh);
-  fprintf(fd, "option(set, intvec(%d, %d));\n", test, verbose);
+  fprintf(fd, "option(set, intvec(%d, %d));\n", si_opt_1, si_opt_2);
   fprintf(fd, "RETURN();\n");
   fflush(fd);
@@ -665 +664 @@
         lists l = IDLIST(h);
         int i, nl = l->nr + 1;
-        char *name;
 
         for (i=0; i<nl; i++)
@@ -740 +738 @@
   else  if (type_id == STRING_CMD)
   {
-    char *pstr = IDSTRING(h), c;
+    char *pstr = IDSTRING(h);
     fputc('"', fd);
     while (*pstr != '\0')
@@ -753 +751 @@
   {
     procinfov pi = IDPROC(h);
-    if (pi->language == LANG_SINGULAR) {
+    if (pi->language == LANG_SINGULAR)
+    {
       if( pi->data.s.body==NULL) iiGetLibProcBuffer(pi);
-      char *pstr = pi->data.s.body, c;
+      char *pstr = pi->data.s.body;
       fputc('"', fd);
-      while (*pstr != '\0') {
+      while (*pstr != '\0')
+      {
         if (*pstr == '"' || *pstr == '\\') fputc('\\', fd);
         fputc(*pstr, fd);
@@ -763 +763 @@
       }
       fputc('"', fd);
-    } else fputs("(null)", fd);
+    }
+    else fputs("(null)", fd);
   }
   else

Singular/links/ssiLink.cc

@@ -243 +243 @@
 }
 
-void ssiWritePoly(ssiInfo *d, int typ, poly p)
+void ssiWritePoly(ssiInfo *d, poly p)
 {
   SSI_BLOCK_CHLD;
@@ -267 +267 @@
 void ssiWriteIdeal(ssiInfo *d, int typ,ideal I)
 {
-   // syntax: 7 # of elements <poly 1> <poly2>.....
-   // syntax: 8 <rows> <cols> <poly 1> <poly2>.....
+   // syntax ideal/module: 7 # of elements <poly 1> <poly2>.....
+   // syntax matrix: 8 <rows> <cols> <poly 1> <poly2>.....
    matrix M=(matrix)I;
    SSI_BLOCK_CHLD;
@@ -278 +278 @@
 
    int i;
-   int tt;
-   if (typ==MODUL_CMD) tt=VECTOR_CMD;
-   else                tt=POLY_CMD;
 
    for(i=0;i<IDELEMS(I);i++)
    {
-     ssiWritePoly(d,tt,I->m[i]);
+     ssiWritePoly(d,I->m[i]);
    }
 }
@@ -516 +513 @@
   //Print("poly: terms:%d\n",n);
   poly p;
-  int j;
-  j=0;
   poly ret=NULL;
   poly prev=NULL;
@@ -944 +939 @@
         SI_LINK_SET_RW_OPEN_P(l);
         d->send_quit_at_exit=1;
-        fprintf(d->f_write,"98 %d %d %u %u\n",SSI_VERSION,MAX_TOK,test,verbose);
+        fprintf(d->f_write,"98 %d %d %u %u\n",SSI_VERSION,MAX_TOK,si_opt_1,si_opt_2);
       }
       // ----------------------------------------------------------------------
@@ -1021 +1016 @@
           {
             d->f_write = outfile;
-            fprintf(d->f_write,"98 %d %d %u %u\n",SSI_VERSION,MAX_TOK,test,verbose);
+            fprintf(d->f_write,"98 %d %d %u %u\n",SSI_VERSION,MAX_TOK,si_opt_1,si_opt_2);
           }
         }
@@ -1210 +1205 @@
                   Print("// opening ssi-%d, MAX_TOK=%d\n",n98_v,n98_m);
                 #endif
-                test=n98_o1;
-                verbose=n98_o2;
+                si_opt_1=n98_o1;
+                si_opt_2=n98_o2;
                 return ssiRead1(l);
              }
@@ -1280 +1275 @@
                         if(tt==POLY_CMD) fputs("6 ",d->f_write);
                         else             fputs("9 ",d->f_write);
-                        ssiWritePoly(d,tt,(poly)dd);
+                        ssiWritePoly(d,(poly)dd);
                         break;
           case IDEAL_CMD:
@@ -1796 +1791 @@
 **/
 /*---------------------------------------------------------------------*/
-void sig_chld_hdl(int sig)
+void sig_chld_hdl(int)
 {
   pid_t kidpid;

Singular/misc_ip.cc

@@ -562 +562 @@
     {
       intvec *w=new intvec(2);
-      (*w)[0]=test;
-      (*w)[1]=verbose;
+      (*w)[0]=si_opt_1;
+      (*w)[1]=si_opt_2;
       res->rtyp=INTVEC_CMD;
       res->data=(void *)w;
@@ -575 +575 @@
         v=v->next;
         intvec *w=(intvec*)v->Data();
-        test=(*w)[0];
-        verbose=(*w)[1];
+        si_opt_1=(*w)[0];
+        si_opt_2=(*w)[1];
 #if 0
         if (TEST_OPT_INTSTRATEGY && (currRing!=NULL)
@@ -584 +584 @@
 #endif
         ) {
-          test &=~Sy_bit(OPT_INTSTRATEGY);
+          si_opt_1 &=~Sy_bit(OPT_INTSTRATEGY);
         }
 #endif
@@ -592 +592 @@
     if(strcmp(n,"none")==0)
     {
-      test=0;
-      verbose=0;
+      si_opt_1=0;
+      si_opt_2=0;
       goto okay;
     }
@@ -602 +602 @@
         if (optionStruct[i].setval & validOpts)
         {
-          test |= optionStruct[i].setval;
+          si_opt_1 |= optionStruct[i].setval;
           // optOldStd disables redthrough
           if (optionStruct[i].setval == Sy_bit(OPT_OLDSTD))
-            test &= ~Sy_bit(OPT_REDTHROUGH);
+            si_opt_1 &= ~Sy_bit(OPT_REDTHROUGH);
         }
         else
@@ -626 +626 @@
         if (optionStruct[i].setval & validOpts)
         {
-          test &= optionStruct[i].resetval;
+          si_opt_1 &= optionStruct[i].resetval;
         }
         else
@@ -637 +637 @@
       if (strcmp(n,verboseStruct[i].name)==0)
       {
-        verbose |= verboseStruct[i].setval;
+        si_opt_2 |= verboseStruct[i].setval;
         #ifdef YYDEBUG
         #if YYDEBUG
@@ -651 +651 @@
       && (strcmp(n+2,verboseStruct[i].name)==0))
       {
-        verbose &= verboseStruct[i].resetval;
+        si_opt_2 &= verboseStruct[i].resetval;
         #ifdef YYDEBUG
         #if YYDEBUG
@@ -666 +666 @@
   okay:
     if (currRing != NULL)
-      currRing->options = test & TEST_RINGDEP_OPTS;
+      currRing->options = si_opt_1 & TEST_RINGDEP_OPTS;
     omFree((ADDRESS)n);
     v=v->next;
@@ -687 +687 @@
 
   StringSetS("//options:");
-  if ((test!=0)||(verbose!=0))
-  {
-    tmp=test;
+  if ((si_opt_1!=0)||(si_opt_2!=0))
+  {
+    tmp=si_opt_1;
     if(tmp)
     {
       for (i=0; optionStruct[i].setval!=0; i++)
       {
-        if (optionStruct[i].setval & test)
+        if (optionStruct[i].setval & tmp)
         {
           StringAppend(" %s",optionStruct[i].name);
@@ -705 +705 @@
       }
     }
-    tmp=verbose;
+    tmp=si_opt_2;
     if (tmp)
     {
@@ -723 +723 @@
     return omStrDup(StringAppendS(""));
   }
-  else
-    return omStrDup(StringAppendS(" none"));
+  return omStrDup(StringAppendS(" none"));
 }
 
@@ -1144 +1143 @@
   if (! feOptValue(FE_OPT_NO_STDLIB))
   {
-    int vv=verbose;
-    verbose &= ~Sy_bit(V_LOAD_LIB);
+    BITSET save1,save2;
+    SI_SAVE_OPT(save1,save2);
+    si_opt_2 &= ~Sy_bit(V_LOAD_LIB);
     iiLibCmd(omStrDup("standard.lib"), TRUE,TRUE,TRUE);
-    verbose=vv;
+    SI_RESTORE_OPT(save1,save2);
   }
   errorreported = 0;

Singular/walk.cc

@@ -123 +123 @@
 }
 
+#if 0 /*unused*/
 /*2
 *construct the set s from F u {P}
@@ -273 +274 @@
 #endif
 }
+#endif
 
 /*2
@@ -351 +353 @@
 }
 
+#if 0 /*unused*/
 static void TimeString(clock_t tinput, clock_t tostd, clock_t tif,clock_t tstd,
                        clock_t tlf,clock_t tred, clock_t tnw, int step)
@@ -388 +391 @@
         ((((double) xtextra)/1000000)/totm)*100);
 }
-
+#endif
+
+#if 0 /*unused*/
 static void TimeStringFractal(clock_t tinput, clock_t tostd, clock_t tif,clock_t tstd,
                        clock_t textra, clock_t tlf,clock_t tred, clock_t tnw)
@@ -415 +420 @@
         ostd,totm,mostd,mif,mstd,mextra,mlf,mred,mnw,tot,res);
 }
+#endif
 
 static void idString(ideal L, const char* st)
@@ -427 +433 @@
 }
 
+#if 0 /*unused*/
 static void headidString(ideal L, char* st)
 {
@@ -437 +444 @@
   Print(" %s;", pString(pHead(L->m[nL-1])));
 }
-
+#endif
+
+#if 0 /*unused*/
 static void idElements(ideal L, char* st)
 {
@@ -467 +476 @@
   omFree(K);
 }
-
+#endif
 
 
@@ -481 +490 @@
 }
 
+#if 0 /*unused*/
 static void MivString(intvec* iva, intvec* ivb, intvec* ivc)
 {
@@ -498 +508 @@
   Print("%d)", (*ivc)[nV]);
 }
-
+#endif
 
 // returns gcd of integers a and b
@@ -534 +544 @@
 }
 
+#if 0 /*unused*/
 /* 23.07.03 */
 static int isVectorNeg(intvec* omega)
@@ -545 +556 @@
   return 0;
 }
+#endif
 
 /********************************************************************
@@ -826 +838 @@
 static ideal MstdCC(ideal G)
 {
-  int save_test=test;
-  test|=(Sy_bit(OPT_REDTAIL)|Sy_bit(OPT_REDSB));
+  BITSET save1,save2;
+  SI_SAVE_OPT(save1,save2);
+  si_opt_1|=(Sy_bit(OPT_REDTAIL)|Sy_bit(OPT_REDSB));
   ideal G1 = kStd(G, NULL, testHomog, NULL);
-  test=save_test;
+  SI_RESTORE_OPT(save1,save2);
 
   idSkipZeroes(G1);
@@ -839 +852 @@
 static ideal MstdhomCC(ideal G)
 {
-  int save_test=test;
-  test|=(Sy_bit(OPT_REDTAIL)|Sy_bit(OPT_REDSB));
+  BITSET save1,save2;
+  SI_SAVE_OPT(save1,save2);
+  si_opt_1|=(Sy_bit(OPT_REDTAIL)|Sy_bit(OPT_REDSB));
   ideal G1 = kStd(G, NULL, isHomog, NULL);
-  test=save_test;
+  SI_RESTORE_OPT(save1,save2);
 
   idSkipZeroes(G1);
@@ -889 +903 @@
 
 /**** 28.10.02  print the max total degree and the max coefficient of G***/
+#if 0 /*unused*/
 static void checkComplexity(ideal G, char* cG)
 {
@@ -924 +939 @@
   PrintLn();
 }
-
+#endif
 
 
@@ -1232 +1247 @@
 }
 
+#if 0 /*unused*/
 static intvec* MatrixOrderdp(int nV)
 {
@@ -1245 +1261 @@
   return(ivM);
 }
+#endif
 
 intvec* MivUnit(int nV)
@@ -1464 +1481 @@
 
 
+#if 0 /*unused*/
 static void checkidealCC(ideal G, char* Ch)
 {
@@ -1485 +1503 @@
   PrintLn();
 }
-
+#endif
+
+#if 0 /*unused*/
 static void HeadidString(ideal L, char* st)
 {
@@ -1496 +1516 @@
   Print(" %s;\n", pString(pHead(L->m[nL])));
 }
+#endif
 
 static inline int MivComp(intvec* iva, intvec* ivb)
@@ -2104 +2125 @@
 }
 
+#if 0 /*unused*/
 /* check wheather one or more components of a vector are zero */
 static int isNolVector(intvec* hilb)
@@ -2114 +2136 @@
   return 0;
 }
+#endif
 
 
@@ -2459 +2482 @@
 }
 
+#if 0 /*unused*/
 /* 19.11.01 */
 /* find the maximal total degree of polynomials in G */
@@ -2478 +2502 @@
   return result;
 }
+#endif
 
 /* perturb the weight vector iva w.r.t. the ideal G.
@@ -2486 +2511 @@
 */
 
+#if 0 /*unused*/
 //GMP
 static intvec* TranPertVector(ideal G, intvec* iva)
@@ -2612 +2638 @@
   return repr_vector;
 }
-
-
-
+#endif
+
+
+
+#if 0 /*unused*/
 static intvec* TranPertVector_lp(ideal G)
 {
@@ -2702 +2730 @@
   return repr_vector;
 }
-
-
+#endif
+
+
+#if 0 /*unused*/
 //GMP
 static intvec* RepresentationMatrix_Dp(ideal G, intvec* M)
@@ -2789 +2819 @@
   return repvector;
 }
+#endif
 
 
@@ -2804 +2835 @@
 
 // 19 Juni 2003
+#if 0 /* unused*/
 static int testnegintvec(intvec* v)
 {
@@ -2814 +2846 @@
   return(0);
 }
+#endif
 
 

Singular/walk_ip.cc

@@ -64 +64 @@
 {
     WalkState state = WalkOk;
-    BITSET saveTest=test;
-    test &= (~Sy_bit(OPT_REDSB)); //make sure option noredSB is set
+    BITSET save1,save2;
+    SI_SAVE_OPT(save1,save2);
+    si_opt_1 &= (~Sy_bit(OPT_REDSB)); //make sure option noredSB is set
 
     ring destRing = currRing;
@@ -108 +109 @@
     }
 
-    test=saveTest;//making sure options are as before function call
+    SI_RESTORE_OPT(save1,save2);//making sure options are as before function call
 
     ring almostDestRing=currRing;
@@ -177 +178 @@
 
     WalkState state = WalkOk;
-    BITSET saveTest=test;
-    test &= (~Sy_bit(OPT_REDSB)); //make sure option noredSB is set
+    BITSET save1,save2;
+    SI_SAVE_OPT(save1,save2);
+    si_opt_1 &= (~Sy_bit(OPT_REDSB)); //make sure option noredSB is set
 
     ring destRing = currRing;
@@ -212 +214 @@
     }
 
-    test=saveTest;//making sure options are as before functiocall
+    SI_RESTORE_OPT(save1,save2);//making sure options are as before functiocall
 
      if ( state == WalkOk )

Tst/Short/bug_55.res.gz.uu

@@ -1 @@
-begin 640 bug_55.res.gz
-M'XL(")QK;4H``V)U9U\U-2YR97,`[57/;YLP%+[S5SQ5DPI-XL4&3$(4#MLN
-MJ:I-:JH=5G45`3>Q1@!ADPZI?_QLAT!%]N.TR[1W,/;S][[W_/`GK^\^K#X"
-M`([@9O4.+J20*..;BX6U;G=(!,KYR',N;6=AZ2]$$6SJ[:/OHYP](R%CV<'=
-M"+JYA^#M6XT$GH,HL@/KMGRD\UT8YR`AC:#B^1:JY73<C-.RWPDBX"F+,U@M
-M&SKR:..-?#)OR`@33(,>-XN@*"4O<KNL"NGT&_-(%R1V19VEL.4'!E3756NL
-MT$6^/T'Q%!TKME<J_IY@+_!F+O6"$#]08=GK<.I8%C(VL@XIWR^!]FMMGP=A
-MOJ#"1X'PT$RX:"X(PE.!!Z".>M+:2S^Q[O%#:*ECV!."Z)SZ\V"&1_S*13B@
-M/B73P%%LYY#)`.*V$'Y%D>N[F'C84V[O%#GP^ZW_UX3T##&HRE)=OS3MO(2D
-M8K%D*<3F+X]UUY]W/-DI1\:%A/6G&RB>(*_W&U8)L.6.05+LRXQ][_^5HQFY
-M`"&+BJ5(K^X*B).$"0$ZPE`IFK/(,<BF9.KP3P:7QWL&M_`<"XB%X-N<I9I,
-M%F:W8K*N<CC$6<T<<T9C@DES0V\7NMH%Z`B`9!=7<2)9I5+S!$*8@MVF#V>0
-M\BV7*GN<IEP7HF[QR>D<XS&4BF#/%(-.$@)OB?<\+XNL.64/5?%?U9UOPXZ-
-MTF<]Q*I?(>"CW]@F*Y)OACN$HDJ9*3LK7R%Z"TTSA)XV/Z$@KREZG>"3)J^7
-M=C/!SI4:B1E=,WIF],U(>REB\B<I?NF@[DF*UW]7B@C_7HTO`TV^G`D3=_HC
-LG<S<3EE>IR6_TPS]KXU_5QM>_Q9B]>#I9U2_E;6PL;-X8_T`7=GBXWP'````
+begin 644 bug_55.res.gz
+M'XL("/+2?U```V)U9U\U-2YR97,`[57+;MLP$+SK*Q9!@4BQS9AZ4+8,Z]#V
+MXB!H@3CHH4$:R!)C$Y5%0:2<"LC'EZ3U".P6/?52=`\4N9R=7:XXX/K^X^H3
+M`.`8;E?OX4(*B7*VN5A8ZW;'C4$YGUC!I.TL+/V%.(9-O7T*`E30%R1D(GNX
+M%T,_]Q%<7VLDL`($SP^TWPJ0SG=AG"<)20P5*[90+:?C9IR5PTX8`\MHDL-J
+MV9"13QI_%+CSQAUA%Y-PP,UBX*5DO+#+BDMGV)C'NB"QXW6>P98=*!!=5ZVQ
+M0A?YH8/B*3I6;*]4_(.+_="?><0/(_Q(A&6OHZEC6<C8R#ID;+\$,JRU?3D)
+M"P01`0J%CV;"0W/A(CP5V+(FK;T.$^L!/T:6*MB>N(C,23`/9WC$KCR$0Q(0
+M=QHZBOP<,CF!>"V$71'D!1YV?>PKM]]%GOB#UO][0G*&.*G*4OV]-(V[A+2B
+MB:09).9_CG5_7W8LW2E'SH2$]>=;X,]0U/L-K038<D<AY?LRIS^&O^)H1B9`
+M2%[1#.G5/8<D3:D0H",,E:(YBQR#;$JJ#O]L<$6RIW`'+XF`1`BV+6BFR20W
+MNQ65=57`(<EKZI@S&A-4FKMXM]#5+D!'`*2[I$I222N5FJ40P13L-GTT@XQM
+MF539DRQCNA!U7SNG<XS'4"J"/54,.DD$K"7>LZ+D>=-ECU3QW]3M;L..C=)G
+M/22J7Q'@H]_8)N?I=\,=`:\R:LK.RS>(P2+3#*&GS2\HW+<4@R)PI[Z;I=U,
+ML'.E1M>,GAE],P9F)(/HL/LGT7WMH5XGNIN_*SJ$.]V]GJCO]4R"N%>:VPO*
+IZS7D]ZH)>G60_RKX=U7@#^\;5H^8?AKU^U<+&SN+=]9/YL0I)U`'````
 `
 end

Tst/Short/bug_55.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1248684956:3104-2009072709:3-1-0:ix86-Linux:nepomuck:229764 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:242880
-1 >> tst_memory_1 :: 1248684956:3104-2009072709:3-1-0:ix86-Linux:nepomuck:748056 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:682684
-1 >> tst_memory_2 :: 1248684956:3104-2009072709:3-1-0:ix86-Linux:nepomuck:748056 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:751584
-1 >> tst_timer_1 :: 1248684956:3104-2009072709:3-1-0:ix86-Linux:nepomuck:6 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:11
+1 >> tst_memory_0 :: 1350554354:0- spielwiese :spielwiese:version:mamawutz:192636
+1 >> tst_memory_1 :: 1350554354:0- spielwiese :spielwiese:version:mamawutz:655360
+1 >> tst_memory_2 :: 1350554354:0- spielwiese :spielwiese:version:mamawutz:707456
+1 >> tst_timer_1 :: 1350554354:0- spielwiese :spielwiese:version:mamawutz:7

Tst/Short/bug_qring.res.gz.uu

@@ -1 @@
-begin 640 bug_qring.res.gz
-M'XL("*+AGDX``V)U9U]Q<FEN9RYR97,`K51-;Z,P$+WG5XRJ/4!P*)BDS8?@
-MT%U5JK3*)7M;-9$=2-?:!!(PK,BO[X#YBAJJ5EVDQ)8]\^;-FQFO?OUX6@*`
-M[<'/IP>XD8DT]X+?+`:KZH9Z@(<;$0JIZ8M!L8+G`4]?-J=8A"]F&/PS$\ED
-MX^%XT.S')MS>0AC%![:''2[`0A^VT>&X#V0`RT<0(90XR;QQFI@MP)T)Q2T<
-M78MH.3F3E&0Z\8\MP7L/HJ,44:C%@;]ZT-N;J:>@X>0FTM>$'["]EALI-=+,
-M(>?B7^^8S]!\,4"Z`-L_+&9;&<0BD6(+<[#4>9@>>!!#M(.,Q0F>C]5Y^?%]
-MM/U;:(GG4>P'96C_V+%HOSF$[!`DQ3:',Z2070&B7:#OA<$IC:0(0JDTV<71
-M`<JL!IO?]K.+B>6C,^XI[C/'*+;.LYMGSNA<_-(Z5=ORE!\(%S5M)+"Q#4JE
-M4)42<90;%1[BUD;8$<M'3=D12R\E&PYA`R+!2B,`EIC%/G"6B.0='.P3$:+&
-M6+8*K0Y;V>:*?^4\OG`>(]-`JM9H^4\N\B*7M6[-[OI:QKYO!'A;,X!K[%*J
-MN&&`!F5:*K0A_5WWB4QG'Y3I"A%J=7S;FKU#ZPUTC62W0TUI-9,QN$")Q@CP
-MBY&D3I^^=-PAI"BP-25LR`U<F^B,J_",-HZ39I9/&+7-@*^I4;D3MN[.,\4J
-MGWH'FO8,-/WZ0#/@_V&8&>;%#4Z5$KRM:>][1Z<?$K>&1)%KQUE;7,<RR_>^
-2>-'31+/UQ;?!*X`@S@HE!@``
+begin 644 bug_qring.res.gz
+M'XL("$[3?U```V)U9U]Q<FEN9RYR97,`K53?;YM`#'[/7V%5>X!PI7"0-C\$
+M#]U4J=*4E^QM:J*[0+K3DB.!@XG\]3,'`;*.;M*&E)SELS_;G^U;??GTO`0`
+M-X3/SX]PHS)E[P6_68Q6S0T-`94;(84RS,6H.B$,@>>OFU,JY*LMXQ]VIIAJ
+M/;P06MFWX>X.9)(>V!YV>`"3$6R3PW$?JQB63R`D:)QLWCI-[`[@WH;J%HZ!
+M0XR2G$E."I-$QR[!AQ"2HQ*)--(X6CV:W<TTK*'A%&0J,D04L[U16CFU\L(C
+MY^K?[)G/T'PQPG0!MM]8RK8J3D6FQ!;FX-1ZF1]XG$*R@X*E&>K]6J\_OD^V
+MWRLN49^D4:Q#1\>>1??-0;)#G%5B"6?(H?@-$.T#?:P,3GFB1"Q5S<DN30Z@
+MJQIMOKHO`196WIY1IB@7GE6)WDM0%M[MN?KEEU)=)ZS]0`3(:4N!BV.@F4)6
+M-.)M:35XB'LQPHE8/AFU'7%,3=EX#!L0&78:`;#%+(V`LTQD[^#@G`B)'&/;
+M&K1+V,:V;$U]S"M6]2!TV4ZNJB#7G>W,[H<&Q'UHRWW;(8!?<M%<YA1/7]/;
+MHDPU'QLR/&-OZM)8#2G^%2FS/Y,RE`AU>KY=A]Y):XAOZG8K3&FS@2D$0(G!
+M"/"K!:3>$+_4[R54I\#6E+`QM_!LHS->AV>T=9RTFWO"J%T%?$VMQIVP=7][
+M*7;Y-+B^=&!]Z;^O+P/^'U:785W<XK1F@G<]'7S=Z/2OR+U`(LD7QUG77,^Q
+5]>M>O=]Y9KCFXL/H)U7L&M03!@``
 `
 end

Tst/Short/bug_qring.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1319035298:3133- 14004 :3-1-3:ix86-Linux:mamawutz:174416
-1 >> tst_memory_1 :: 1319035298:3133- 14004 :3-1-3:ix86-Linux:mamawutz:666332
-1 >> tst_memory_2 :: 1319035298:3133- 14004 :3-1-3:ix86-Linux:mamawutz:699116
-1 >> tst_timer_1 :: 1319035298:3133- 14004 :3-1-3:ix86-Linux:mamawutz:8
+1 >> tst_memory_0 :: 1350554446:0- spielwiese :spielwiese:version:mamawutz:123692
+1 >> tst_memory_1 :: 1350554446:0- spielwiese :spielwiese:version:mamawutz:655360
+1 >> tst_memory_2 :: 1350554446:0- spielwiese :spielwiese:version:mamawutz:658204
+1 >> tst_timer_1 :: 1350554446:0- spielwiese :spielwiese:version:mamawutz:2

dyn_modules/syzextra/myNF.cc

@@ -224 +224 @@
   //strat->ak = id_RankFreeModule(F, RING!);
   /*- creating temp data structures------------------- -*/
-  BITSET save_test=test;
-  test|=Sy_bit(OPT_REDTAIL);
+  BITSET save1;
+  SI_SAVE_OPT1(save1);
+  si_opt_1|=Sy_bit(OPT_REDTAIL);
   initBuchMoraCrit(strat);
   strat->initEcart = initEcartBBA;
@@ -260 +261 @@
 #endif
     {
-      BITSET save=test;
-      test &= ~Sy_bit(OPT_INTSTRATEGY);
+      si_opt_1 &= ~Sy_bit(OPT_INTSTRATEGY);
       p = redtailBba(p,max_ind,strat,(lazyReduce & KSTD_NF_NONORM)==0);
-      test=save;
     }
   }
@@ -277 +276 @@
   omfree(strat->fromQ);
   idDelete(&strat->Shdl);
-  test=save_test;
+  SI_RESTORE_OPT1(save1);
   if (TEST_OPT_PROT) PrintLn();
   return p;

factory/algext.cc

@@ -548 +548 @@
         return;
       m *= (x - alpha);
-      if(gnew == gm) // gnew did not change
-      {
-        cf = tryvcontent(gm, Variable(2), M, fail);
+      if((firstLC(gnew) == gamma) || (gnew == gm)) // gnew did not change
+      {
+        cf = tryvcontent(gnew, Variable(2), M, fail);
         if(fail)
           return;
         divides = true;
-        g_image= gm;
+        g_image= gnew;
         g_image.tryDiv (cf, M, fail);
         if(fail)
@@ -692 +692 @@
   }
   // here: a is the biggest alg. var in f and g AND some of f,g is in extension
-  // (in the sequel b is used to swap alg/poly vars)
   setReduce(a,false); // do not reduce expressions modulo mipo
   tmp = getMipo(a);
@@ -703 +702 @@
     mv = i;
   // here: mv is level of the largest variable in f, g
-  b = Variable(mv+1);
   bound = new int[mv+1]; // 'bound' could be indexed from 0 to mv, but we will only use from 1 to mv
   other = new int[mv+1];
@@ -750 +748 @@
     if(isEqual(bound, other, 1, mv)) // equal
     {
-      chineseRemainder( D, q, replacevar( mapinto(Dp), a, b ), p, tmp, newq );
+      chineseRemainder( D, q, mapinto(Dp), p, tmp, newq );
       // tmp = Dp mod p
       // tmp = D mod q
@@ -758 +756 @@
         D = tmp;
       On( SW_RATIONAL );
-      tmp = replacevar( Farey( D, q ), b, a ); // Farey and switch back to alg var
+      tmp = Farey( D, q ); // Farey
+      tmp *= bCommonDen (tmp);
       setReduce(a,true); // reduce expressions modulo mipo
       On( SW_RATIONAL ); // needed by fdivides
@@ -780 +779 @@
     // here: isLess(other, bound, 1, mv) ) ==> all previous primes unlucky
     q = p;
-    D = replacevar( mapinto(Dp), a, b ); // shortcut CRA // shortcut CRA
+    D = mapinto(Dp); // shortcut CRA // shortcut CRA
     for(int i=1; i<=mv; i++) // tighten bound
       bound[i] = other[i];

factory/cf_chinese.cc

@@ -227 +227 @@
           }
           else
+            result += power( x, i.exp() ) * Farey(c,q);
+#else
+          if (c.inZ())
+            result += power( x, i.exp() ) * Farey_n(c,q);
+          else
+            result += power( x, i.exp() ) * Farey(c,q);
 #endif
-            result += power( x, i.exp() ) * Farey_n(c,q);
         }
         else

factory/cf_gcd_smallp.cc

@@ -4229 +4229 @@
   Evaluation result= Evaluation (A.min(), A.max());
   ASSERT (A.min() == 2, "expected A.min() == 2");
-  ASSERT (A.max() >= n, "expected A.max() >= n");
   int max_deg;
   int k= n;

factory/facFqBivarUtil.cc

@@ -519 +519 @@
   }
 
-  q= newtonDiv (bufF, G, xToLOldL);
+  if (l-oldL > 0)
+    q= newtonDiv (bufF, G, xToLOldL);
+  else
+    q= 0;
   q *= xToOldL;
   q += oldQ;

factory/facFqSquarefree.h

@@ -18 +18 @@
 #include "cf_factory.h"
 #include "fac_sqrfree.h"
+#include "cf_factory.h"
 
 /// squarefree factorization over a finite field

factory/facHensel.cc

@@ -544 +544 @@
   }
 
+  setReduce (alpha, false);
   for (k= 0; k < factors.length(); k++)
   {
@@ -554 +555 @@
     }
   }
+  setReduce (alpha, true);
   setCharacteristic(0);
 
@@ -591 +593 @@
   }
   setCharacteristic (p);
+  setReduce (alpha, false);
   recResult= mapinto (recResult);
+  setReduce (alpha, true);
   if (mipoHasDen)
   {
@@ -606 +610 @@
     coeffE= div (e, modulus);
     setCharacteristic (p);
+    if (mipoHasDen)
+      setReduce (gamma, false);
+    else
+      setReduce (alpha, false);
     coeffE= coeffE.mapinto();
+    if (mipoHasDen)
+      setReduce (gamma, true);
+    else
+      setReduce (alpha, true);
     if (mipoHasDen)
       coeffE= replacevar (coeffE, gamma, beta);
@@ -619 +631 @@
       {
         setCharacteristic (p);
+        setReduce (alpha, false);
         g= mulNTL (coeffE, j.getItem());
         g= modNTL (g, bufFactors[ii]);
+        setReduce (alpha, true);
         setCharacteristic (0);
         if (mipoHasDen)
         {
+          setReduce (beta, false);
           k.getItem() += replacevar (g.mapinto()*modulus, beta, gamma);
           e -= mulNTL (replacevar (g.mapinto(), beta, gamma)*modulus,
                                    l.getItem(), b);
+          setReduce (beta, true);
         }
         else

factory/facMul.cc

@@ -404 +404 @@
       {
         ZZ_p::init (convertFacCF2NTLZZ (b.getpk()));
-        ZZ_pX NTLmipo= to_ZZ_pX (convertFacCF2NTLZZX (getMipo (alpha)));
+        CanonicalForm mipo= getMipo (alpha);
+        bool is_rat= isOn (SW_RATIONAL);
+        if (!is_rat)
+          On (SW_RATIONAL);
+        mipo *=bCommonDen (mipo);
+        if (!is_rat)
+          Off (SW_RATIONAL);
+        ZZ_pX NTLmipo= to_ZZ_pX (convertFacCF2NTLZZX (mipo));
         ZZ_pE::init (NTLmipo);
         ZZ_pEX NTLg= convertFacCF2NTLZZ_pEX (G, NTLmipo);

factory/fac_ezgcd.cc

@@ -215 +215 @@
   Evaluation result= Evaluation (A.min(), A.max());
   ASSERT (A.min() == 2, "expected A.min() == 2");
-  ASSERT (A.max() == n, "expected A.max() == n");
   int max_deg;
   int k= n;

kernel/fast_maps.cc

@@ -67 +67 @@
   poly max_pi_i, max_map_i;
 
-  int i, j;
+  int i;
   for (i=0; i<IDELEMS(map_id); i++)
   {

kernel/ideals.cc

@@ -130 +130 @@
 }
 
-
-/*3
-*multiplies p with t (!cas) or  (t-1)
-*the index of t is:1, so we have to shift all variables
-*p is NOT in the actual ring, it has no t
-*/
-static poly pMultWithT (poly p,BOOLEAN cas)
-{
-  /*qp is the working pointer in p*/
-  /*result is the result, qresult is the working pointer*/
-  /*pp is p in the actual ring(shifted), qpp the working pointer*/
-  poly result,qp,pp;
-  poly qresult=NULL;
-  poly qpp=NULL;
-  int  i,j,lex;
-  number n;
-
-  pp = NULL;
-  result = NULL;
-  qp = p;
-  while (qp != NULL)
-  {
-    i = 0;
-    if (result == NULL)
-    {/*first monomial*/
-      result = pInit();
-      qresult = result;
-    }
-    else
-    {
-      qresult->next = pInit();
-      pIter(qresult);
-    }
-    for (j=(currRing->N)-1; j>0; j--)
-    {
-      lex = pGetExp(qp,j);
-      pSetExp(qresult,j+1,lex);/*copy all variables*/
-    }
-    lex = pGetComp(qp);
-    pSetComp(qresult,lex);
-    n=nCopy(pGetCoeff(qp));
-    pSetCoeff0(qresult,n);
-    qresult->next = NULL;
-    pSetm(qresult);
-    /*qresult is now qp brought into the actual ring*/
-    if (cas)
-    { /*case: mult with t-1*/
-      pSetExp(qresult,1,0);
-      pSetm(qresult);
-      if (pp == NULL)
-      { /*first monomial*/
-        pp = pCopy(qresult);
-        qpp = pp;
-      }
-      else
-      {
-        qpp->next = pCopy(qresult);
-        pIter(qpp);
-      }
-      pGetCoeff(qpp)=nNeg(pGetCoeff(qpp));
-      /*now qpp contains -1*qp*/
-    }
-    pSetExp(qresult,1,1);/*this is mult. by t*/
-    pSetm(qresult);
-    pIter(qp);
-  }
-  /*
-  *now p is processed:
-  *result contains t*p
-  * if cas: pp contains -1*p (in the new ring)
-  */
-  if (cas)  qresult->next = pp;
-  /*  else      qresult->next = NULL;*/
-  return result;
-}
 
 /*2
@@ -850 +775 @@
   }
 
-  BITSET save_verbose=verbose;
+  BITSET save2;
+  SI_SAVE_OPT2(save2);
 
   k=si_max(1,(int)id_RankFreeModule(h1,currRing));
 
-  if ((k==1) && (!lift3)) verbose |=Sy_bit(V_IDLIFT);
+  if ((k==1) && (!lift3)) si_opt_2 |=Sy_bit(V_IDLIFT);
 
   ring orig_ring = currRing;
@@ -974 +900 @@
 
   if (syz_ring!=orig_ring) rDelete(syz_ring);
-  verbose = save_verbose;
+  SI_RESTORE_OPT2(save2);
   return s_h3;
 }
@@ -1374 +1300 @@
     }
     h4->m[IDELEMS(h4)-1] = p;
-    test |= Sy_bit(OPT_SB_1);
+    si_opt_1 |= Sy_bit(OPT_SB_1);
   }
   idDelete(&temph1);
@@ -1397 +1323 @@
     return res;
   }
-  BITSET old_test=test;
+  BITSET old_test1;
+  SI_SAVE_OPT1(old_test1);
   int i, kmax;
   BOOLEAN  addOnlyOne=TRUE;
@@ -1431 +1358 @@
     s_h3 = kStd(s_h4,currQuotient,hom,&weights1,NULL,kmax-1);
   }
-  test = old_test;
+  SI_RESTORE_OPT1(old_test1);
   #if 0
   // only together with the above debug stuff
@@ -1672 +1599 @@
 #if 1
   //rWrite(tmpR);PrintLn();
-  BITSET save=test;
-  //test |=1;
+  //BITSET save1;
+  //SI_SAVE_OPT1(save1);
+  //si_opt_1 |=1;
   //Print("h: %d gen, rk=%d\n",IDELEMS(h),h->rank);
   //extern char * showOption();
   //Print("%s\n",showOption());
   hh = kStd(h,NULL,hom,&w,hilb);
-  test=save;
+  //SI_RESTORE_OPT1(save1);
   idDelete(&h);
 #else
@@ -2194 +2122 @@
   {
     if ((s_temp1->m[i]!=NULL)
-    && (pGetComp(s_temp1->m[i])<=length))
+    && (((int)pGetComp(s_temp1->m[i]))<=length))
     {
       p_Delete(&(s_temp1->m[i]),currRing);

kernel/kInline.h

@@ -591 +591 @@
   else
   {
+    if (lq<=0) lq= ::pLength(q);
     poly _p = (t_p != NULL ? t_p : p);
     assume(_p != NULL);

kernel/kstd1.cc

@@ -1234 +1234 @@
   int red_result = 1;
   int hilbeledeg=1,hilbcount=0;
-  int save_test=test;
+  BITSET save1;
+  SI_SAVE_OPT1(save1);
   if (currRing->MixedOrder)
   {
-    test &= ~Sy_bit(OPT_REDSB);
-    test &= ~Sy_bit(OPT_REDTAIL);
+    si_opt_1 &= ~Sy_bit(OPT_REDSB);
+    si_opt_1 &= ~Sy_bit(OPT_REDTAIL);
   }
 
@@ -1455 +1456 @@
 //  }
   if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
-  test=save_test;
+  SI_RESTORE_OPT1(save1);
   idTest(strat->Shdl);
   return (strat->Shdl);
@@ -1475 +1476 @@
   int   o;
   LObject   h;
-  BITSET save_test=test;
+  BITSET save1;
+  SI_SAVE_OPT1(save1);
 
   //if ((idIs0(F))&&(Q==NULL))
@@ -1483 +1485 @@
   strat->kHEdgeFound = (currRing->ppNoether) != NULL;
   strat->kNoether    = pCopy((currRing->ppNoether));
-  test|=Sy_bit(OPT_REDTAIL);
-  test&=~Sy_bit(OPT_INTSTRATEGY);
+  si_opt_1|=Sy_bit(OPT_REDTAIL);
+  si_opt_1&=~Sy_bit(OPT_INTSTRATEGY);
   if (TEST_OPT_STAIRCASEBOUND
   && (! TEST_V_DEG_STOP)
@@ -1583 +1585 @@
 //  }
   idDelete(&strat->Shdl);
-  test=save_test;
+  SI_RESTORE_OPT1(save1);
   if (TEST_OPT_PROT) PrintLn();
   return p;
@@ -1604 +1606 @@
   LObject   h;
   ideal res;
-  BITSET save_test=test;
+  BITSET save1;
+  SI_SAVE_OPT1(save1);
 
   //if (idIs0(q)) return idInit(IDELEMS(q),si_max(q->rank,F->rank));
@@ -1613 +1616 @@
   strat->kHEdgeFound = (currRing->ppNoether) != NULL;
   strat->kNoether=pCopy((currRing->ppNoether));
-  test|=Sy_bit(OPT_REDTAIL);
+  si_opt_1|=Sy_bit(OPT_REDTAIL);
   if (TEST_OPT_STAIRCASEBOUND
   && (0<Kstd1_deg)
@@ -1722 +1725 @@
 //  }
   idDelete(&strat->Shdl);
-  test=save_test;
+  SI_RESTORE_OPT1(save1);
   if (TEST_OPT_PROT) PrintLn();
   return res;
@@ -2244 +2247 @@
     Kstd1_deg=Kstd1_OldDeg;
     if (!oldDegBound)
-      test &= ~Sy_bit(OPT_DEGBOUND);
+      si_opt_1 &= ~Sy_bit(OPT_DEGBOUND);
   }
   else
@@ -2719 +2722 @@
     //return kInterRedOld(F,Q);
 
-  BITSET save=test;
-  //test|=Sy_bit(OPT_NOT_SUGAR);
-  test|=Sy_bit(OPT_REDTHROUGH);
-  //test&= ~Sy_bit(OPT_REDTAIL);
-  //test&= ~Sy_bit(OPT_REDSB);
+  BITSET save1;
+  SI_SAVE_OPT1(save1);
+  //si_opt_1|=Sy_bit(OPT_NOT_SUGAR);
+  si_opt_1|=Sy_bit(OPT_REDTHROUGH);
+  //si_opt_1&= ~Sy_bit(OPT_REDTAIL);
+  //si_opt_1&= ~Sy_bit(OPT_REDSB);
   //extern char * showOption() ;
   //Print("%s\n",showOption());
@@ -2776 +2780 @@
   }
   if (null!=NULL) idDelete(&null);
-  test=save;
+  SI_RESTORE_OPT1(save1);
   idSkipZeroes(res);
   return res;

kernel/kstd2.cc

@@ -2031 +2031 @@
   // only global: avoid normalization, return a multiply of NF
   poly   p;
-  int   i;
 
   //if ((idIs0(F))&&(Q==NULL))
@@ -2037 +2036 @@
   //strat->ak = idRankFreeModule(F);
   /*- creating temp data structures------------------- -*/
-  BITSET save_test=test;
-  test|=Sy_bit(OPT_REDTAIL);
+  BITSET save1;
+  SI_SAVE_OPT1(save1);
+  si_opt_1|=Sy_bit(OPT_REDTAIL);
   initBuchMoraCrit(strat);
   strat->initEcart = initEcartBBA;
@@ -2071 +2071 @@
     #endif
     {
-      BITSET save=test;
-      test &= ~Sy_bit(OPT_INTSTRATEGY);
+      si_opt_1 &= ~Sy_bit(OPT_INTSTRATEGY);
       p = redtailBba(p,max_ind,strat,(lazyReduce & KSTD_NF_NONORM)==0);
-      test=save;
     }
   }
@@ -2088 +2086 @@
   omfree(strat->fromQ);
   idDelete(&strat->Shdl);
-  test=save_test;
+  SI_RESTORE_OPT1(save1);
   if (TEST_OPT_PROT) PrintLn();
   return p;
@@ -2113 +2111 @@
   //strat->ak = idRankFreeModule(F);
   /*- creating temp data structures------------------- -*/
-  BITSET save_test=test;
-  test|=Sy_bit(OPT_REDTAIL);
+  BITSET save1;
+  SI_SAVE_OPT1(save1);
+  si_opt_1|=Sy_bit(OPT_REDTAIL);
   initBuchMoraCrit(strat);
   strat->initEcart = initEcartBBA;
@@ -2127 +2126 @@
   /*- compute------------------------------------------------------- -*/
   res=idInit(IDELEMS(q),si_max(q->rank,F->rank));
-  BITSET save=test;
-  test &= ~Sy_bit(OPT_INTSTRATEGY);
+  si_opt_1 &= ~Sy_bit(OPT_INTSTRATEGY);
   for (i=IDELEMS(q)-1; i>=0; i--)
   {
@@ -2155 +2153 @@
   }
   /*- release temp data------------------------------- -*/
-  test=save;
+  SI_RESTORE_OPT1(save1);
   omfree(strat->sevS);
   omfree(strat->ecartS);
@@ -2166 +2164 @@
   omfree(strat->fromQ);
   idDelete(&strat->Shdl);
-  test=save_test;
+  SI_RESTORE_OPT1(save1);
   if (TEST_OPT_PROT) PrintLn();
   return res;
@@ -2184 +2182 @@
 {
   int Ll_old, red_result = 1;
-  BOOLEAN withT = FALSE;
   int pos  = 0;
   hilbeledeg=1;
@@ -3001 +2998 @@
 void initBbaShift(ideal F,kStrategy strat)
 {
-  int i;
-//  idhdl h;
  /* setting global variables ------------------- */
   strat->enterS = enterSBba; /* remains as is, we change enterT! */
@@ -3035 +3030 @@
 //    if (TEST_OPT_PROT)
 //    {
-//      for(i=1; i<=(currRing->N); i++)
+//      for(int i=1; i<=rVar(currRing); i++)
 //        Print(" %d",ecartWeights[i]);
 //      PrintLn();

kernel/nc.cc

@@ -174 +174 @@
 
 #if 1
-    BITSET save_test=test;
-    test|=Sy_bit(OPT_SB_1); // ring independent
+    BITSET save1;
+    SI_SAVE_OPT1(save1);
+    si_opt_1|=Sy_bit(OPT_SB_1); // ring independent
     J = kStd(id_tmp, currQuotient, testHomog, NULL, NULL, 0, iSize); // J = J + K, J - std // in currRing!
-    test = save_test;
+    SI_RESTORE_OPT1(save1);
 #else
     J=kStd(id_tmp, currQuotient,testHomog,NULL,NULL,0,0,NULL);
@@ -255 +256 @@
   int flag, flagcnt=0, syzcnt=0;
   int syzcomp = 0;
-  int k=1; // for ideals not modules
   ideal I = kStd(L, currQuotient,testHomog,NULL,NULL,0,0,NULL);
   idSkipZeroes(I);
@@ -275 +275 @@
   poly x=pOne();
   var[0]=x;
-  ideal   h2, h3, s_h2, s_h3;
-  poly    p,q,qq;
+  ideal   h2, s_h2, s_h3;
+  poly    p,q;
   // init vars
   for (i=1; i<=N; i++ )
@@ -335 +335 @@
       Print(".proceeding with the variable %d\n",i);
       s_h3 = idPrepareStd(s_I, s_h2, 1);
-      BITSET save_test=test;
-      test|=Sy_bit(OPT_SB_1);
+      BITSET save1;
+      SI_SAVE_OPT1(save1);
+      si_opt_1|=Sy_bit(OPT_SB_1);
       idTest(s_h3);
       idDelete(&s_h2);
@@ -343 +344 @@
       Print("...computing Syz");
       s_h3 = kStd(s_h2, currQuotient,(tHomog)FALSE,NULL,NULL,syzcomp,idI);
-      test=save_test;
+      SI_RESTORE_OPT1(save1);
       //idShow(s_h3);
       if (orig_ring != syz_ring)

kernel/syz.cc

@@ -293 +293 @@
 static void syMinStep1(resolvente res, int length)
 {
-  int i,j,k,l,index=0;
+  int i,j,k,index=0;
   poly p;
   ideal deg0=NULL,reddeg0=NULL;
@@ -331 +331 @@
           {
             p = res[index]->m[k];
-            while ((p!=NULL) && ((!pLmIsConstantComp(p)) || (pGetComp(p)!=j)))
+            while ((p!=NULL) && ((!pLmIsConstantComp(p)) || (pGetComp(p)!=(unsigned)j)))
               pIter(p);
-            if ((p!=NULL) && (pLmIsConstantComp(p)) && (pGetComp(p)==j)) break;
+            if ((p!=NULL) && (pLmIsConstantComp(p)) && (pGetComp(p)==(unsigned)j)) break;
             k++;
           }
@@ -394 +394 @@
                         intvec *** weights, BOOLEAN minim)
 {
+  BITSET save1;
+  SI_SAVE_OPT1(save1);
   resolvente res;
   resolvente newres;
@@ -530 +532 @@
     {
       res[/*syzIndex+*/1] = idSyzygies(res[0/*syzIndex*/],hom,&w,FALSE,setRegularity,&Kstd1_deg);
-      if ((!TEST_OPT_NOTREGULARITY) && (Kstd1_deg>0)) test |= Sy_bit(OPT_DEGBOUND);
+      if ((!TEST_OPT_NOTREGULARITY) && (Kstd1_deg>0)) si_opt_1 |= Sy_bit(OPT_DEGBOUND);
     }
     else
@@ -591 +593 @@
   Kstd1_deg=Kstd1_OldDeg;
   if (!oldDegBound)
-    test &= ~Sy_bit(OPT_DEGBOUND);
+    si_opt_1 &= ~Sy_bit(OPT_DEGBOUND);
 
   for (i=1; i<=syzIndex; i++)
@@ -613 +615 @@
     rDelete(syz_ring);
   }
+  SI_RESTORE_OPT1(save1);
   return res;
 }
@@ -645 +648 @@
 #endif
 
-  int typ0;
   syStrategy result=(syStrategy)omAlloc0(sizeof(ssyStrategy));
 
@@ -723 +725 @@
 int syDetect(ideal id,int index,BOOLEAN homog,int * degrees,int * tocancel)
 {
-  int i, j, k, ModComp,subFromRank=0, lu;
-  poly p, q, qq, Unit1, Unit2;
+  int i, j, k, subFromRank=0;
   ideal temp;
 
@@ -741 +742 @@
   }
   j = 0;
-  p = NULL;
   while ((j<i) && (temp->m[j]==NULL)) j++;
   while (j<i)
@@ -777 +777 @@
       deg[i-1] = (*degrees)[i-1]-rsmin;
   }
-  int dummy=syDetect(id,index,homog,deg,tocan);
+  syDetect(id,index,homog,deg,tocan);
   for (i=tocancel->length();i>0;i--)
     (*tocancel)[i-1] = tocan[i-1];
@@ -865 +865 @@
       if (res[i]->m[j]!=NULL)
       {
-        if ((pGetComp(res[i]->m[j])>l)
+        if ((pGetComp(res[i]->m[j])>(unsigned)l)
         || ((i>1) && (res[i-1]->m[pGetComp(res[i]->m[j])-1]==NULL)))
         {
@@ -917 +917 @@
   else
     memset(temp2,0,l*sizeof(int));
-  int dummy = syDetect(res[0],0,TRUE,temp2,tocancel);
+  syDetect(res[0],0,TRUE,temp2,tocancel);
   if (weights!=NULL) p_SetModDeg(NULL, currRing);
   if (tomin)
@@ -957 +957 @@
       {
         memset(tocancel,0,(rows+1)*sizeof(int));
-        dummy = syDetect(res[i+1],i+1,TRUE,temp2,tocancel);
+        syDetect(res[i+1],i+1,TRUE,temp2,tocancel);
         for (j=0;j<rows;j++)
         {

kernel/syz1.cc

@@ -474 +474 @@
   int *F1=syzstr->Firstelem[index-1];
   int *H1=syzstr->Howmuch[index-1];
-  poly pp;
   polyset o_r=syzstr->orderedRes[index]->m;
-  polyset or1=syzstr->orderedRes[index-1]->m;
   BOOLEAN ret = FALSE;
 
@@ -660 +658 @@
   int ** Fin=syzstr->Firstelem;
   int ** Hin=syzstr->Howmuch;
-  int ** bin=syzstr->backcomponents;
   ideal o_r=syzstr->orderedRes[index+1];
   intvec *result=new intvec(howmuch+1);
@@ -778 +775 @@
 {
   int i,j,k=IDELEMS(syzstr->res[index]);
-  int ks=IDELEMS(syzstr->res[index+1]),kk,l,ll;
+  int ks=IDELEMS(syzstr->res[index+1]);
   int * Fin=syzstr->Firstelem[index-1];
   int * Hin=syzstr->Howmuch[index-1];
   int * bin=syzstr->backcomponents[index];
   int * elL=syzstr->elemLength[index];
-  number coefgcd,n;
+  number coefgcd;
   polyset redset=syzstr->orderedRes[index]->m;
   poly p=NULL,q;
@@ -924 +921 @@
 {
   ideal res=syzstr->res[index];
-  int i=0,j,k=IDELEMS(res),kk;
+  int i=0,j,k=IDELEMS(res);
   SSet sPairs=syzstr->resPairs[index-1];
 
@@ -994 +991 @@
 {
   int ll,k,no=(*so).order,sP=*sPlength,i;
-  poly p=(*so).lcm;
 
   if ((sP==0) || (sPairs[sP-1].order<=no))
@@ -1081 +1077 @@
   SObject tso;
   int i,ii,j,k=IDELEMS(syzstr->res[index]),l=(*syzstr->Tl)[index],ll;
-  int qc,first,pos,jj,j1;
+  int first,pos,jj,j1;
   int * bci=syzstr->backcomponents[index];
   poly p,q;
@@ -1099 +1095 @@
   {
     q = rs[j];
-    qc = pGetComp(q);
     first = syzstr->Firstelem[index-1][pGetComp(q)]-1;
     pos = first+syzstr->Howmuch[index-1][pGetComp(q)];
@@ -1193 +1188 @@
 {
   int newdeg=*actdeg,newindex=-1,i,t,sldeg;
-  poly p;
   SSet result;
   SRes resPairs=syzstr->resPairs;
@@ -1866 +1860 @@
 int syDim(syStrategy syzstr)
 {
-  int i,j=-1,l;
+  int i,l;
   if (syzstr->resPairs!=NULL)
   {
@@ -2106 +2100 @@
 * minimizes toMin
 */
+#if 0 /* unused */
 static poly syMinimizeP(int toMin,syStrategy syzstr,intvec * ordn,int index,
                         intvec * toStrip)
@@ -2133 +2128 @@
       while (p!=NULL)
       {
-        if (pGetComp(p)==tc)
+        if (pGetComp(p)==(unsigned)tc)
         {
           tq = pInit();
@@ -2158 +2153 @@
   return pp;
 }
+#endif
 
 /*2
@@ -2165 +2161 @@
                         intvec * toStrip)
 {
-  int ii=0,i,j,tc,lp,ltS=-1;
-  poly p,mp=NULL,pp,q=NULL,tq,pisN;
+  int ii=0,i,tc,lp,ltS=-1;
+  poly p,mp=NULL,pp;
   SSet sPairs=syzstr->resPairs[index];
   poly tempStripped=NULL;
@@ -2329 +2325 @@
   intvec * Strip, * ordn;
   resolvente tres=(resolvente)omAlloc0((syzstr->length+1)*sizeof(ideal));
-  ring tmpR = NULL;
   ring origR = currRing;
 
@@ -2339 +2334 @@
     return tres;
   }
-  int i,j,l,index,ii,i1;
-  poly p;
-  ideal rs;
+  int i,l,index,i1;
   SSet sPairs;
-  int * ord,*b0,*b1;
 
   assume(syzstr->syRing != NULL);
@@ -2443 +2435 @@
 syStrategy syLaScala3(ideal arg,int * length)
 {
-  BOOLEAN noPair=FALSE;
-  int i,j,actdeg=32000,index=0,reg=-1;
-  int startdeg,howmuch;
-  poly p;
+  int i,j,actdeg=32000,index=0;
+  int howmuch;
   ideal temp;
   SSet nextPairs;
@@ -2510 +2500 @@
   int len0=id_RankFreeModule(temp,currRing)+1;
 
-  startdeg = actdeg;
   nextPairs = syChosePairs(syzstr,&index,&howmuch,&actdeg);
   //if (TEST_OPT_PROT) Print("(%d,%d)",howmuch,index);
@@ -2574 +2563 @@
 syStrategy syLaScala(ideal arg, int& maxlength, intvec* weights)
 {
-  BOOLEAN noPair=FALSE;
-  int i,j,actdeg=32000,index=0,reg=-1;
-  int startdeg,howmuch;
-  poly p;
+  int i,j,actdeg=32000,index=0;
+  int howmuch;
   ideal temp;
   SSet nextPairs;
@@ -2658 +2645 @@
   int len0=id_RankFreeModule(temp,currRing)+1;
 
-  startdeg = actdeg;
   nextPairs = syChosePairs(syzstr,&index,&howmuch,&actdeg);
   //if (TEST_OPT_PROT) Print("(%d,%d)",howmuch,index);

kernel/syz2.cc

@@ -75 +75 @@
             int actdeg)
 {
-  SSet temp;
   SObject tso;
-  poly toHandle,tsyz=NULL,p,pp;
+  poly toHandle,p,pp;
   int r1,r2=0,rr,l=(*syzstr->Tl)[index];
   int i,j,r=0,ti;
@@ -85 +84 @@
 #endif
   actdeg += index;
-  long * ShiftedComponents = syzstr->ShiftedComponents[index-1];
-  int* Components = syzstr->truecomponents[index-1];
 
   while ((l>0) && ((syzstr->resPairs[index])[l-1].lcm==NULL)) l--;
@@ -119 +116 @@
       {
         if (((syzstr->resPairs[index])[i].p!=NULL) &&
-            (pGetComp((syzstr->resPairs[index])[i].p)==tc))
+            (pGetComp((syzstr->resPairs[index])[i].p)==(unsigned)tc))
         {
 #ifdef USE_CHAINCRIT
@@ -506 +503 @@
 {
   int i,j,k=IDELEMS(syzstr->res[index]);
-  int ks=IDELEMS(syzstr->res[index+1]),kk,l,ll;
+  int ks=IDELEMS(syzstr->res[index+1]),kk;
   int ks1=IDELEMS(syzstr->orderedRes[index+1]);
   int kres=(*syzstr->Tl)[index];
   int toGo=0;
   int il;
-  number coefgcd,n;
   SSet redset=syzstr->resPairs[index];
-  poly p=NULL,q,tp;
+  poly q;
   intvec *spl1;
   SObject tso;
@@ -522 +518 @@
   int step=1,jj,j1,j2;
 #endif
-  long * ShiftedComponents = syzstr->ShiftedComponents[index];
-  int* Components = syzstr->truecomponents[index];
-  assume(Components != NULL && ShiftedComponents != NULL);
-  BOOLEAN need_reset;
+  assume((syzstr->truecomponents[index]) != NULL && (syzstr->ShiftedComponents[index]) != NULL);
 
   actord += index;
@@ -858 +851 @@
 {
   ideal res=syzstr->res[1];
-  int i=0,j,k=IDELEMS(res),k1=IDELEMS(syzstr->orderedRes[1]);
-  SSet sPairs1=syzstr->resPairs[1];
+  int i=0,k=IDELEMS(res),k1=IDELEMS(syzstr->orderedRes[1]);
   SSet sPairs=syzstr->resPairs[0];
 
@@ -964 +956 @@
 syStrategy syHilb(ideal arg,int * length)
 {
-  int i,j,actdeg=32000,index=0,reg=-1;
-  int startdeg,howmuch,toSub=0;
+  int i,j,actdeg=32000,index=0;
+  int howmuch,toSub=0;
   int maxindex=0,maxdeg=0;
   ideal temp=NULL;
@@ -1028 +1020 @@
   syzstr->bucket = kBucketCreate(currRing);
   syzstr->syz_bucket = kBucketCreate(currRing);
-  startdeg = actdeg;
   nextPairs = syChosePairs(syzstr,&index,&howmuch,&actdeg);
 /*--- computes the resolution ----------------------*/

kernel/syz3.cc

@@ -89 +89 @@
 * shows the resolution stored in syzstr->orderedRes
 */
+#if 0 /* unused*/
 static void syShowRes(syStrategy syzstr)
 {
@@ -103 +104 @@
   }
 }
+#endif
  
 /*3
@@ -601 +603 @@
 * the corresponding representation)
 */
+#if 0 /*unused*/
 static void syRedTailSyzPair(SObject tso,syStrategy syzstr,int index,
             int * gen_length,int* orp_l,int * tored_l,int * syzred_l)
@@ -637 +640 @@
   assume(pLength(tso.p)==*tored_l);
 }
+#endif
  
 /*3
@@ -1178 +1182 @@
   int ng_place=IDELEMS(new_generators);
   int i,j;
-  number coefgcd,n;
+  number n;
   poly p;
-  BOOLEAN deleteP=FALSE;
 #ifdef EXPERIMENT1
   poly syzp;
@@ -1367 +1370 @@
 {
   if (resPairs[0].lcm==NULL) return FALSE;
-  int i=0,j;
+  int i=0;
   poly deg_soc;
  
@@ -1450 +1453 @@
       if (next_p!=NULL)
       {
-        if (pGetComp(next_p)<=crit_comp)
+        if (pGetComp(next_p)<=(unsigned)crit_comp)
         {
           pDelete(&next_p);
@@ -1675 +1678 @@
                          resolvente totake)
 {
-  int i,j,newIdeal;
-  intvec * w;
-  poly p;
+  int i,j;
   ideal result;
   int rk_new_gens = id_RankFreeModule(new_generators,currRing);
@@ -1752 +1753 @@
 syStrategy syKosz(ideal arg,int * length)
 {
-  int i,j,jj,k=0,index=0,rk_arg,actual_syzcomp,next_syz=0;
+  int i,j,jj,k=0,index=0,rk_arg,next_syz=0;
   int crit_comp,t_comp,next_deg,old_tl;
   ideal temp=NULL,old_ideal,old_repr;
-  ring origR = currRing,actR;
-  poly p,next_gen;
-  tHomog hom=isNotHomog;
+  ring origR = currRing;
+  poly next_gen;
   BOOLEAN isRegular;
  

kernel/walkMain.cc

@@ -70 +70 @@
   /* OLDRING **************************************************** */
   ideal nextG;
-  BITSET optionState;
 
   if (currwOnBorder64(G,currw64))
@@ -113 +112 @@
     nextG=(ideal)resMat;
 
-    optionState=test;
-    test|=Sy_bit(OPT_REDSB);
+    BITSET save1,save2;
+    SI_SAVE_OPT(save1,save2);
+    si_opt_1|=Sy_bit(OPT_REDSB);
     nextG = idInterRed(nextG);
-    test=optionState;
+    SI_RESTORE_OPT(save1,save2);
   }
   else
@@ -145 +145 @@
 ///////////////////////////////////////////////////////////////////
 
-WalkState walkStep64(ideal & G,int64vec* currw64, int step){
+WalkState walkStep64(ideal & G,int64vec* currw64, int step)
+{
   WalkState state=WalkOk;
-  BITSET optionState;
 
 /* OLDRING ****************************************************** */
@@ -196 +196 @@
   nextG=(ideal)resMat;
 
-  optionState=test;
-  test|=Sy_bit(OPT_REDSB);
+  BITSET save1,save2;
+  SI_SAVE_OPT(save1,save2);
+  si_opt_1|=Sy_bit(OPT_REDSB);
   nextG = idInterRed(nextG);
-  test=optionState;
+  SI_RESTORE_OPT(save1,save2);
 
   G=nextG;
@@ -219 +220 @@
 
 WalkState walk64(ideal I,int64vec* currw64,ring destRing,
-int64vec* destVec64,ideal  & destIdeal,BOOLEAN sourceIsSB){
-
+int64vec* destVec64,ideal  & destIdeal,BOOLEAN sourceIsSB)
+{
   //some initializations
   WalkState state=WalkOk;
-  BITSET optionState;
-  test|=Sy_bit(OPT_REDTAIL);
+  BITSET save1,save2;
+  SI_SAVE_OPT(save1,save2);
+
+  si_opt_1|=Sy_bit(OPT_REDTAIL);
   overflow_error=FALSE;
   int step=0;
   ideal G=I;
 
-  optionState=test;
-  test|=Sy_bit(OPT_REDSB);
+  si_opt_1|=Sy_bit(OPT_REDSB);
   if(!sourceIsSB)
   {
@@ -238 +240 @@
   else
     G=idInterRed(G);
-  test=optionState;
+  SI_RESTORE_OPT(save1,save2);
 
   ideal nextG;
@@ -244 +246 @@
   nextG=G;
 
-  if(overflow_error){
-      state=WalkOverFlowError;
+  if(overflow_error)
+  {
+    state=WalkOverFlowError;
     return(state);
-    }
-
-   int64 nexttvec0,nexttvec1;
-   //int64vec* nexttvec64=nextt64(nextG,currw64,destVec64);
-   nextt64(nextG,currw64,destVec64,nexttvec0,nexttvec1);
+  }
+
+  int64 nexttvec0,nexttvec1;
+  //int64vec* nexttvec64=nextt64(nextG,currw64,destVec64);
+  nextt64(nextG,currw64,destVec64,nexttvec0,nexttvec1);
 
   //while(0<t<=1) ( t=((*nexttvec64)[0])/((*nexttvec64)[1]) )
   //while( (*nexttvec64)[0]<=(*nexttvec64)[1] ) {
-  while (nexttvec0<=nexttvec1 ) {
-
+  while (nexttvec0<=nexttvec1 )
+  {
     step=step+1;
 
@@ -271 +274 @@
     //uppdates nextG if all is OK
 
-    if(overflow_error){
+    if(overflow_error)
       return(WalkOverFlowError);
-    }
 
     //delete nexttvec64;
@@ -353 +355 @@
 ///////////////////////////////////////////////////////////////////
 
-WalkState unperturbedFirstStep64(ideal & G,int64vec* currw64, ring destRing){
+WalkState unperturbedFirstStep64(ideal & G,int64vec* currw64, ring destRing)
+{
   WalkState state=WalkOk;
   /* OLDRING **************************************************** */
   ideal nextG;
-  BITSET optionState;
+  BITSET save1,save2;
+  SI_SAVE_OPT(save1,save2);
 
   if (currwOnBorder64(G,currw64))
@@ -371 +375 @@
 
       //turn off bucket representation of polynomials and on redSB
-    optionState=test;
-    //test|=Sy_bit(OPT_NOT_BUCKETS);
-    test|=Sy_bit(OPT_REDSB);
+    //si_opt_1|=Sy_bit(OPT_NOT_BUCKETS);
+    si_opt_1|=Sy_bit(OPT_REDSB);
 
     ideal newStdGw=idStd(newGw);
 
-   //turn on bucket representation of polynomials and off redSB
-   test=optionState;
+    //turn on bucket representation of polynomials and off redSB
+    SI_RESTORE_OPT(save1,save2);
 
     matrix L=matIdLift(newGw,newStdGw);
@@ -394 +397 @@
     nextG=(ideal)resMat;
 
-    optionState=test;
-    test|=Sy_bit(OPT_REDSB);
+    si_opt_1|=Sy_bit(OPT_REDSB);
     nextG = idInterRed(nextG);
-    test=optionState;
+    SI_RESTORE_OPT(save1,save2);
   }
   else
@@ -436 +438 @@
 {  PrintS("fractal walk, weights");currw64->show();PrintLn(); }
 WalkState state=WalkOk;
-BITSET optionState=test;
+BITSET save1,save2;
+SI_SAVE_OPT(save1,save2);
 
 //1
@@ -530 +533 @@
       newGw=idrMoveR(GwCp,oldRing,newring);
 
-      test|=Sy_bit(OPT_REDSB);
+      si_opt_1|=Sy_bit(OPT_REDSB);
       newStdGw=idStd(newGw); //computes new reduced GB of Gw
-      test=optionState;
+      SI_RESTORE_OPT(save1,save2);
     }
     else
@@ -567 +570 @@
     //fractalRec64(Gw,level+1) has returned
 
-    //test|=Sy_bit(OPT_NOT_BUCKETS);
+    //si_opt_1|=Sy_bit(OPT_NOT_BUCKETS);
     matrix L=matIdLift(newGw,newStdGw);
-    test=optionState;
+    SI_RESTORE_OPT(save1,save2);
 
     newG=idrMoveR(GCp,oldRing,currRing);
@@ -581 +584 @@
 //9
 
-    test|=Sy_bit(OPT_REDSB);
+    si_opt_1|=Sy_bit(OPT_REDSB);
     G=idInterRed(G);
-    test=optionState;
+    SI_RESTORE_OPT(save1,save2);
 
     old_w=iv64Copy(w);
@@ -615 +618 @@
   overflow_error=FALSE; //global
   WalkState state=WalkOk;
-  test|=Sy_bit(OPT_REDTAIL);
+  BITSET save1,save2;
+  SI_SAVE_OPT(save1,save2);
+
+  si_opt_1|= (Sy_bit(OPT_REDTAIL)|Sy_bit(OPT_REDSB));
   ideal G;
 
-  BITSET optionState=test;
-  test|=Sy_bit(OPT_REDSB);
   if(!sourceIsSB)
   {
@@ -630 +634 @@
   }
 
-  test=optionState; //switches REDSB off
+  SI_RESTORE_OPT(save1,save2); //switches REDSB off
 
   //matrices for the orders of the rings

libpolys/misc/mylimits.h

@@ -21 +21 @@
 
 // #define ULONG_MAX (~0UL) // ??
+#ifndef ULONG_MAX
 #define ULONG_MAX (~0L)
+#endif
 
 // TODO: fixing the following BUG (!?) leads to wrong ring::bitmask
 // #if ~0UL != 4294967295UL
+#ifndef LONG_MAX
 #if ~0UL == 4294967295UL
 #define LONG_MAX 9223372036854775807L
@@ -30 +33 @@
 #define LONG_MAX 2147483647L
 #endif
+#endif
 
 #endif /* _MYLIMITS_H */

libpolys/misc/options.c

@@ -2 +2 @@
 // since initialized variables will be "D" (uninit. go to "C") segments
 #include <misc/options.h>
-unsigned test = 0;
-unsigned verbose = Sy_bit(V_QUIET)
+unsigned si_opt_1 = 0;
+unsigned si_opt_2 = Sy_bit(V_QUIET)
                    //| Sy_bit(V_QRING) // not default, as speed drops by 10 %
                    | Sy_bit(V_REDEFINE)

libpolys/misc/options.h

@@ -11 +11 @@
 /*the general set of verbose-options : verbose */
 #ifdef __cplusplus
-extern "C" unsigned test;
-extern "C" unsigned verbose;
+extern "C" unsigned si_opt_1;
+extern "C" unsigned si_opt_2;
 #else
-extern unsigned test;
-extern unsigned verbose;
+extern unsigned si_opt_1;
+extern unsigned si_opt_2;
 #endif
+#define SI_SAVE_OPT(A,B) { A=si_opt_1; B=si_opt_2; }
+#define SI_SAVE_OPT1(A) { A=si_opt_1; }
+#define SI_SAVE_OPT2(A) { A=si_opt_2; }
+#define SI_RESTORE_OPT(A,B) { si_opt_1=A; si_opt_2=B; }
+#define SI_RESTORE_OPT1(A) { si_opt_1=A; }
+#define SI_RESTORE_OPT2(A) { si_opt_2=A; }
 
 /*
@@ -24 +30 @@
 #define Sy_bit(x)     ((unsigned)1<<(x))
 #define Sy_inset(x,s) ((Sy_bit(x)&(s))?TRUE:FALSE)
-#define BTEST1(a)     Sy_inset((a), test)
-#define BVERBOSE(a)   Sy_inset((a), verbose)
+#define BTEST1(a)     Sy_inset((a), si_opt_1)
+#define BVERBOSE(a)   Sy_inset((a), si_opt_2)
 
 /*

libpolys/polys/monomials/p_polys.cc

@@ -246 +246 @@
           const int limit = o->data.syz.limit;
 
-          if (c > limit)
+          if (c > (unsigned long)limit)
             p->exp[place] = o->data.syz.curr_index;
           else if (c > 0)
           {
-            assume( (1 <= c) && (c <= limit) );
+            assume( (1 <= c) && (c <= (unsigned long)limit) );
             p->exp[place]= o->data.syz.syz_index[c];
           }
@@ -530 +530 @@
   p_LmCheckPolyRing(p, r);
   int i, k;
-  int pIS = 0;
   long j =0;
 
@@ -1914 +1913 @@
   assume( ph != NULL );
 
-  assume( r != NULL ); assume( r->cf != NULL ); const coeffs C = r->cf;
+  assume( r != NULL ); assume( r->cf != NULL ); 
 
 
@@ -1920 +1919 @@
   if( 0 )
   {
+    const coeffs C = r->cf;
       // experimentall (recursive enumerator treatment) of alg. Ext!
     CPolyCoeffsEnumerator itr(ph);
@@ -1977 +1977 @@
       n_ClearContent(itr, r->cf);
 
-      p_Test(ph, r); n_Test(pGetCoeff(ph), C);
-      assume(n_GreaterZero(pGetCoeff(ph), C)); // ??
+      p_Test(ph, r); n_Test(pGetCoeff(ph), r->cf);
+      assume(n_GreaterZero(pGetCoeff(ph), r->cf)); // ??
       
       // if(!n_GreaterZero(pGetCoeff(ph),r->cf)) ph = p_Neg(ph,r);

libpolys/polys/monomials/ring.cc

@@ -3430 +3430 @@
   if (complete)
   {
-    test &= ~ TEST_RINGDEP_OPTS;
-    test |= r->options;
+    si_opt_1 &= ~ TEST_RINGDEP_OPTS;
+    si_opt_1 |= r->options;
   }
 }

libpolys/polys/monomials/ring.h

@@ -659 +659 @@
   if( ret )
   {
-    const ring R = C->extRing;
-    assume( R != NULL );
+    assume( (C->extRing) != NULL );
     BOOLEAN idIs0 (ideal h);
-    assume( !idIs0(R->qideal) );
+    assume((!((C->extRing)->qideal==NULL)) && (!idIs0((C->extRing)->qideal)));
   }