Changeset fa50209 in git

Timestamp:

Mar 10, 2014, 5:52:19 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

6b86f1c9b9ee948262dff876f5ec6f86992b4b33ab12db732777fc9ca1f9734d184c7e9d38ea9784

Parents:

91dd8a5ef5bb06f9f51df16f59786c2ff90de8ca

Message:

fix: attribute for newstruct (tr.585)

File:

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

Singular/subexpr.cc

@@ -1297 +1297 @@
   if (e==NULL) return &attribute;
   if ((rtyp==LIST_CMD)
-  ||((rtyp==IDHDL)&&(IDTYP((idhdl)data)==LIST_CMD)))
+  ||((rtyp==IDHDL)&&(IDTYP((idhdl)data)==LIST_CMD))
+  || (rtyp>MAX_TOK)
+  || ((rtyp==IDHDL)&&(IDTYP((idhdl)data)>MAX_TOK)))
   {
     leftv v=LData();
@@ -1310 +1312 @@
   {
     lists l=NULL;
-
-    if (rtyp==LIST_CMD)
+    blackbox *b=getBlackboxStuff(rtyp);
+
+    if ((rtyp==LIST_CMD)
+    || ((b!=NULL)&&(BB_LIKE_LIST(b))))
       l=(lists)data;
     else if ((rtyp==IDHDL)&& (IDTYP((idhdl)data)==LIST_CMD))
       l=IDLIST((idhdl)data);
+    else if ((rtyp==IDHDL)&& (IDTYP((idhdl)data)>MAX_TOK))
+    {
+      b=getBlackboxStuff(IDTYP((idhdl)data));
+      if (BB_LIKE_LIST(b)) l=IDLIST((idhdl)data);
+    }
     else if (rtyp==ALIAS_CMD)
     {