Changeset bd4cb92 in git for Singular/ring.cc

Timestamp:

Sep 25, 2001, 6:07:36 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f9e5f6018b5774f65b2ad5e048943ebb12b381dd

Parents:

765fa32efdbc7e0082d76f9bc8e5976cb3235115

Message:

* hannes: HAVE_NS port, optimizations (MAkefile order) etc.


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

File:

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

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.169 2001-08-27 14:47:37 Singular Exp $ */
+/* $Id: ring.cc,v 1.170 2001-09-25 16:07:32 Singular Exp $ */
 
 /*
@@ -903 +903 @@
       }
     }
-#else /* USE_IILOCALRING */
-    {
-      namehdl nshdl = namespaceroot;
-
-      for(nshdl=namespaceroot; nshdl->isroot != TRUE; nshdl = nshdl->next) {
-        //Print("NSstack: %s:%d, nesting=%d\n", nshdl->name, nshdl->lev, nshdl->myynest);
+// #else /* USE_IILOCALRING */
+#endif /* USE_IILOCALRING */
+    {
+      proclevel * nshdl = procstack;
+      int lev=myynest-1;
+
+      for(; nshdl != NULL; nshdl = nshdl->next)
+      {
         if (nshdl->currRing==r)
         {
-          if (nshdl->myynest<myynest)
-//            Warn("killing the basering for level %d/%d",nshdl->lev,nshdl->myynest);
-          Warn("killing the basering for level %d",nshdl->myynest);
+          Warn("killing the basering for level %d",lev);
           nshdl->currRing=NULL;
-        }
-      }
-      if (nshdl->currRing==r)
-      {
-        //Print("NSstack: %s:%d, nesting=%d\n", nshdl->name, nshdl->lev, nshdl->myynest);
-        if (nshdl->myynest<myynest)
-//          Warn("killing the basering for level %d/%d",nshdl->lev,nshdl->myynest);
-          Warn("killing the basering for level %d",nshdl->myynest);
-        nshdl->currRing=NULL;
-      }
-    }
-#endif /* USE_IILOCALRING */
+          nshdl->currRingHdl=NULL;
+        }
+      }
+    }
+//#endif /* USE_IILOCALRING */
 
     rDelete(r);