Changeset 7b9b8e5 in git

Timestamp:

Jul 27, 2016, 5:32:43 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

f9b0bddbfb9793b47a94a5d2aace6da9918e3c70

Parents:

e642218a429036f2f457d8045880dc747c8200a7

Message:

fix: Werror -> WerrorS if possible

Files:

• Singular/dyn_modules/polymake/polymake_wrapper.cc (modified) (2 diffs)
• Singular/dyn_modules/pyobject/pyobject.cc (modified) (8 diffs)
• Singular/dyn_modules/syzextra/singularxx_defs.h (modified) (1 diff)
• Singular/fehelp.cc (modified) (1 diff)
• Singular/ipassign.cc (modified) (2 diffs)
• Singular/ipid.cc (modified) (1 diff)
• Singular/iplib.cc (modified) (1 diff)
• Singular/ipshell.cc (modified) (8 diffs)
• Singular/links/asciiLink.cc (modified) (2 diffs)
• Singular/links/pipeLink.cc (modified) (1 diff)
• Singular/links/ssiLink.cc (modified) (1 diff)
• Singular/newstruct.cc (modified) (1 diff)
• Singular/pyobject_setup.cc (modified) (1 diff)
• Singular/walk.cc (modified) (7 diffs)
• Singular/walk_ip.cc (modified) (2 diffs)
• kernel/GBEngine/kstd2.cc (modified) (3 diffs)
• kernel/GBEngine/ratgring.cc (modified) (2 diffs)
• kernel/GBEngine/syz3.cc (modified) (1 diff)
• kernel/combinatorics/hilb.cc (modified) (2 diffs)
• kernel/fast_mult.cc (modified) (1 diff)
• kernel/ideals.cc (modified) (1 diff)
• kernel/maps/subst_maps.cc (modified) (1 diff)
• kernel/old/old.Number.h (modified) (4 diffs)
• kernel/old/old.Poly.h (modified) (4 diffs)
• kernel/preimage.cc (modified) (2 diffs)
• libpolys/coeffs/numbers.cc (modified) (2 diffs)
• libpolys/polys/monomials/p_polys.cc (modified) (1 diff)
• libpolys/polys/nc/old.gring.cc (modified) (12 diffs)

Singular/dyn_modules/polymake/polymake_wrapper.cc

@@ -76 +76 @@
         if (d1 != d2)
         {
-          Werror("mismatching ambient dimensions");
+          WerrorS("mismatching ambient dimensions");
           return TRUE;
         }
@@ -97 +97 @@
         if (d1 != d2)
         {
-          Werror("mismatching ambient dimensions");
+          WerrorS("mismatching ambient dimensions");
           return TRUE;
         }

Singular/dyn_modules/pyobject/pyobject.cc

@@ -202 +202 @@
       IDTYP(handle) =  PythonInterpreter::id();
     }
-    else { Werror("Importing pyobject to Singular failed"); }
+    else { WerrorS("Importing pyobject to Singular failed"); }
   }
 
@@ -422 +422 @@
 
 /// Evaluate string in python
