Ticket #13145: 13145.patch

sage/libs/singular/ring.pxd

@@ -53 +53 @@
 
 # carefully delete a ring once its refcount is zero
 cdef void singular_ring_delete(ring *doomed)
+
+# Used internally for reference counting
+cdef wrap_ring(ring* R)

sage/libs/singular/ring.pyx

@@ -586 +586 @@
     """
     cdef size_t addr = <size_t>currRing
     print "DEBUG: currRing == "+str(hex(addr))
+
+def currRing_wrapper():
+    """
+    Returns a wrapper for the current ring, for use in debugging ring_refcount_dict.
+
+    EXAMPLES::
+
+        sage: from sage.libs.singular.ring import currRing_wrapper
+        sage: currRing_wrapper()
+        The ring pointer ...
+    """
+    return wrap_ring(currRing)

sage/rings/polynomial/plural.pyx

@@ -111 +111 @@
 from sage.structure.parent_gens cimport ParentWithGens
 
 # singular rings
-from sage.libs.singular.ring cimport singular_ring_new, singular_ring_delete
+from sage.libs.singular.ring cimport singular_ring_new, singular_ring_delete, wrap_ring
+import sage.libs.singular.ring
 
 from sage.rings.integer cimport Integer
 from sage.structure.element cimport Element, ModuleElement
@@ -2705 +2706 @@
         sage: R = new_CRing(W, H.base_ring())
         sage: R # indirect doctest
         Multivariate Polynomial Ring in x, y, z over Rational Field
+
+    Check that #13145 has been resolved::
+
+        sage: h = hash(R.gen() + 1) # sets currRing
+        sage: from sage.libs.singular.ring import ring_refcount_dict, currRing_wrapper
+        sage: curcnt = ring_refcount_dict[currRing_wrapper()]
+        sage: newR = new_CRing(W, H.base_ring())
+        sage: ring_refcount_dict[currRing_wrapper()] - curcnt
+        1
     """
     assert( rw.is_commutative() )
        
     cdef MPolynomialRing_libsingular self = <MPolynomialRing_libsingular>PY_NEW(MPolynomialRing_libsingular)
         
     self._ring = rw._ring
+
+    wrapped_ring = wrap_ring(self._ring)
+    cur_refcnt = sage.libs.singular.ring.ring_refcount_dict.get(wrapped_ring, 0)
+    sage.libs.singular.ring.ring_refcount_dict[wrapped_ring] = cur_refcnt + 1
+
     self._ring.ShortOut = 0
         
     self.__ngens = rw.ngens()
@@ -2773 +2788 @@
     
     cdef NCPolynomialRing_plural self = <NCPolynomialRing_plural>PY_NEW(NCPolynomialRing_plural)
     self._ring = rw._ring
+
+    wrapped_ring = wrap_ring(self._ring)
+    cur_refcnt = sage.libs.singular.ring.ring_refcount_dict.get(wrapped_ring, 0)
+    sage.libs.singular.ring.ring_refcount_dict[wrapped_ring] = cur_refcnt + 1
+
     self._ring.ShortOut = 0
         
     self.__ngens = rw.ngens()