Changeset 5e147a in git

Timestamp:

Feb 17, 2011, 2:55:39 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

a34b097e6dd0af4d8de284923aa311ba5575c32c

Parents:

4a9db3308f70e3c7475877b8e3aa0ec3417427c4

Message:

handling of ring dep. stuff and nested stuff

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

File:

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

Singular/newstruct.cc

@@ -68 +68 @@
   for(;n>=0;n--)
   {
-    if (RingDependend(L->m[n].rtyp)
-    && (L->m[n].data!=NULL))
-    {
-      assume(L->m[n-1].rtyp==RING_CMD);
-      if((L->m[n-1].data!=NULL)&&(L->m[n-1].data!=(void*)currRing))
-        rChangeCurrRing((ring)(L->m[n-1].data));
-      N->m[n].Copy(&L->m[n]);
+    if (RingDependend(L->m[n].rtyp))
+    {
+      assume((L->m[n-1].rtyp==RING_CMD) || (L->m[n-1].data==NULL));
+      if(L->m[n-1].data!=NULL)
+      {
+        if (L->m[n-1].data!=(void*)currRing)
+          rChangeCurrRing((ring)(L->m[n-1].data));
+        N->m[n].Copy(&L->m[n]);
+      }
+      else
+      {
+        N->m[n].rtyp=L->m[n].rtyp;
+        N->m[n].data=idrecDataInit(L->m[n].rtyp);
+      }
+    }
+    else if((L->m[n].rtyp>MAX_TOK)||(L->m[n].rtyp==LIST_CMD))
+    {
+      N->m[n].rtyp=L->m[n].rtyp;
+      N->m[n].data=(void *)lCopy_newstruct((lists)(L->m[n].data));
     }
     else
@@ -141 +153 @@
         {
           if (al->m[nm->pos].data==NULL)
-          {
-            // NULL belongs to any ring
-            ring r=(ring)al->m[nm->pos-1].data;
-            if (r!=NULL)
-            {
-              r->ref--;
-              al->m[nm->pos-1].data=NULL;
-              al->m[nm->pos-1].rtyp=DEF_CMD;
-            }
-          }
+          {
+            // NULL belongs to any ring
+            ring r=(ring)al->m[nm->pos-1].data;
+            if (r!=NULL)
+            {
+              r->ref--;
+              al->m[nm->pos-1].data=NULL;
+              al->m[nm->pos-1].rtyp=DEF_CMD;
+            }
+          }
           else
           {
@@ -162 +174 @@
           }
           if ((currRing!=NULL)&&(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++;
-          }
+          {
+            // 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++;
+          }
         }
         Subexpr r=(Subexpr)omAlloc0Bin(sSubexpr_bin);
@@ -248 +260 @@
       Werror("type change in member %s (%s(%d) -> %s(%d))",nm->name,
           Tok2Cmdname(nm->typ),nm->typ,
-          Tok2Cmdname(l->m[nm->pos].rtyp),l->m[nm->pos].rtyp);
+          Tok2Cmdname(l->m[nm->pos].rtyp),l->m[nm->pos].rtyp);
       return TRUE;
     }