-PythonObject python_eval(const char* arg) {
-
+PythonObject python_eval(const char* arg)
+{
   PyObject* globals = PyModule_GetDict(PyImport_Import(PyString_FromString("__main__")));
   return PyRun_String(arg, Py_eval_input, globals, globals);
@@ -429 +429 @@
 
 /// Evaluate string in python from Singular
-BOOLEAN python_eval(leftv result, leftv arg) {
-  if ( !arg || (arg->Typ() != STRING_CMD) ) {
-    Werror("expected python_eval('string')");
+BOOLEAN python_eval(leftv result, leftv arg)
+{
+  if ( !arg || (arg->Typ() != STRING_CMD) )
+  {
+    WerrorS("expected python_eval('string')");
     return TRUE;
   }
@@ -442 +444 @@
 BOOLEAN python_run(leftv result, leftv arg)
 {
-  if ( !arg || (arg->Typ() != STRING_CMD) ) {
-    Werror("expected python_run('string')");
+  if ( !arg || (arg->Typ() != STRING_CMD) )
+  {
+    WerrorS("expected python_run('string')");
     return TRUE;
   }
@@ -473 +476 @@
 
 /// import python module and export identifiers in Singular namespace
-BOOLEAN python_import(leftv result, leftv value) {
-
-  if ((value == NULL) || (value->Typ()!= STRING_CMD)) {
-    Werror("expected python_import('string')");
+BOOLEAN python_import(leftv result, leftv value)
+{
+  if ((value == NULL) || (value->Typ()!= STRING_CMD))
+  {
+    WerrorS("expected python_import('string')");
     return TRUE;
   }
@@ -531 +535 @@
     {
       long value = PyInt_AsLong(PythonCastStatic<>(head));
-      if( (value == -1) &&  PyErr_Occurred() ) {
-        Werror("'pyobject` cannot be converted to integer");
+      if( (value == -1) &&  PyErr_Occurred() )
+      {
+        WerrorS("'pyobject` cannot be converted to integer");
         PyErr_Clear();
         return TRUE;
@@ -612 +617 @@
 
       intvec* vec = new intvec(len);
-      for(unsigned long idx = 0; idx != len; ++idx) {
+      for(unsigned long idx = 0; idx != len; ++idx)
+      {
         long value = PyInt_AsLong(obj[idx]);
         (*vec)[idx] = static_cast<int>(value);
 
-        if ((value == -1) &&  PyErr_Occurred()) {
+        if ((value == -1) &&  PyErr_Occurred())
+        {
           value = 0;
           PyErr_Clear();
         }
-        if (value != long((*vec)[idx])) {
+        if (value != long((*vec)[idx]))
+        {
           delete vec;
-          Werror("'pyobject` cannot be converted to intvec");
+          WerrorS("'pyobject` cannot be converted to intvec");
           return TRUE;
         }
@@ -696 +704 @@
   {
     tok = setBlackboxStuff((blackbox*)omAlloc0(sizeof(blackbox)),
-                           "pyobject");
+                           "pyobject");
   }
   return getBlackboxStuff(tok);

Singular/dyn_modules/syzextra/singularxx_defs.h

@@ -58 +58 @@
 #  define SINGULARXX_THROW(type) throw type();
 #else
-#  define SINGULARXX_THROW(type) Werror(type().what());
+#  define SINGULARXX_THROW(type) WerrorS(type().what());
 #endif
 

Singular/fehelp.cc

@@ -1019 +1019 @@
 static void heDummyHelp(heEntry /*hentry*/, int /*br*/)
 {
-  Werror("No functioning help browser available.");
+  WerrorS("No functioning help browser available.");
 }
 

Singular/ipassign.cc

@@ -260 +260 @@
   if ((p==NULL) ||(NUM((fraction)p)==NULL))
   {
-    Werror("Could not construct the alg. extension: minpoly==0");
+    WerrorS("Could not construct the alg. extension: minpoly==0");
     // cleanup A: TODO
     rDelete( A.r );
@@ -301 +301 @@
   if (new_cf==NULL)
   {
-    Werror("Could not construct the alg. extension: llegal minpoly?");
+    WerrorS("Could not construct the alg. extension: llegal minpoly?");
     // cleanup A: TODO
     rDelete( A.r );

Singular/ipid.cc

@@ -367 +367 @@
   }
   else
-    Werror("kill what ?");
+    WerrorS("kill what ?");
 }
 

Singular/iplib.cc

@@ -834 +834 @@
     else
       Werror(yylp_errlist[yylp_errno], yylplineno);
-    Werror("Cannot load library,... aborting.");
+    WerrorS("Cannot load library,... aborting.");
     reinit_yylp();
     fclose( yylpin );

Singular/ipshell.cc

@@ -2219 +2219 @@
   if ((L->m[0].rtyp!=INT_CMD) || (L->m[0].data!=(char *)0))
   {
-    Werror("invald coeff. field description, expecting 0");
+    WerrorS("invalid coeff. field description, expecting 0");
     return;
   }
@@ -2227 +2227 @@
   if (L->m[1].rtyp!=LIST_CMD)
   {
-    Werror("invald coeff. field description, expecting precision list");
+    WerrorS("invalid coeff. field description, expecting precision list");
     return;
   }
@@ -2237 +2237 @@
     || (LL->m[0].rtyp!=INT_CMD)))
   {
-    Werror("invald coeff. field description list");
+    WerrorS("invalid coeff. field description list");
     return;
   }
@@ -2273 +2273 @@
     if (L->m[2].rtyp!=STRING_CMD)
     {
-      Werror("invald coeff. field description, expecting parameter name");
+      WerrorS("invalid coeff. field description, expecting parameter name");
       return;
     }
@@ -2302 +2302 @@
   else
   {
-    if (L->m[1].rtyp!=LIST_CMD) Werror("invald data, expecting list of numbers");
+    if (L->m[1].rtyp!=LIST_CMD) WerrorS("invalid data, expecting list of numbers");
     lists LL=(lists)L->m[1].data;
     if ((LL->nr >= 0) && LL->m[0].rtyp == BIGINT_CMD)
@@ -2330 +2330 @@
   if ((mpz_cmp_ui(modBase, 1) == 0) && (mpz_cmp_ui(modBase, 0) < 0))
   {
-    Werror("Wrong ground ring specification (module is 1)");
+    WerrorS("Wrong ground ring specification (module is 1)");
     return;
   }
   if (modExponent < 1)
   {
-    Werror("Wrong ground ring specification (exponent smaller than 1");
+    WerrorS("Wrong ground ring specification (exponent smaller than 1)");
     return;
   }
@@ -5716 +5716 @@
     if ((mpz_cmp_ui(modBase, 1) == 0) && (mpz_cmp_ui(modBase, 0) < 0))
     {
-      Werror("Wrong ground ring specification (module is 1)");
+      WerrorS("Wrong ground ring specification (module is 1)");
       goto rInitError;
     }
     if (modExponent < 1)
     {
-      Werror("Wrong ground ring specification (exponent smaller than 1");
+      WerrorS("Wrong ground ring specification (exponent smaller than 1");
       goto rInitError;
     }
@@ -5812 +5812 @@
   if (cf==NULL)
   {
-    Werror("Invalid ground field specification");
+    WerrorS("Invalid ground field specification");
     goto rInitError;
 //    const int ch=32003;

Singular/links/asciiLink.cc

@@ -184 +184 @@
       else
       {
-        Werror("cannot convert to string");
+        WerrorS("cannot convert to string");
         err=TRUE;
       }
@@ -531 +531 @@
   if (l->name[0] == '\0')
   {
-    Werror("getdump: Can not get dump from stdin");
+    WerrorS("getdump: Can not get dump from stdin");
     return TRUE;
   }

Singular/links/pipeLink.cc

@@ -146 +146 @@
     else
     {
-      Werror("cannot convert to string");
+      WerrorS("cannot convert to string");
       err=TRUE;
     }

Singular/links/ssiLink.cc

@@ -408 +408 @@
     return (number)ssiReadPoly_R(d,cf->extRing);
   }
-  else Werror("coeffs not implemented in ssiReadNumber");
+  else WerrorS("coeffs not implemented in ssiReadNumber");
   return NULL;
 }

Singular/newstruct.cc

@@ -375 +375 @@
               res->data=(void *)currRing; r=currRing;
               if (r!=NULL) r->ref++;
-              else Werror("ring of this member is not set and no basering found");
+              else WerrorS("ring of this member is not set and no basering found");
             }
             return r==NULL;

Singular/pyobject_setup.cc

@@ -33 +33 @@
 void pyobject_default_destroy(blackbox  */*b*/, void */*d*/)
 {
-  Werror("Python-based functionality not available!");
+  WerrorS("Python-based functionality not available!");
 }
 

Singular/walk.cc

@@ -5531 +5531 @@
   if(weight_rad < 0)
   {
-    Werror("Invalid radius.\n");
+    WerrorS("Invalid radius.\n");
     return NULL;
   }
@@ -5538 +5538 @@
   if(pert_deg > nV || pert_deg < 1)
   {
-    Werror("Invalid perturbation degree.\n");
+    WerrorS("Invalid perturbation degree.\n");
     return NULL;
   }
@@ -5876 +5876 @@
   if(op_deg < 1 || tp_deg < 1 || op_deg > nV || tp_deg > nV)
   {
-    Werror("Invalid perturbation degree.\n");
+    WerrorS("Invalid perturbation degree.\n");
     return NULL;
   }
@@ -6311 +6311 @@
   if(weight_rad < 0)
   {
-    Werror("Invalid radius.\n");
+    WerrorS("Invalid radius.\n");
     return NULL;
   }
@@ -6318 +6318 @@
   if(op_deg < 1 || tp_deg < 1 || op_deg > nV || tp_deg > nV)
   {
-    Werror("Invalid perturbation degree.\n");
+    WerrorS("Invalid perturbation degree.\n");
     return NULL;
   }
@@ -8113 +8113 @@
   if(weight_rad < 0)
   {
-    Werror("Invalid radius.\n");
+    WerrorS("Invalid radius.\n");
     return NULL;
   }
@@ -9219 +9219 @@
   if(tp_deg < 1 || tp_deg > nV)
   {
-    Werror("Invalid perturbation degree.\n");
+    WerrorS("Invalid perturbation degree.\n");
     return NULL;
   }

Singular/walk_ip.cc

@@ -124 +124 @@
 
         case WalkIncompatibleDestRing:
-          Werror( "Order of basering not allowed,\n must be a combination of a,A,lp,dp,Dp,wp,Wp,M and C.\n");
+          WerrorS( "Order of basering not allowed,\n must be a combination of a,A,lp,dp,Dp,wp,Wp,M and C.\n");
           destIdeal= NULL;
           break;
@@ -141 +141 @@
 
         case WalkOverFlowError:
-          Werror( "Overflow occurred.\n");
+          WerrorS( "Overflow occurred.\n");
           destIdeal= NULL;
           break;

kernel/GBEngine/kstd2.cc

@@ -1621 +1621 @@
     if (strat->overflow)
     {
-      if (!kStratChangeTailRing(strat)) { Werror("OVERFLOW.."); break;}
+      if (!kStratChangeTailRing(strat)) { WerrorS("OVERFLOW.."); break;}
     }
 
@@ -2078 +2078 @@
     if (strat->overflow)
     {
-        if (!kStratChangeTailRing(strat)) { Werror("OVERFLOW.."); break;}
+        if (!kStratChangeTailRing(strat)) { WerrorS("OVERFLOW.."); break;}
     }
 
@@ -2798 +2798 @@
     if (strat->overflow)
     {
-      if (!kStratChangeTailRing(strat)) { Werror("OVERFLOW.."); break;}
+      if (!kStratChangeTailRing(strat)) { WerrorS("OVERFLOW.."); break;}
     }
 

kernel/GBEngine/ratgring.cc

@@ -351 +351 @@
   {
 #ifdef PDEBUG
-    Werror("nc_rat_CreateSpoly: different non-zero components!");
+    WerrorS("nc_rat_CreateSpoly: different non-zero components!");
 #endif
     return(NULL);
@@ -472 +472 @@
   {
 #ifdef PDEBUG
-    Werror("nc_rat_ReduceSpolyNew: different non-zero components!");
+    WerrorS("nc_rat_ReduceSpolyNew: different non-zero components!");
 #endif
     return(NULL);

kernel/GBEngine/syz3.cc

@@ -1004 +1004 @@
   if ((idIs0(new_generators)) || (new_generators->m[0]==NULL))
   {
-    Werror("Hier ist was faul!\n");
+    WerrorS("Hier ist was faul!\n");
     return NULL;
   }

kernel/combinatorics/hilb.cc

@@ -70 +70 @@
       if (z>(MAX_INT_VAL)/2)
       {
-       Werror("interal arrays too big");
+       WerrorS("interal arrays too big");
        return;
       }
@@ -258 +258 @@
         {
             idPrint(I);
-            Werror("Ideal is not deg sorted!!");
+            WerrorS("Ideal is not deg sorted!!");
             return(FALSE);
         }

kernel/fast_mult.cc

@@ -591 +591 @@
 
   if(rChar(r)!=0)
-    Werror("Char not 0, pFastPowerMC not implemented for this case");
+    WerrorS("Char not 0, pFastPowerMC not implemented for this case");
   if (n<=1)
-    Werror("not implemented for so small n, recursion fails");//should be length(f)
+    WerrorS("not implemented for so small n, recursion fails");//should be length(f)
    if (pLength(f)<=1)
-    Werror("not implemented for so small length of f, recursion fails");
+    WerrorS("not implemented for so small length of f, recursion fails");
   //  number null_number=n_Init(0,r);
   number* facult=(number*) omAlloc((n+1)*sizeof(number));

kernel/ideals.cc

@@ -1520 +1520 @@
     if ( nc_rComplete(origR, tmpR, false) ) // no quotient ideal!
     {
-      Werror("no elimination is possible: ordering condition is violated");
+      WerrorS("no elimination is possible: ordering condition is violated");
       // cleanup
       rDelete(tmpR);

kernel/maps/subst_maps.cc

@@ -46 +46 @@
     ||(preimage_r!=currRing))
     {
-      Werror("not implemented");
+      WerrorS("not implemented");
       return NULL;
     }

kernel/old/old.Number.h

@@ -72 +72 @@
   Number& operator+=(const Number & n2){
     if (r!=n2.r){
-      Werror("not the same ring");
+      WerrorS("not the same ring");
       return *this;
     }
@@ -82 +82 @@
   Number& operator*=(const Number & n2){
     if (r!=n2.r){
-      Werror("not the same ring");
+      WerrorS("not the same ring");
       return *this;
     }
@@ -92 +92 @@
   Number& operator-=(const Number & n2){
     if (r!=n2.r){
-      Werror("not the same ring");
+      WerrorS("not the same ring");
       return *this;
     }
@@ -102 +102 @@
   Number& operator/=(const Number & n2){
     if (r!=n2.r){
-      Werror("not the same ring");
+      WerrorS("not the same ring");
       return *this;
     }

kernel/old/old.Poly.h

@@ -90 +90 @@
   PolyImpl& operator+=(const PolyImpl & p2){
     if (r!=p2.r){
-      Werror("not the same ring");
+      WerrorS("not the same ring");
       return *this;
     }
@@ -104 +104 @@
   PolyImpl& operator*=(const PolyImpl & p2){
     if (r!=p2.r){
-      Werror("not the same ring");
+      WerrorS("not the same ring");
       return *this;
     }
@@ -117 +117 @@
   PolyImpl& operator*=(const Number & n){
     if (r!=n.r){
-      Werror("not the same ring");
+      WerrorS("not the same ring");
       return *this;
     }
@@ -126 +126 @@
   PolyImpl& operator-=(const PolyImpl & p2){
     if (r!=p2.r){
-      Werror("not the same ring");
+      WerrorS("not the same ring");
       return *this;
     }

kernel/preimage.cc

@@ -70 +70 @@
     if ((rIsPluralRing(sourcering)) && (ncRingType(sourcering)!=nc_comm))
     {
-      Werror("Sorry, not yet implemented for noncomm. rings");
+      WerrorS("Sorry, not yet implemented for noncomm. rings");
       return NULL;
     }
@@ -96 +96 @@
   {
     /// TODO: there might be extreme cases where this doesn't hold...
-    Werror("Coefficient fields/rings must be equal");
+    WerrorS("Coefficient fields/rings must be equal");
     return NULL;
   }

libpolys/coeffs/numbers.cc

@@ -261 +261 @@
 {
   CanonicalForm term(0);
-  Werror("no conversion to factory");
+  WerrorS("no conversion to factory");
   return term;
 }
@@ -267 +267 @@
 static number ndConvFactoryNSingN( const CanonicalForm, const coeffs)
 {
-  Werror("no conversion from factory");
+  WerrorS("no conversion from factory");
   return NULL;
 }

libpolys/polys/monomials/p_polys.cc

@@ -3878 +3878 @@
   {
     assume (FALSE);
-    Werror("Number permutation is not implemented for this data yet!");
+    WerrorS("Number permutation is not implemented for this data yet!");
     return NULL;
   }

libpolys/polys/nc/old.gring.cc

@@ -1465 +1465 @@
   {
 #ifdef PDEBUG
-    Werror("gnc_ReduceSpolyNew: different non-zero components!");
+    WerrorS("gnc_ReduceSpolyNew: different non-zero components!");
 #endif
     return(NULL);
@@ -1633 +1633 @@
   {
 #ifdef PDEBUG
-    Werror("gnc_CreateSpolyNew: different non-zero components!");
+    WerrorS("gnc_CreateSpolyNew: different non-zero components!");
     assume(0);
 #endif
@@ -1743 +1743 @@
        p_Write(m2, r);
 
-       Werror("ERROR in nc_CreateSpoly: result of multiplication is Zero!\n");
+       WerrorS("ERROR in nc_CreateSpoly: result of multiplication is Zero!\n");
 #endif
        return(NULL);
@@ -1950 +1950 @@
   {
 #ifdef PDEBUG
-    Werror("nc_CreateShortSpoly: wrong module components!"); // !!!!
+    WerrorS("nc_CreateShortSpoly: wrong module components!"); // !!!!
 #endif
     return(NULL);
@@ -2019 +2019 @@
 
 #ifdef KDEBUG
-  if( !kbTest(b) )Werror("nc_kBucketPolyRed: broken bucket!");
+  if( !kbTest(b) ) WerrorS("nc_kBucketPolyRed: broken bucket!");
 #endif
 
@@ -2598 +2598 @@
 //  {
 //#ifdef PDEBUF
-//    Werror("nc_p_CopyGet call not in currRing");
+//    WerrorS("nc_p_CopyGet call not in currRing");
 //#endif
 //    return(NULL);
@@ -2619 +2619 @@
 //  {
 //#ifdef PDEBUF
-//    Werror("nc_p_CopyGet call not in currRing");
+//    WerrorS("nc_p_CopyGet call not in currRing");
 //#endif
 //    return(NULL);
@@ -2879 +2879 @@
     if (!p_IsConstant(CN,curr))
     {
-      Werror("Incorrect input : non-constants are not allowed as coefficients (first argument)");
+      WerrorS("Incorrect input : non-constants are not allowed as coefficients (first argument)");
       return TRUE;
     }
@@ -2887 +2887 @@
     if (n_IsZero(nN, curr))
     {
-      Werror("Incorrect input : zero coefficients are not allowed");
+      WerrorS("Incorrect input : zero coefficients are not allowed");
 
 //      if( currRing != save )
@@ -2945 +2945 @@
         // find also illegal pN
         {
-          Werror("Incorrect input : matrix of coefficients contains zeros in the upper triangle");
+          WerrorS("Incorrect input : matrix of coefficients contains zeros in the upper triangle");
 
 //        if( currRing != save )
@@ -3046 +3046 @@
     if( bDnew ) mp_Delete( &D, r );
 
-    Werror("Matrix of polynomials violates the ordering condition");
+    WerrorS("Matrix of polynomials violates the ordering condition");
 
 //    if( currRing != save )
@@ -3386 +3386 @@
     if ((shift<0) || (shift > rVar(srcRing))) // ???
     {
-      Werror("bad shifts in p_CopyEmbed");
+      WerrorS("bad shifts in p_CopyEmbed");
       return(0);
     }