Changeset 13e2da in git

Timestamp:

May 23, 1997, 5:00:03 PM (26 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f4e7560a91d98a1109351a6fd0f38752bab73b09

Parents:

98d771101d480909901201f82772865c6c6b5046

Message:

* hannes: list elements coming from expr-list could not have attributes
  (ipassign.cc subexpr.cc)


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

Location:

Singular

Files:

• ipassign.cc (modified) (2 diffs)
• subexpr.cc (modified) (5 diffs)

Singular/ipassign.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipassign.cc,v 1.10 1997-05-02 15:10:14 Singular Exp $ */
+/* $Id: ipassign.cc,v 1.11 1997-05-23 15:00:01 Singular Exp $ */
 
 /*
@@ -740 +740 @@
       return TRUE;
     }
-    if ((rt==RING_CMD)||(rt==QRING_CMD))
-    {
-      L->m[i].rtyp=rt;
-      L->m[i].data=h->Data();
-      ((ring)L->m[i].data)->ref++;
-    }
-    else
+    //if ((rt==RING_CMD)||(rt==QRING_CMD))
+    //{
+    //  L->m[i].rtyp=rt;
+    //  L->m[i].data=h->Data();
+    //  ((ring)L->m[i].data)->ref++;
+    //}
+    //else
       L->m[i].Copy(h);
   }

Singular/subexpr.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: subexpr.cc,v 1.17 1997-05-18 11:13:15 Singular Exp $ */
+/* $Id: subexpr.cc,v 1.18 1997-05-23 15:00:03 Singular Exp $ */
 
 /*
@@ -488 +488 @@
   }
   flag=source->flag;
-  if (source->attribute!=NULL)
-    attribute=source->attribute->Copy();
+  if ((source->attribute!=NULL)||(source->e!=NULL))
+    attribute=source->CopyA();
   if (source->next!=NULL)
   {
@@ -555 +555 @@
     case LINK_CMD:
       return (void *)slCopy((si_link) d);
+    case RING_CMD:
+    case QRING_CMD:
+      {
+        ring r=(ring)d;
+        r->ref++;
+        return d;
+      }
     case 0:
     case DEF_CMD:
       break;
 #ifdef TEST
-    //case RING_CMD:
-    //case QRING_CMD:
     //case COMMAND:
     default:
@@ -583 +588 @@
 attr sleftv::CopyA()
 {
-  if ((rtyp!=IDHDL)&&(e==NULL))
-  {
-    attr x=attribute;
-    attribute=NULL;
-    return x;
-  }
-  if (attribute==NULL)
-    return NULL;
-  return attribute->Copy();
+  attr *a=Attribute();
+  if (a!=NULL)
+    return (*a)->Copy();
+  return NULL;  
 }
 
@@ -944 +944 @@
 {
   if (e==NULL) return &attribute;
-  if (Typ()==LIST_CMD)
+  if ((rtyp==LIST_CMD)
+  ||((rtyp==IDHDL)&&(IDTYP((idhdl)data)==LIST_CMD)))
   {
     leftv v=LData();