Changeset 089afd in git

Timestamp:

May 2, 2017, 4:05:11 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

f83db0432a74ad9928bc10d7958fa9a0201f0438

Parents:

e9098241b85debda13f26364cd87c4c04598ccec

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-05-02 16:05:11+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-05-02 17:08:51+02:00

Message:

fix: newstruct::'.' for graal.lib

File:

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

Singular/newstruct.cc

@@ -396 +396 @@
             {
               //Print("checking ring at pos %d for dat at pos %d\n",nm->pos-1,nm->pos);
+              #if 0
               if ((al->m[nm->pos-1].data!=(void *)currRing)
               &&(al->m[nm->pos-1].data!=(void*)0L))
@@ -411 +412 @@
                 return TRUE;
               }
+              #endif
             }
-            if ((currRing!=NULL)&&(al->m[nm->pos-1].data==NULL))
+            if(al->m[nm->pos-1].data!=NULL)
             {
-              // remember the ring, if not already set
-              al->m[nm->pos-1].data=(void *)currRing;
-              al->m[nm->pos-1].rtyp=RING_CMD;
-              currRing->ref++;
+              ring old=(ring)al->m[nm->pos-1].data;
+              old->ref--;
             }
+            // remember the ring, if not already set
+            al->m[nm->pos-1].data=(void *)currRing;
+            al->m[nm->pos-1].rtyp=RING_CMD;
+            if (currRing!=NULL)  currRing->ref++;
           }
           else if ((nm->typ==DEF_CMD)||(nm->typ==LIST_CMD))
           {
-            if (al->m[nm->pos-1].data==NULL)
+            if(al->m[nm->pos-1].data!=NULL)
             {
-              al->m[nm->pos-1].data=(void*)currRing;
-              if (currRing!=NULL) currRing->ref++;
+              ring old=(ring)al->m[nm->pos-1].data;
+              old->ref--;
             }
+            al->m[nm->pos-1].data=(void*)currRing;
+            if (currRing!=NULL) currRing->ref++;
           }
           Subexpr r=(Subexpr)omAlloc0Bin(sSubexpr_bin);