Changeset 805db88 in git

Timestamp:

Nov 14, 2013, 7:57:20 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')

Children:

4b5171ff486c46e0d3f30c8810fc2bb7ebd00157

Parents:

b5f27dd8b00738efde14a72f129d4b6173d951f4

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-14 19:57:20+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-15 14:58:04+01:00

Message:

Avoid "if ((P)) " since clang treats such statements specially

Files:

• Singular/iparith.cc (modified) (2 diffs)
• Singular/ipassign.cc (modified) (3 diffs)
• Singular/maps_ip.cc (modified) (2 diffs)
• dyn_modules/callgfanlib/gfan.cc (modified) (1 diff)
• dyn_modules/syzextra/mod_main.cc (modified) (2 diffs)
• factory/libfac/factor/Factor.cc (modified) (1 diff)
• factory/libfac/factor/SqrFree.cc (modified) (2 diffs)
• kernel/fast_maps.cc (modified) (2 diffs)
• kernel/ideals.cc (modified) (1 diff)
• kernel/syz0.cc (modified) (1 diff)
• kernel/tgb_internal.h (modified) (2 diffs)
• kernel/walkSupport.cc (modified) (1 diff)
• libpolys/coeffs/modulop.cc (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (1 diff)
• libpolys/polys/nc/sca.cc (modified) (1 diff)

Singular/iparith.cc

@@ -3038 +3038 @@
 
   maxl--;
-  if ((maxl==-1) /*&& (iiOp!=MRES_CMD)*/)
+  if (/*(*/ maxl==-1 /*)*/) /*&& (iiOp!=MRES_CMD)*/ 
   {
     maxl = currRing->N-1+2*(iiOp==MRES_CMD);
@@ -3153 +3153 @@
 
   maxl--;
-  if ((maxl==-1) /*&& (iiOp!=MRES_CMD)*/)
+  if (/*(*/ maxl==-1 /*)*/) /*&& (iiOp!=MRES_CMD)*/ 
   {
     maxl = currRing->N-1+2*(iiOp==MRES_CMD);

Singular/ipassign.cc

@@ -502 +502 @@
 static BOOLEAN jiA_1x1INTMAT(leftv res, leftv a,Subexpr e)
 {
-  if ((res->rtyp!=INTMAT_CMD) /*|| (e!=NULL) - TRUE because of type int */)
+  if (/*(*/ res->rtyp!=INTMAT_CMD /*)*/) /*|| (e!=NULL) - TRUE because of type int */ 
   {
     // no error message: assignment simply fails
@@ -524 +524 @@
 static BOOLEAN jiA_1x1MATRIX(leftv res, leftv a,Subexpr e)
 {
-  if ((res->rtyp!=MATRIX_CMD) /*|| (e!=NULL) - TRUE because of type poly */)
+  if (/*(*/ res->rtyp!=MATRIX_CMD /*)*/) /*|| (e!=NULL) - TRUE because of type poly */ 
   {
     // no error message: assignment simply fails
@@ -846 +846 @@
 
   int lt=l->Typ();
-  if((lt==0)/*&&(l->name!=NULL)*/)
+  if (/*(*/ lt==0 /*)*/) /*&&(l->name!=NULL)*/ 
   {
     if (!errorreported) Werror("left side `%s` is undefined",l->Fullname());

Singular/maps_ip.cc

@@ -117 +117 @@
         res->data=(void *)prCopyR( (poly)data, preimage_r, currRing);
       else
-      if ((what==IMAP_CMD) || ((what==FETCH_CMD) /* && (nMap!=nCopy)*/))
+        if ( (what==IMAP_CMD) || /*(*/ (what==FETCH_CMD) /*)*/) /* && (nMap!=nCopy)*/
         res->data=(void *)p_PermPoly((poly)data,perm,preimage_r,currRing, nMap,par_perm,P);
       else /*if (what==MAP_CMD)*/
@@ -155 +155 @@
       }
       else
-      if ((what==IMAP_CMD) || ((what==FETCH_CMD) /* && (nMap!=nCopy)*/))
+        if ( (what==IMAP_CMD) || /*(*/ (what==FETCH_CMD) /*)*/) /* && (nMap!=nCopy)*/
       {
         for (i=R*C-1;i>=0;i--)

dyn_modules/callgfanlib/gfan.cc

@@ -1688 +1688 @@
         ring tmpRing;
 
-        if( (srcRing->order[0]!=ringorder_a))
+        if(  /*(*/ srcRing->order[0]!=ringorder_a /*)*/ )
         {
                 int64vec *iv;// = new int64vec(this->numVars);

dyn_modules/syzextra/mod_main.cc

@@ -701 +701 @@
   const int pos = rGetISPos(p, r);
 
-  if( (-1 == pos) )
+  if(  /*(*/ -1 == pos /*)*/  )
   {
     WerrorS("`GetInducedData([int])` called on incompatible ring (not created by 'MakeInducedSchreyerOrdering'!)");
@@ -777 +777 @@
   const int posIS = rGetISPos(p, r);
 
-  if( (-1 == posIS) )
+  if(  /*(*/ -1 == posIS /*)*/  )
   {
     WerrorS("`SetInducedReferrence(<ideal/module>, [int[, int]])` called on incompatible ring (not created by 'MakeInducedSchreyerOrdering'!)");

factory/libfac/factor/Factor.cc

@@ -845 +845 @@
   // search an "optimal" main variavble
   int mv=F.level();
-  if ((mv != LEVELBASE) /* && (! F.isUnivariate()) */)
+  if (/*(*/ mv != LEVELBASE /*)*/) /* && (! F.isUnivariate()) */ 
   {
      mv=find_mvar(F);

factory/libfac/factor/SqrFree.cc

@@ -219 +219 @@
   for (int k=1; k<=n; k++)
   {
-    if ((mipo.isZero())/*||(k!=1)*/)
+    if (/*(*/ mipo.isZero() /*)*/) /*||(k!=1)*/ 
     {
       g = swapvar(f,k,n); g = content(g);
@@ -266 +266 @@
     for (int k=1; k<=n; k++)
     {
-      if ((mipo.isZero())/*||(k!=1)*/)
+      if (/*(*/ mipo.isZero() /*)*/) /*||(k!=1)*/ 
       {
         g=swapvar(f,k,n) ;

kernel/fast_maps.cc

@@ -469 +469 @@
         return NULL;
       }
-      if ((p==NULL) /* && (e>0)*/)
+      if (/*(*/ p==NULL /*)*/) /* && (e>0)*/ 
       {
         p=p_Copy(pp /*dest_id[i-1]*/,dest_r);
@@ -715 +715 @@
   {
     choice=iter->next;
-    if ((iter->f1==NULL))
+    if ( /*(*/ iter->f1==NULL /*)*/ )
     {
       ggT=maFindBestggT(iter, choice, fp, fq,src_r);

kernel/ideals.cc

@@ -1219 +1219 @@
   intvec * weights;
   hom = (tHomog)idHomModule(h1,currQuotient,&weights);
-  if (/**addOnlyOne &&*/ (!h1IsStb))
+  if /**addOnlyOne &&*/ (/*(*/ !h1IsStb /*)*/) 
     temph1 = kStd(h1,currQuotient,hom,&weights,NULL);
   else

kernel/syz0.cc

@@ -910 +910 @@
 //idPrint(res[syzIndex+1]);
 
-    if ((syzIndex==0))
+    if ( /*(*/ syzIndex==0 /*)*/ )
     {
       if ((hom==isHomog)|| (rHasGlobalOrdering(origR)))

kernel/tgb_internal.h

@@ -1110 +1110 @@
    {
      MonRedResNP<number_type> red=mon[i];
-     if ((red.ref))
+     if ( /*(*/ red.ref /*)*/ )
      {
        if (red.ref->row)
@@ -1953 +1953 @@
   if (res_holder){
     succ=TRUE;
-    if ((res_holder->value_len==backLinkCode)){
+    if ( /*(*/ res_holder->value_len==backLinkCode /*)*/ ){
       len=1;
       return term;

kernel/walkSupport.cc

@@ -1123 +1123 @@
       (*res)[j]=(int64)weights[j];
   }
-  else if( (r->order[0]==ringorder_a64) )
+  else if(  /*(*/ r->order[0]==ringorder_a64 /*)*/  )
   {
     int64* weights=(int64*)r->wvhdl[0];

libpolys/coeffs/modulop.cc

@@ -539 +539 @@
                                % r->ch);
           r->npLogTable[r->npExpTable[i]] = i;
-          if (/*(i == r->ch - 1 ) ||*/ (r->npExpTable[i] == 1))
+          if /*(i == r->ch - 1 ) ||*/ (/*(*/ r->npExpTable[i] == 1 /*)*/) 
             break;
         }

libpolys/polys/ext_fields/transext.cc

@@ -1514 +1514 @@
 void ntNormalize (number &a, const coeffs cf)
 {
-  if ((a!=NULL))
+  if ( /*(*/ a!=NULL /*)*/ )
   {
     definiteGcdCancellation(a, cf, FALSE);

libpolys/polys/nc/sca.cc

@@ -477 +477 @@
 #endif
 
-  if( ( pPoly == NULL ) /*|| ( pMonom == NULL )*/ )
+  if (/*(*/  pPoly == NULL  /*)*/) /*|| ( pMonom == NULL )*/ 
     return NULL;