Changeset 922ada4 in git

Timestamp:

Aug 3, 2010, 1:52:39 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

390cfe56b2dbce8c9ca608246c5b81258cf5e02d

Parents:

fa93ce598d169afb25e70f0de46af88382f0840e

Message:

fix subst

git-svn-id: file:///usr/local/Singular/svn/trunk@13077 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

Singular/iparith.cc

@@ -1192 +1192 @@
 static BOOLEAN jjGE_N(leftv res, leftv u, leftv v)
 {
-  res->data = (char *) (nGreater((number)u->Data(),(number)v->Data()) 
+  res->data = (char *) (nGreater((number)u->Data(),(number)v->Data())
                        || nEqual((number)u->Data(),(number)v->Data()));
   return FALSE;
@@ -6121 +6121 @@
     else bo=TRUE;
     if (bo)
-    { 
+    {
       Werror("cannot convert %s to matrix",Tok2Cmdname(v_typ));
       return TRUE;
@@ -6131 +6131 @@
   bool noCacheMinors = true; bool noCacheMonomials = true;
   ideal IasSB; int k; char* algorithm; int cacheMinors; int cacheMonomials;
-  
+
   /* here come the different cases of correct argument sets */
   if ((u->next != NULL) && (u->next->Typ() == IDEAL_CMD))
@@ -6195 +6195 @@
     }
   }
-  
+
   /* upper case conversion for the algorithm if present */
   if (!noAlgorithm)
@@ -6387 +6387 @@
   if (nok) return TRUE;
   poly p=(poly)u->Data();
-  if ((monomexpr!=NULL)
-  &&((long)pTotaldegree(monomexpr)> (currRing->bitmask / (long)pTotaldegree(p))))
-  {
-    Werror("OVERFLOW in subst, max exponent is %ld",currRing->bitmask);
-    return TRUE;
-  }
   if (ringvar>0)
   {
+    if ((monomexpr!=NULL)
+    &&((long)pTotaldegree(monomexpr)> (currRing->bitmask / (long)pTotaldegree(p))))
+    {
+      Werror("OVERFLOW in subst, max exponent is %ld",currRing->bitmask);
+      return TRUE;
+    }
     if ((monomexpr==NULL)||(pNext(monomexpr)==NULL))
       res->data = pSubst((poly)u->CopyD(res->rtyp),ringvar,monomexpr);
@@ -8601 +8601 @@
       {
         int r=res->rtyp=dArith1[i].res;
-        if (currRing!=NULL)
-        {
+        if (currRing!=NULL)
+        {
           #ifdef HAVE_PLURAL
           if ((currRing!=NULL) && (rIsPluralRing(currRing)))
@@ -8629 +8629 @@
           }
           #endif
-        }
+        }
         if (r<0)
         {
@@ -8800 +8800 @@
         res->rtyp=dArith3[i].res;
         if (currRing!=NULL)
-        {
+        {
           #ifdef HAVE_PLURAL
           if (rIsPluralRing(currRing))
@@ -8827 +8827 @@
           }
           #endif
-        }
+        }
         if ((call_failed=dArith3[i].p(res,a,b,c)))
         {
@@ -9043 +9043 @@
       {
         res->rtyp=dArithM[i].res;
-        if (currRing!=NULL)
-        {
+        if (currRing!=NULL)
+        {
           #ifdef HAVE_PLURAL
           if (rIsPluralRing(currRing))
@@ -9071 +9071 @@
           }
           #endif
-        }
+        }
         if (dArithM[i].p(res,a))
         {