Changeset d22802 in git

Timestamp:

Mar 19, 2021, 9:47:57 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d5b4b6b74819f9180ae9279cb701e929fb931c12

Parents:

2c5e6915fcb7bea0992cbde73d5924fccef312af

Message:

fix: newstruct (example projectiveBundle)

File:

• Singular/ipassign.cc (modified) (23 diffs)

Singular/ipassign.cc

@@ -461 +461 @@
   return FALSE;
 }
-static inline void jjCheck_FLAG_OTHER_RING(leftv res)
-{
+static inline ring jjCheck_FLAG_OTHER_RING(leftv res)
+{
+  ring old_r=currRing;
   if (Sy_inset(FLAG_RING,res->flag))
   {
@@ -469 +470 @@
       if ((res-1)->data!=NULL)
       {
-        ring rr=(ring)(res-1)->data;
-        rr->ref--;
+        old_r=(ring)(res-1)->data;
+        old_r->ref--;
       }
       (res-1)->data=currRing;
@@ -477 +478 @@
     }
   }
+  res->flag &= ~(Sy_bit(FLAG_OTHER_RING) |Sy_bit(FLAG_RING));
+  return old_r;
 }
 static BOOLEAN jiA_NUMBER(leftv res, leftv a, Subexpr)
 {
-  void *test_p=a->Data(); // can I access it (newstruct)?
+  number p=(number)a->CopyD(NUMBER_CMD);
   if (errorreported) return TRUE;
-  number p=(number)a->CopyD(NUMBER_CMD);
   if (res->data!=NULL) nDelete((number *)&res->data);
   nNormalize(p);
@@ -706 +708 @@
 static BOOLEAN jiA_LIST_RES(leftv res, leftv a,Subexpr)
 {
-  void *test_p=a->Data(); // can I access it (newstruct)?
+  syStrategy r=(syStrategy)a->CopyD(RESOLUTION_CMD);
   if (errorreported) return TRUE;
-  syStrategy r=(syStrategy)a->CopyD(RESOLUTION_CMD);
   if (res->data!=NULL) ((lists)res->data)->Clean();
   int add_row_shift = 0;
@@ -719 +720 @@
 static BOOLEAN jiA_LIST(leftv res, leftv a,Subexpr)
 {
-  void *test_p=a->Data(); // can I access it (newstruct)?
+  lists l=(lists)a->CopyD(LIST_CMD);
   if (errorreported) return TRUE;
-  // FLAG_OTHER_RING is only set for ring dep. types, so currRing!=NULL
-  lists l=(lists)a->CopyD(LIST_CMD);
   if (res->data!=NULL) ((lists)res->data)->Clean();
   res->data=(void *)l;
@@ -730 +729 @@
 static BOOLEAN jiA_POLY(leftv res, leftv a,Subexpr e)
 {
-  void *test_p=a->Data(); // can I access it (newstruct)?
+  poly p=(poly)a->CopyD(POLY_CMD);
   if (errorreported) return TRUE;
-  poly p=(poly)a->CopyD(POLY_CMD);
   pNormalize(p);
   if (e==NULL)
@@ -828 +826 @@
   }
   matrix am=(matrix)a->CopyD(MATRIX_CMD);
+  if (errorreported) return TRUE;
   if ((MATROWS(am)!=1) || (MATCOLS(am)!=1))
   {
@@ -918 +917 @@
 // there should be no assign bucket:=bucket, here we have poly:=bucket
 {
-  void *test_p=a->Data(); // can I access it (newstruct)?
+  sBucket_pt b=(sBucket_pt)a->CopyD();
   if (errorreported) return TRUE;
-  sBucket_pt b=(sBucket_pt)a->CopyD();
   poly p; int l;
   sBucketDestroyAdd(b,&p,&l);
@@ -931 +929 @@
 static BOOLEAN jiA_IDEAL(leftv res, leftv a, Subexpr)
 {
-  void *test_p=a->Data(); // can I access it (newstruct)?
+  ideal I=(ideal)a->CopyD(MATRIX_CMD);
   if (errorreported) return TRUE;
   if (res->data!=NULL) idDelete((ideal*)&res->data);
-  res->data=(void *)a->CopyD(MATRIX_CMD);
+  res->data=(void*)I;
   if (a->rtyp==IDHDL) id_Normalize((ideal)a->Data(), currRing);
-  else                id_Normalize((ideal)res->data, currRing);
+  else                id_Normalize(I/*(ideal)res->data*/, currRing);
   jiAssignAttr(res,a);
   if (((res->rtyp==IDEAL_CMD)||(res->rtyp==MODUL_CMD))
-  && (IDELEMS((ideal)(res->data))==1)
+  && (IDELEMS(I/*(ideal)(res->data)*/)==1)
   && (currRing->qideal==NULL)
   && (!rIsPluralRing(currRing))
@@ -955 +953 @@
 static BOOLEAN jiA_RESOLUTION(leftv res, leftv a, Subexpr)
 {
-  void *test_p=a->Data(); // can I access it (newstruct)?
+  syStrategy R=(syStrategy)a->CopyD(RESOLUTION_CMD);
   if (errorreported) return TRUE;
   if (res->data!=NULL) syKillComputation((syStrategy)res->data);
-  res->data=(void *)a->CopyD(RESOLUTION_CMD);
+  res->data=(void*)R;
   jiAssignAttr(res,a);
   return FALSE;
@@ -965 +963 @@
 /* module = poly */
 {
-  void *test_p=a->Data(); // can I access it (newstruct)?
-  if (errorreported) return TRUE;
-  if (res->data!=NULL) idDelete((ideal*)&res->data);
   ideal I=idInit(1,1);
   I->m[0]=(poly)a->CopyD(POLY_CMD);
+  if (errorreported) return TRUE;
   if (I->m[0]!=NULL) pSetCompP(I->m[0],1);
   pNormalize(I->m[0]);
+  if (res->data!=NULL) idDelete((ideal*)&res->data);
   res->data=(void *)I;
   if (TEST_V_QRING && (currRing->qideal!=NULL))
@@ -982 +979 @@
 static BOOLEAN jiA_IDEAL_M(leftv res, leftv a, Subexpr)
 {
-  void *test_p=a->Data(); // can I access it (newstruct)?
+  matrix m=(matrix)a->CopyD(MATRIX_CMD);
   if (errorreported) return TRUE;
-  if (res->data!=NULL) idDelete((ideal*)&res->data);
-  matrix m=(matrix)a->CopyD(MATRIX_CMD);
   if (TEST_V_ALLWARN)
     if (MATROWS(m)>1)
@@ -993 +988 @@
   MATROWS(m)=1;
   id_Normalize((ideal)m, currRing);
+  if (res->data!=NULL) idDelete((ideal*)&res->data);
   res->data=(void *)m;
   if (TEST_V_QRING && (currRing->qideal!=NULL))
@@ -1003 +999 @@
 static BOOLEAN jiA_IDEAL_Mo(leftv res, leftv a, Subexpr)
 {
-  void *test_p=a->Data(); // can I access it (newstruct)?
+  ideal m=(ideal)a->CopyD(MODUL_CMD);
   if (errorreported) return TRUE;
-  ideal m=(ideal)a->CopyD(MODUL_CMD);
   if (m->rank>1)
   {
@@ -1049 +1044 @@
 static BOOLEAN jiA_MAP(leftv res, leftv a, Subexpr)
 {
-  void *test_p=a->Data(); // can I access it (newstruct)?
-  if (errorreported) return TRUE;
   if (res->data!=NULL)
   {
@@ -1058 +1051 @@
   }
   res->data=(void *)a->CopyD(MAP_CMD);
+  if (errorreported) return TRUE;
   jiAssignAttr(res,a);
   return FALSE;
@@ -1064 +1058 @@
 static BOOLEAN jiA_MAP_ID(leftv res, leftv a, Subexpr)
 {
-  void *test_p=a->Data(); // can I access it (newstruct)?
-  if (errorreported) return TRUE;
   map f=(map)res->data;
   char *rn=f->preimage; // save the old/already assigned preimage ring name
@@ -1071 +1063 @@
   idDelete((ideal *)&f);
   res->data=(void *)a->CopyD(IDEAL_CMD);
+  if (errorreported) return TRUE;
   f=(map)res->data;
   id_Normalize((ideal)f, currRing);
@@ -1085 +1078 @@
     return TRUE;
   }
-  void *test_p=a->Data(); // can I access it (newstruct)?
-  if (errorreported) return TRUE;
 
   ring old_ring=(ring)res->Data();
@@ -1092 +1083 @@
   coeffs newcf = currRing->cf;
   ideal id = (ideal)a->Data(); //?
+  if (errorreported) return TRUE;
   const int cpos = idPosConstant(id);
   if(rField_is_Ring(currRing))
@@ -1226 +1218 @@
 {
   coeffs r=(coeffs)a->Data();
+  if (errorreported) return TRUE;
   if (r==NULL) return TRUE;
   if (res->data!=NULL) nKillChar((coeffs)res->data);
@@ -1916 +1909 @@
   sleftv tmp;
   memset(&tmp,0,sizeof(sleftv));
-  tmp.flag=ld->flag;
   if (/*(ld->rtyp!=LIST_CMD)
   &&*/(ld->e==NULL)
   && (ld->Typ()!=r->Typ()))
   {
-    jjCheck_FLAG_OTHER_RING(ld);
+    ring old_r=jjCheck_FLAG_OTHER_RING(ld);
     tmp.rtyp=DEF_CMD;
+    tmp.flag=ld->flag;
     b=iiAssign(&tmp,r,FALSE);
-    ld->CleanUp();
+    ld->CleanUp(old_r);
     memcpy(ld,&tmp,sizeof(sleftv));
   }
@@ -1931 +1924 @@
   && (ld->Typ()<MAX_TOK))
   {
-    jjCheck_FLAG_OTHER_RING(ld);
+    ring old_r=jjCheck_FLAG_OTHER_RING(ld);
     tmp.rtyp=r->Typ();
+    tmp.flag=ld->flag;
     tmp.data=(char*)idrecDataInit(r->Typ());
     b=iiAssign(&tmp,r,FALSE);
-    ld->CleanUp();
+    ld->CleanUp(old_r);
     memcpy(ld,&tmp,sizeof(sleftv));
   }