Changeset 100d46 in git

Timestamp:

Nov 27, 2019, 4:06:25 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

7e7b871c73fe6f32a07cefc5f672966d8c3e041f

Parents:

4194e68d828022d1b19f9cdeda232a1f5d5b2f77

Message:

fix: check currRing for ssi-read

File:

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

Singular/links/ssiLink.cc

@@ -107 +107 @@
     currRing->ref++;
     return TRUE;
+  }
+}
+void ssiCheckCurrRing(const ring r)
+{
+  if (r!=currRing)
+  {
+    char name[20];
+    int nr=0;
+    idhdl h=NULL;
+    loop
+    {
+      sprintf(name,"ssiRing%d",nr); nr++;
+      h=IDROOT->get(name, 0);
+      if (h==NULL)
+      {
+        h=enterid(name,0,RING_CMD,&IDROOT,FALSE);
+        IDRING(h)=r;
+        r->ref=2; /*d->r and h */
+        break;
+      }
+      else if ((IDTYP(h)==RING_CMD)
+      && (rEqual(r,IDRING(h),1)))
+      {
+        break;
+      }
+    }
+    rSetHdl(h);
   }
 }
@@ -1343 +1370 @@
            break;
     case 3:res->rtyp=NUMBER_CMD;
+           if (d->r==NULL) goto no_ring;
+           ssiCheckCurrRing(d->r);
            res->data=(char *)ssiReadNumber(d);
            break;
@@ -1365 +1394 @@
     case 6:res->rtyp=POLY_CMD;
            if (d->r==NULL) goto no_ring;
+           ssiCheckCurrRing(d->r);
            res->data=(char*)ssiReadPoly(d);
            break;
     case 7:res->rtyp=IDEAL_CMD;
            if (d->r==NULL) goto no_ring;
+           ssiCheckCurrRing(d->r);
            res->data=(char*)ssiReadIdeal(d);
            break;
     case 8:res->rtyp=MATRIX_CMD;
            if (d->r==NULL) goto no_ring;
+           ssiCheckCurrRing(d->r);
            res->data=(char*)ssiReadMatrix(d);
            break;
     case 9:res->rtyp=VECTOR_CMD;
            if (d->r==NULL) goto no_ring;
+           ssiCheckCurrRing(d->r);
            res->data=(char*)ssiReadPoly(d);
            break;
@@ -1383 +1416 @@
            else        res->rtyp=MODUL_CMD;
            if (d->r==NULL) goto no_ring;
+           ssiCheckCurrRing(d->r);
            {
              int rk=s_readint(d->f_read);