Changeset a20c03 in git

Timestamp:

May 5, 2014, 4:39:43 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

b743d90a6fd61ebb75fd6c95d5fa9eeb54ecc38e

Parents:

8e326a9a1677ad827e4eec80d61205c222a3ef7a

Message:

fix: ssi attribute p1

File:

• Singular/links/ssiLink.cc (modified) (4 diffs)

Singular/links/ssiLink.cc

@@ -787 +787 @@
 {
   ssiInfo *d=(ssiInfo*)l->data;
+  BITSET fl=(BITSET)s_readint(d->f_read);
+  int nr_of_attr=s_readint(d->f_read);
+  if (nr_of_attr>0)
+  {
+    for(int i=1;i<nr_of_attr;i++)
+    {
+    }
+  }
   leftv tmp=ssiRead1(l);
   memcpy(res,tmp,sizeof(sleftv));
   memset(tmp,0,sizeof(sleftv));
   omFreeSize(tmp,sizeof(sleftv));
-  BITSET fl=(BITSET)s_readint(d->f_read);
-  int nr_of_attr=s_readint(d->f_read);
   if (nr_of_attr>0)
   {
-    for(int i=1;i<nr_of_attr;i++)
-    {
-    }
   }
   res->flag=fl;
@@ -1432 +1435 @@
     void *dd=data->Data();
     attr *aa=data->Attribute();
+    BOOLEAN with_attr=FALSE;
     if (((*aa)!=NULL)||(data->flag!=0))
     {
-      fprintf(d->f_write,"21 %d ",data->flag);
+      attr a=*aa;
+      int n=0;
+      while(a!=NULL) { n++; a=a->next;}
+      fprintf(d->f_write,"21 %d %d ",data->flag,n);
+      a=*aa;
     }
     if ((dd==NULL) && (data->name!=NULL) && (tt==0)) tt=DEF_CMD;
@@ -1534 +1542 @@
             break;
     }
-    if (((*aa)!=NULL)||(data->flag!=0))
-    {
-      attr a=*aa;
-      int n=0;
-      while(a!=NULL) { n++; a=a->next;}
-      fprintf(d->f_write,"%d ",n);
-      a=*aa;
-    }
     if (d->level<=1) { fputc('\n',d->f_write); fflush(d->f_write); }
     data=data->next;
@@ -2112 +2112 @@
 // 19 bigintmat <r> <c> ...
 // 20 blackbox <name> 1 <len> ...
-// 21 attrib <bit-attribs> <data> <len> <a-name1> <val1>...
+// 21 attrib <bit-attrib> <len> <a-name1> <val1>... <data>
 //
 // 98: verify version: <ssi-version> <MAX_TOK> <OPT1> <OPT2>