Changeset 8c94ba in git

Timestamp:

Mar 4, 2011, 5:36:10 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f879c970de289aab8f2db926f544e08fa94402ac

Parents:

2993b20aa873e3b3bca98f8c038825f3e2a88c38

Message:

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

File:

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

Singular/subexpr.cc

@@ -272 +272 @@
       store->rtyp=t/*Typ()*/;
       store->data=CopyD();
-      if(e!=NULL)
-      {
-        if(attribute!=NULL)
-        {
-          store->attribute=attribute->Copy();
-        }
-        store->flag=flag;
-      }
-      //else
-      //{
-      //}
+      if(attribute!=NULL)
+      {
+        store->attribute=CopyA();
+      }
+      store->flag=flag;
     }
   }
@@ -561 +555 @@
   {
     data=s_internalCopy(rtyp,d);
-    if(source->e==NULL)
-    {
-      if (source->attribute!=NULL)
-        attribute=source->attribute->Copy();
-      flag=source->flag;
-    }
-    //else
-    //{
-    //}
+    if ((source->attribute!=NULL)||(source->e!=NULL))
+      attribute=source->CopyA();
+    flag=source->flag;
     if (source->next!=NULL)
     {
@@ -607 +595 @@
 //}
 
-//attr sleftv::CopyA()
-//{
-//  attr *a=Attribute();
-//  if ((a!=NULL) && (*a!=NULL))
-//    return (*a)->Copy();
-//  return NULL;
-//}
+attr sleftv::CopyA()
+{
+  attr *a=Attribute();
+  if ((a!=NULL) && (*a!=NULL))
+    return (*a)->Copy();
+  return NULL;
+}
 
 char *  sleftv::String(void *d, BOOLEAN typed, int dim)
@@ -1178 +1166 @@
 attr * sleftv::Attribute()
 {
-  if (e==NULL) 
-  {
-    if (rtyp==IDHDL) return(&(IDATTR((idhdl)data)));
-    return &attribute;
-  }
+  if (e==NULL) return &attribute;
   if ((rtyp==LIST_CMD)
   ||((rtyp==IDHDL)&&(IDTYP((idhdl)data)==LIST_CMD)))