Changeset 7f581e in git

Timestamp:

Apr 20, 2011, 4:40:43 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

c47547d6e52a72fa99fb925244f037994d2ee996

Parents:

a088a124beb3fcae063eb326f03ad572927bd5b8

Message:

add access to rings of newstruct members: r_ prefix

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

File:

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

Singular/newstruct.cc

@@ -33 +33 @@
   else
   {
-    newstruct_desc ad=(newstruct_desc)b->data;
+    newstruct_desc ad=(newstruct_desc)(b->data);
     lists l=(lists)d;
     newstruct_member a=ad->member;
@@ -172 +172 @@
       if (a2->name!=NULL)
       {
+        BOOLEAN search_ring=FALSE;
         newstruct_member nm=nt->member;
         while ((nm!=NULL)&&(strcmp(nm->name,a2->name)!=0)) nm=nm->next;
+        if ((nm==NULL) && (strncmp(a2->name,"r_",2)==0))
+        {
+          nm=nt->member;
+          while ((nm!=NULL)&&(strcmp(nm->name,a2->name+2)!=0)) nm=nm->next;
+          if ((nm!=NULL)&&(RingDependend(nm->typ)))
+            search_ring=TRUE;
+          else
+            nm=NULL;
+        }
         if (nm==NULL)
         {
@@ -179 +189 @@
           return TRUE;
         }
-        if (RingDependend(nm->typ))
+        if (search_ring)
+        {
+          ring r;
+          res->rtyp=RING_CMD;
+          res->data=al->m[nm->pos-1].data;
+          r=(ring)res->data;
+          if (r==NULL) { res->data=(void *)currRing; r=currRing; }
+          if (r!=NULL) r->ref++;
+          else Werror("ring of this member is not set and no basering found");
+          return r==NULL;
+        }
+        else if (RingDependend(nm->typ))
         {
           if (al->m[nm->pos].data==NULL)