Changeset 69d7df in git

Timestamp:

Nov 15, 2013, 4:06:00 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

c6f0451f6fc744c2dac1401c4d9346c784f6b28b

Parents:

4b5171ff486c46e0d3f30c8810fc2bb7ebd00157

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-15 16:06:00+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-15 16:06:45+01:00

Message:

fix: handling of potential ring-dep objects (def,list) in newstruct

File:

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

Singular/newstruct.cc

@@ -128 +128 @@
   for(;n>=0;n--)
   {
-    if (RingDependend(L->m[n].rtyp))
+    if (RingDependend(L->m[n].rtyp)
+    ||((L->m[n].rtyp==LIST_CMD)&&lRingDependend((lists)L->m[n].data)))
     {
       assume((L->m[n-1].rtyp==RING_CMD) || (L->m[n-1].data==NULL));
@@ -368 +369 @@
             return r==NULL;
           }
-          else if (RingDependend(nm->typ))
+          else if (RingDependend(nm->typ)
+          || (al->m[nm->pos].RingDependend()))
           {
             if (al->m[nm->pos].data==NULL)
@@ -400 +402 @@
             }
           }
+          else if ((nm->typ==DEF_CMD)||(nm->typ==LIST_CMD))
+          {
+            if (al->m[nm->pos-1].data==NULL)
+            {
+              al->m[nm->pos-1].data=(void*)currRing;
+              if (currRing!=NULL) currRing->ref++;
+            }
+          }
           Subexpr r=(Subexpr)omAlloc0Bin(sSubexpr_bin);
           r->start = nm->pos+1;
@@ -516 +526 @@
   {
     l->m[nm->pos].rtyp=nm->typ;
-    if (RingDependend(nm->typ))
+    if (RingDependend(nm->typ) ||(nm->typ==DEF_CMD)||(nm->typ==LIST_CMD))
       l->m[nm->pos-1].rtyp=RING_CMD;
     l->m[nm->pos].data=idrecDataInit(nm->typ);
@@ -667 +677 @@
       return NULL;
     }
-    if (RingDependend(t))
+    if (RingDependend(t) || (t==DEF_CMD)||(t==LIST_CMD))
       res->size++;    // one additional field for the ring (before the data)
     //Print("found type %s at real-pos %d",start,res->size);
@@ -708 +718 @@
   currRingHdl=save_ring;
   //Print("new type with %d elements\n",res->size);
+  //newstructShow(res);
   return res;
 error_in_newstruct_def:
@@ -757 +768 @@
   {
     Print(">>%s<< at pos %d, type %d (%s)\n",elem->name,elem->pos,elem->typ,Tok2Cmdname(elem->typ));
-    if (RingDependend(elem->typ))
+    if (RingDependend(elem->typ)|| (elem->typ==DEF_CMD) ||(elem->typ==LIST_CMD))
       Print(">>r_%s<< at pos %d, shadow ring\n",elem->name,elem->pos-1);
     elem=elem->next;