Changeset 3907ab in git

Timestamp:

Jan 9, 2014, 11:42:53 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

453510f6a321819066be0f51b5747f45bece4d95

Parents:

eac92ace25b62dbecbfbd8d6d2f2e07f8c63ded4

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-01-09 11:42:53+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-01-09 11:44:20+01:00

Message:

simplifyed rindep. tests

Location:

Singular

Files:

• iplib.cc (modified) (2 diffs)
• subexpr.cc (modified) (1 diff)

Singular/iplib.cc

@@ -568 +568 @@
     if (currRing!=NULL)
     {
-      if (((iiRETURNEXPR.Typ()>BEGIN_RING)
-        && (iiRETURNEXPR.Typ()<END_RING))
-      || ((iiRETURNEXPR.Typ()==LIST_CMD)
-        && (lRingDependend((lists)iiRETURNEXPR.Data()))))
+      if (iiRETURNEXPR.RingDependend())
       {
         //idhdl hn;
@@ -611 +608 @@
     //Print(" curr:%s\n",IDID(currRingHdl));
     //Print("pr:%x, curr: %x\n",procstack->cRing,currRing);
-    if (((iiRETURNEXPR.Typ()>BEGIN_RING)
-      && (iiRETURNEXPR.Typ()<END_RING))
-    || ((iiRETURNEXPR.Typ()==LIST_CMD)
-      && (lRingDependend((lists)iiRETURNEXPR.Data()))))
+    if (iiRETURNEXPR.RingDependend())
     {
       //idhdl hn;

Singular/subexpr.cc

@@ -382 +382 @@
   if (rt==LIST_CMD)
     return lRingDependend((lists)Data());
+  if (this->next!=NULL)
+    return this->next->RingDependend();
   return FALSE;
 }