Changeset 6c22988 in git for Singular/attrib.cc

Timestamp:

Mar 7, 2011, 6:09:06 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e6d9a323c902660e10dd19e2d01e633460b3a37e

Parents:

052f0bdbb64b60e46cee19530fc0f76d8e9042da

Message:

fix tr. 318

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

File:

• Singular/attrib.cc (modified) (6 diffs)

Singular/attrib.cc

@@ -198 +198 @@
         idhdl h=(idhdl)root->data;
         h->attribute=h->attribute->set(name,data,typ);
-        root->attribute=h->attribute;
+        //??// root->attribute=h->attribute;
       }
       else
@@ -258 +258 @@
   leftv v=a;
   int t;
+  attr at;
   if (a->e!=NULL)
   {
@@ -263 +264 @@
     if (v==NULL) return TRUE;
   }
-  attr at=v->attribute;
+  at=v->attribute;
+  if ((a->rtyp==IDHDL)&&(a->e==NULL))
+  {
+    at=IDATTR((idhdl)v->data);
+  }
   BOOLEAN haveNoAttribute=TRUE;
   if (hasFlag(v,FLAG_STD))
@@ -325 +330 @@
   else
   {
-    attr at=v->attribute->get(name);
+    attr at;
+    if (v->rtyp==IDHDL)
+      at=IDATTR((idhdl)v->data);
+    else
+      at=v->attribute->get(name);
     if (at!=NULL)
     {
@@ -350 +359 @@
     h=NULL;
   }
+  if (a->rtyp!=IDHDL) h=NULL;
+
   attr *at=&(v->attribute);
+  if (h!=NULL) at=&(IDATTR(h));
   char *name=(char *)b->Data();
   if (strcmp(name,"isSB")==0)
@@ -420 +432 @@
   {
     int typ=c->Typ();
-    atSet(v,omStrDup(name),c->CopyD(typ),typ/*c->T(yp()*/);
-    if (h!=NULL) IDATTR(h)=v->attribute;
+    if (h!=NULL) atSet(h,omStrDup(name),c->CopyD(typ),typ/*c->T(yp()*/);
+    else         atSet(v,omStrDup(name),c->CopyD(typ),typ/*c->T(yp()*/);
   }
   return FALSE;