Changeset 8b1af6 in git for Singular/links/ssiLink.cc

Timestamp:

Nov 6, 2013, 2:30:52 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

93fc820b11e13b03357f9d05061a1954e37d658c

Parents:

75761633171290fa9ee90c7fc19a9d9bfba3534911ab4e8595e6e90a6b646949f46d516f88a72015

Message:

Merge pull request #389 from jankoboehm/spielwiese

Gerhards fix for zeroRad und some typos

File:

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

Singular/links/ssiLink.cc

@@ -154 +154 @@
     {
       #if SIZEOF_LONG == 4
-      fprintf(d->f_write,"4 %ld ",((LONG)SR_TO_INT(n)));
+      fprintf(d->f_write,"4 %ld ",SR_TO_INT(n));
       #else
       long nn=SR_TO_INT(n);
       if ((nn<POW_2_28)||(nn>= -POW_2_28))
-        fprintf(d->f_write,"4 %ld ",((LONG)nn));
+        fprintf(d->f_write,"4 %ld ",nn);
       else
       {
@@ -200 +200 @@
   if (d->r!=NULL) rKill(d->r);
   d->r=r;
-  d->r->ref++;
-  fprintf(d->f_write,"%d %d ",n_GetChar(r->cf),r->N);
-
-  int i;
-  for(i=0;i<r->N;i++)
-  {
-    fprintf(d->f_write,"%d %s ",(int)strlen(r->names[i]),r->names[i]);
-  }
-  /* number of orderings:*/
-  i=0;
-  while (r->order[i]!=0) i++;
-  fprintf(d->f_write,"%d ",i);
-  /* each ordering block: */
-  i=0;
-  while(r->order[i]!=0)
-  {
-    fprintf(d->f_write,"%d %d %d ",r->order[i],r->block0[i], r->block1[i]);
-    switch(r->order[i])
-    {
-      case ringorder_a:
-      case ringorder_wp:
-      case ringorder_Wp:
-      case ringorder_ws:
-      case ringorder_Ws:
-      case ringorder_aa:
-      {
-        int ii;
-        for(ii=r->block0[i];ii<=r->block1[i];ii++)
-          fprintf(d->f_write,"%d ",r->wvhdl[i][ii-r->block0[i]]);
-      }
-      break;
-
-      case ringorder_a64:
-      case ringorder_M:
-      case ringorder_L:
-      case ringorder_IS:
-        Werror("ring oder not implemented for ssi:%d",r->order[i]);
+  if (r!=NULL)
+  {
+    /*d->*/r->ref++;
+    fprintf(d->f_write,"%d %d ",n_GetChar(r->cf),r->N);
+
+    int i;
+    for(i=0;i<r->N;i++)
+    {
+      fprintf(d->f_write,"%d %s ",(int)strlen(r->names[i]),r->names[i]);
+    }
+    /* number of orderings:*/
+    i=0;
+    // remember dummy ring: everything 0:
+    if (r->order!=NULL) while (r->order[i]!=0) i++;
+    fprintf(d->f_write,"%d ",i);
+    /* each ordering block: */
+    i=0;
+    if (r->order!=NULL) while(r->order[i]!=0)
+    {
+      fprintf(d->f_write,"%d %d %d ",r->order[i],r->block0[i], r->block1[i]);
+      switch(r->order[i])
+      {
+        case ringorder_a:
+        case ringorder_wp:
+        case ringorder_Wp:
+        case ringorder_ws:
+        case ringorder_Ws:
+        case ringorder_aa:
+        {
+          int ii;
+          for(ii=r->block0[i];ii<=r->block1[i];ii++)
+            fprintf(d->f_write,"%d ",r->wvhdl[i][ii-r->block0[i]]);
+        }
         break;
 
-      default: break;
-    }
-    i++;
+        case ringorder_a64:
+        case ringorder_M:
+        case ringorder_L:
+        case ringorder_IS:
+          Werror("ring oder not implemented for ssi:%d",r->order[i]);
+          break;
+
+        default: break;
+      }
+      i++;
+    }
+  }
+  else /* dummy ring r==NULL*/
+  {
+    fprintf(d->f_write,"0 0 0 "/*,r->ch,r->N, blocks*/);
   }
 }
@@ -478 +486 @@
   ch=s_readint(d->f_read);
   N=s_readint(d->f_read);
-  names=(char**)omAlloc(N*sizeof(char*));
-  for(i=0;i<N;i++)
-  {
-    names[i]=ssiReadString(d);
+  if (N!=0)
+  {
+    names=(char**)omAlloc(N*sizeof(char*));
+    for(i=0;i<N;i++)
+    {
+      names[i]=ssiReadString(d);
+    }
   }
   // read the orderings:
@@ -521 +532 @@
     }
   }
+  if (N==0)
+  {
+    omFree(ord);
+    omFree(block0);
+    omFree(block1);
+    omFree(wvhdl);
+    return NULL;
+  }
+  else return rDefault(ch,N,names,num_ord,ord,block0,block1,wvhdl);
+
   return rDefault(ch,N,names,num_ord,ord,block0,block1,wvhdl);
 }
@@ -1180 +1201 @@
     case 5:{
              d->r=ssiReadRing(d);
-             d->r->ref++;
              res->rtyp=RING_CMD;
              res->data=(char*)d->r;
              // we are in the top-level, so set the basering to d->r:
-             ssiSetCurrRing(d->r);
+             if (d->r!=NULL)
+             {
+               d->r->ref++;
+               ssiSetCurrRing(d->r);
+             }
              if (t==15) return ssiRead1(l);
            }