Changeset 4cbe5d in git for Singular/ring.cc

Timestamp:

Feb 8, 2001, 1:55:52 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d609e144b7d60f81b025159808b83332ba77c8c3

Parents:

6dc21ddd084cffca4919c928d38ed7296e218e1c

Message:

*hannes: bug 23


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

File:

• Singular/ring.cc (modified) (5 diffs)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.158 2001-01-31 19:08:26 Singular Exp $ */
+/* $Id: ring.cc,v 1.159 2001-02-08 12:55:52 Singular Exp $ */
 
 /*
@@ -125 +125 @@
 
   // clean up history
-    if (((sLastPrinted.rtyp>BEGIN_RING) && (sLastPrinted.rtyp<END_RING))
-        || ((sLastPrinted.rtyp==LIST_CMD)&&(lRingDependend((lists)sLastPrinted.data))))
-    {
-      sLastPrinted.CleanUp();
-      memset(&sLastPrinted,0,sizeof(sleftv));
-    }
+  if (sLastPrinted.RingDependend())
+  {
+    sLastPrinted.CleanUp();
+    memset(&sLastPrinted,0,sizeof(sleftv));
+  }
 
    /*------------ change the global ring -----------------------*/
@@ -145 +144 @@
 
   if (ppNoether!=NULL) pDelete(&ppNoether);
-  if (((sLastPrinted.rtyp>BEGIN_RING) && (sLastPrinted.rtyp<END_RING)) ||
-      ((sLastPrinted.rtyp==LIST_CMD)&&(lRingDependend((lists)sLastPrinted.data))))
-
+  if (sLastPrinted.RingDependend())
   {
     sLastPrinted.CleanUp();
@@ -596 +593 @@
     R->float_len = SHORT_REAL_LENGTH;
     R->float_len2 = SHORT_REAL_LENGTH;
-  }  
+  }
 
   /* names and number of variables-------------------------------------*/
@@ -876 +873 @@
       }
       if (ppNoether!=NULL) pDelete(&ppNoether);
-      if (((sLastPrinted.rtyp>BEGIN_RING) && (sLastPrinted.rtyp<END_RING)) ||
-          ((sLastPrinted.rtyp==LIST_CMD)&&(lRingDependend((lists)sLastPrinted.data))))
+      if (sLastPrinted.RingDependend())
       {
         sLastPrinted.CleanUp();
         memset(&sLastPrinted,0,sizeof(sleftv));
+      }
+      if ((myynest>0) && (iiRETURNEXPR[myynest].RingDependend()))
+      {
+        WerrorS("return value depends on local ring variable (export missing ?)");
+        iiRETURNEXPR[myynest].CleanUp();
       }
       currRing=NULL;