Changeset a0abee in git for Singular/iparith.cc

Timestamp:

Mar 29, 2021, 11:53:18 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

9e5a6c133d12cc9750553f96ddb76b671e731293

Parents:

11b3b2c70e910e5436c4461f3bdfd2649f4aa465

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-03-29 23:53:18+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-03-30 00:45:51+02:00

Message:

removed unneeded #ifdef

File:

• Singular/iparith.cc (modified) (17 diffs)

Singular/iparith.cc

@@ -612 +612 @@
   poly u_p=(poly)u->CopyD(POLY_CMD);
   if ((u_p!=NULL)
-  #ifdef HAVE_SHIFTBBA
   && (!rIsLPRing(currRing))
-  #endif
   && ((v_i!=0) &&
       ((long)pTotaldegree(u_p) > (signed long)currRing->bitmask / (signed long)v_i/2)))
@@ -4035 +4033 @@
   assumeStdFlag(v);
 #ifdef HAVE_SHIFTBBA
-  if (currRing->isLPring)
+  if (rIsLPRing(currRing))
   {
 #ifdef HAVE_RINGS
@@ -4283 +4281 @@
 {
 #ifdef HAVE_SHIFTBBA
-  if (currRing->isLPring)
+  if (rIsLPRing(currRing))
   {
     int deg = (int)(long)v->Data();
-    if (deg > currRing->N/currRing->isLPring) {
+    if (deg > currRing->N/currRing->isLPring)
+    {
       WerrorS("degree bound of Letterplace ring is to small");
       return TRUE;
@@ -5172 +5171 @@
   return FALSE;
 }
+static BOOLEAN jjOPPOSITE(leftv res, leftv a)
+{
 #ifdef HAVE_PLURAL
-static BOOLEAN jjOPPOSITE(leftv res, leftv a)
-{
   ring    r = (ring)a->Data();
   //if (rIsPluralRing(r))
@@ -5187 +5186 @@
   }
   return FALSE;
+#else
+  return TRUE;
+#endif
 }
 static BOOLEAN jjENVELOPE(leftv res, leftv a)
 {
+#ifdef HAVE_PLURAL
   ring    r = (ring)a->Data();
   if (rIsPluralRing(r))
@@ -5198 +5201 @@
   else  res->data = rCopy(r);
   return FALSE;
+#else
+  return TRUE;
+#endif
 }
 static BOOLEAN jjTWOSTD(leftv res, leftv a)
 {
+#ifdef HAVE_PLURAL
   ideal result;
   ideal v_id=(ideal)a->Data();
@@ -5213 +5220 @@
   setFlag(res,FLAG_TWOSTD);
   return FALSE;
-}
+#else
+  return TRUE;
 #endif
+}
+static BOOLEAN jjRIGHTSTD(leftv res, leftv v)
+{
 #if defined(HAVE_SHIFTBBA) || defined(HAVE_PLURAL)// do not place above jjSTD in this file because we need to reference it
-static BOOLEAN jjRIGHTSTD(leftv res, leftv v)
-{
   if (rIsLPRing(currRing))
   {
@@ -5272 +5281 @@
     return jjSTD(res, v);
   }
-}
+#else
+  return TRUE;
 #endif
+}
 static BOOLEAN jjTYPEOF(leftv res, leftv v)
 {
@@ -5362 +5373 @@
   assumeStdFlag(v);
 #ifdef HAVE_SHIFTBBA
-  if (currRing->isLPring)
+  if (rIsLPRing(currRing))
   {
 #ifdef HAVE_RINGS
@@ -6592 +6603 @@
   else
   {
-#ifdef HAVE_SHIFTBBA
     if (rIsLPRing(currRing))
     {
@@ -6598 +6608 @@
       return TRUE;
     }
-#endif
     res->data=pSubstPar(p,-ringvar,monomexpr);
   }
@@ -6641 +6650 @@
   else
   {
-#ifdef HAVE_SHIFTBBA
     if (rIsLPRing(currRing))
     {
@@ -6647 +6655 @@
       return TRUE;
     }
-#endif
     res->data = idSubstPar(id,-ringvar,monomexpr);
   }
@@ -9844 +9851 @@
 static BOOLEAN check_valid(const int p, const int op)
 {
-  #ifdef HAVE_PLURAL
   if (rIsPluralRing(currRing))
   {
@@ -9859 +9865 @@
     /* else, ALLOW_PLURAL */
   }
-  #ifdef HAVE_SHIFTBBA
   else if (rIsLPRing(currRing))
   {
@@ -9868 +9873 @@
     }
   }
-  #endif
-  #endif
-#ifdef HAVE_RINGS
   if (rField_is_Ring(currRing))
   {
@@ -9891 +9893 @@
     }
   }
-#endif
   return FALSE;
 }